* vino.spec: Remove disable-xsun.diff, add keyborad-map.diff.
* patches/vino-12-disable-xsun.diff:
* patches/vino-12-keyborad-map.diff:
--- a/ChangeLog Mon Nov 27 04:08:57 2006 +0000
+++ b/ChangeLog Mon Nov 27 04:12:02 2006 +0000
@@ -1,3 +1,9 @@
+2006-11-27 Halton Huo <[email protected]>
+
+ * vino.spec: Remove disable-xsun.diff, add keyborad-map.diff.
+ * patches/vino-12-disable-xsun.diff:
+ * patches/vino-12-keyborad-map.diff:
+
2006-11-27 Henry Zhang <[email protected]>
* make a little more potimization for patches/libgtop-01-solaris.diff and
--- a/patches/vino-12-disable-xsun.diff Mon Nov 27 04:08:57 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
---- vino-2.16.0/capplet/vino-preferences.c.orig 2006-11-16 18:25:16.404842000 +0800
-+++ vino-2.16.0/capplet/vino-preferences.c 2006-11-16 18:35:14.352152000 +0800
-@@ -32,6 +32,8 @@
- #include <libgnome/libgnome.h>
- #include <libgnomeui/libgnomeui.h>
-
-+#include <gdk/gdkx.h>
-+
- #ifdef VINO_ENABLE_KEYRING
- #include <gnome-keyring.h>
- #endif
-@@ -1071,9 +1073,40 @@
- dialog->xml = NULL;
- }
-
-+gboolean
-+check_xsun_running()
-+{
-+ GdkDisplay *display;
-+ int min_keycodes, max_keycodes;
-+
-+ /* determine Xsun is running */
-+ display = gdk_display_get_default ();
-+ XDisplayKeycodes (GDK_DISPLAY_XDISPLAY (display), &min_keycodes, &max_keycodes);
-+
-+ if (max_keycodes == 254 )
-+ return TRUE;
-+ else
-+ return FALSE;
-+}
-+
- int
- main (int argc, char **argv)
- {
-+ gtk_init (&argc, &argv);
-+ if (check_xsun_running ())
-+ {
-+ GtkWidget *dialog;
-+ dialog = gtk_message_dialog_new_with_markup(NULL, NULL,
-+ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE,
-+ _("<b> Unable to share your desktop</b>\n\n"
-+ "You are running Xsun. This feature\n"
-+ "is only available on Xorg."));
-+ gtk_dialog_run (GTK_DIALOG (dialog));
-+ gtk_widget_destroy (dialog);
-+
-+ return 1;
-+ }
-+
- VinoPreferencesDialog dialog = { NULL, };
-
- bindtextdomain (GETTEXT_PACKAGE, VINO_LOCALEDIR);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/vino-12-keyborad-map.diff Mon Nov 27 04:12:02 2006 +0000
@@ -0,0 +1,20 @@
+Index: vino-head/server/vino-input.c
+===================================================================
+RCS file: /cvs/gnome/vino/server/vino-input.c,v
+retrieving revision 1.5
+diff -u -r1.5 vino-input.c
+--- vino-head/server/vino-input.c 16 Nov 2005 08:18:43 -0000 1.5
++++ vino-head/server/vino-input.c 23 Nov 2006 11:49:31 -0000
+@@ -124,10 +124,9 @@
+
+ for (modifier = 0; modifier < keysyms_per_keycode; modifier++)
+ {
+- guint32 keysym = keymap [keycode_index + modifier];
++ guint32 keysym = XKeycodeToKeysym (xdisplay, keycode, modifier);
+
+- if (VINO_IS_LATIN1_KEYSYM (keysym) &&
+- XKeysymToKeycode (xdisplay, keysym) == keycode)
++ if (VINO_IS_LATIN1_KEYSYM (keysym))
+ {
+ if (global_input_data.keycodes [keysym] != 0)
+ continue;
--- a/vino.spec Mon Nov 27 04:08:57 2006 +0000
+++ b/vino.spec Mon Nov 27 04:12:02 2006 +0000
@@ -17,20 +17,28 @@
Summary: GNOME Remote Desktop
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.16/%{name}-%{version}.tar.bz2
Patch1: vino-01-fix-a11y-hang.diff
+# date:2006-11-03 bugster:6465886 bugzilla:344839 owner:halton type:bugfix
Patch2: vino-02-gnome-keyring.diff
+# date:2006-10-17 bugster:6409721 bugzilla:353642 owner:halton type:bugfix
Patch3: vino-03-xgl.diff
+# date:2006-11-03 bugster:6483870 bugzilla:310965 owner:halton type:bugfix
Patch4: vino-04-ipv6-remove-dead-code.diff
+# date:2006-11-03 bugster:6483870 bugzilla:310965 owner:halton type:bugfix
Patch5: vino-05-ipv6-use-getaddrinfo.diff
+# date:2006-11-03 bugster:6483870 bugzilla:310965 owner:halton type:bugfix
Patch6: vino-06-ipv6-use-inet-ntop.diff
+# date:2006-11-03 bugster:6483870 bugzilla:310965 owner:halton type:bugfix
Patch7: vino-07-ipv6-configure-check.diff
+# date:2006-11-03 bugster:6483870 bugzilla:310965 owner:halton type:bugfix
Patch8: vino-08-ipv6-create-ipv6-socket.diff
+# date:2006-11-03 bugster:6483870 bugzilla:310965 owner:halton type:bugfix
Patch9: vino-09-ipv6-create-ipv6-http-socket.diff
# date:2006-11-06 bugster:6491224 bugzilla:345394 owner:halton type:bugfix
Patch10: vino-10-a11y-theme-icons.diff
# date:2006-11-06 bugster:6491221 bugzilla:338043 owner:halton type:bugfix
Patch11: vino-11-a11y-selectable-label.diff
-# date:2006-11-16 bugster:6493868 owner:halton type:bugfix
-Patch12: vino-12-disable-xsun.diff
+# date:2006-11-27 bugster:6487136 bugzilla:369884 owner:halton type:bugfix
+Patch12: vino-12-keyborad-map.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/doc
Autoreqprov: on
@@ -134,6 +142,11 @@
%config %{_sysconfdir}/gconf/schemas/*
%changelog
+* Mon Nov 27 2006 - [email protected]
+- Remove patch disable-xsun.diff.
+- Add patch keyborad-map.diff.
+- Add patch comments.
+
* Fri Nov 17 2006 - [email protected]
- Change patch owner to opensolaris id.