[Pkg-xfce-commits] r3574 - in desktop/trunk/xfce4-settings/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Oct 11 12:19:33 UTC 2009
Author: corsac
Date: 2009-10-11 12:19:32 +0000 (Sun, 11 Oct 2009)
New Revision: 3574
Added:
desktop/trunk/xfce4-settings/debian/patches/01_xi2-support.patch
Modified:
desktop/trunk/xfce4-settings/debian/changelog
desktop/trunk/xfce4-settings/debian/control
desktop/trunk/xfce4-settings/debian/patches/series
desktop/trunk/xfce4-settings/debian/rules
Log:
* debian/patches:
- 01_xi2-support added, add support for Xi2 extension for mouse settings.
* debian/control:
- add build-dep on quilt.
* debian/rules:
- add --with quilt argument to dh.
Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog 2009-10-11 10:26:46 UTC (rev 3573)
+++ desktop/trunk/xfce4-settings/debian/changelog 2009-10-11 12:19:32 UTC (rev 3574)
@@ -1,3 +1,14 @@
+xfce4-settings (4.6.3-2) UNRELEASED; urgency=low
+
+ * debian/patches:
+ - 01_xi2-support added, add support for Xi2 extension for mouse settings.
+ * debian/control:
+ - add build-dep on quilt.
+ * debian/rules:
+ - add --with quilt argument to dh.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 11 Oct 2009 13:53:15 +0200
+
xfce4-settings (4.6.3-1) unstable; urgency=low
* New upstream bugfix release.
Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control 2009-10-11 10:26:46 UTC (rev 3573)
+++ desktop/trunk/xfce4-settings/debian/control 2009-10-11 12:19:32 UTC (rev 3574)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0),
libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libglade2-dev,
libxfconf-0-dev, libwnck-dev, libxklavier12-dev, libnotify-dev,
- intltool (>= 0.31)
+ intltool (>= 0.31), quilt
Standards-Version: 3.8.3
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf
Added: desktop/trunk/xfce4-settings/debian/patches/01_xi2-support.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/01_xi2-support.patch (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/01_xi2-support.patch 2009-10-11 12:19:32 UTC (rev 3574)
@@ -0,0 +1,124 @@
+From a5159ad438cf2159ab7d21efcd2e071f4f9cf40c Mon Sep 17 00:00:00 2001
+From: Nick Schermer <nick at xfce.org>
+Date: Sun, 11 Oct 2009 14:02:05 +0200
+Subject: [PATCH] Fix the check for Xi so it does not fail with Xi2 (bug #4929).
+
+---
+ dialogs/mouse-settings/main.c | 26 +++++++++++++++++++++-----
+ xfce4-settings-helper/pointers.c | 28 ++++++++++++++++++----------
+ 2 files changed, 39 insertions(+), 15 deletions(-)
+
+diff --git a/dialogs/mouse-settings/main.c b/dialogs/mouse-settings/main.c
+index dc5604d..bde97c8 100644
+--- a/dialogs/mouse-settings/main.c
++++ b/dialogs/mouse-settings/main.c
+@@ -60,6 +60,10 @@
+ #define IsXExtensionPointer 4
+ #endif
+
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* settings */
+ #ifdef HAVE_XCURSOR
+ #define PREVIEW_ROWS (3)
+@@ -1221,15 +1225,27 @@ main (gint argc, gchar **argv)
+
+ return EXIT_FAILURE;
+ }
+-
+- /* check for Xi 1.4 */
++
++ /* check for Xi */
+ version = XGetExtensionVersion (GDK_DISPLAY (), INAME);
+- if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
++ if (version == NULL || !version->present)
+ {
+- g_critical ("XI is not present or too old.");
+-
++ g_critical ("XI is not present.");
+ return EXIT_FAILURE;
+ }
++ else if (version->major_version < MIN_XI_VERS_MAJOR
++ || (version->major_version == MIN_XI_VERS_MAJOR
++ && version->minor_version < MIN_XI_VERS_MINOR))
++ {
++ g_critical ("Your XI is too old (%d.%d) version %d.%d is required.",
++ version->major_version, version->minor_version,
++ MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
++ return EXIT_FAILURE;
++ }
++
++ /* hook to make sure the libxfce4ui library is linked */
++ if (xfce_titled_dialog_get_type () == 0)
++ return EXIT_FAILURE;
+
+ /* open the xsettings and pointers channel */
+ xsettings_channel = xfconf_channel_new ("xsettings");
+diff --git a/xfce4-settings-helper/pointers.c b/xfce4-settings-helper/pointers.c
+index 6dd2cd4..b8718ba 100644
+--- a/xfce4-settings-helper/pointers.c
++++ b/xfce4-settings-helper/pointers.c
+@@ -42,6 +42,10 @@
+
+ #define MAX_DENOMINATOR (100.00)
+
++/* Xi 1.4 is required */
++#define MIN_XI_VERS_MAJOR 1
++#define MIN_XI_VERS_MINOR 4
++
+ /* test if the required version of inputproto (1.4.2) is available */
+ #if XI_Add_DevicePresenceNotify_Major >= 1 && defined (DeviceRemoved)
+ #define HAS_DEVICE_HOTPLUGGING
+@@ -133,18 +137,22 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
+
+ /* get the default display */
+ xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
+-
++
+ /* query the extension version */
+ version = XGetExtensionVersion (xdisplay, INAME);
+-
+- /* check for Xi 1.4 */
+- if (!version || !version->present || version->major_version < 1 || version->minor_version < 4)
+- {
+- /* print error */
+- g_critical ("XI is not present or too old.");
+
+- /* no channel */
+- helper->channel = NULL;
++ /* check for Xi */
++ if (version == NULL || !version->present)
++ {
++ g_critical ("XI is not present.");
++ }
++ else if (version->major_version < MIN_XI_VERS_MAJOR
++ || (version->major_version == MIN_XI_VERS_MAJOR
++ && version->minor_version < MIN_XI_VERS_MINOR))
++ {
++ g_critical ("Your XI is too old (%d.%d) version %d.%d is required.",
++ version->major_version, version->minor_version,
++ MIN_XI_VERS_MAJOR, MIN_XI_VERS_MINOR);
+ }
+ else
+ {
+@@ -162,7 +170,7 @@ xfce_pointers_helper_init (XfcePointersHelper *helper)
+ gdk_flush ();
+ gdk_error_trap_push ();
+
+-
++
+ if (G_LIKELY (xdisplay))
+ {
+ /* monitor device changes */
+--
+1.6.4.4
+
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+new file mode 100644
+index 0000000..412836e
+--- /dev/null
++++ b/po/POTFILES.skip
+@@ -0,0 +1 @@
++.pc/01_xi2-support.patch/dialogs/mouse-settings/main.c
Modified: desktop/trunk/xfce4-settings/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/series 2009-10-11 10:26:46 UTC (rev 3573)
+++ desktop/trunk/xfce4-settings/debian/patches/series 2009-10-11 12:19:32 UTC (rev 3574)
@@ -0,0 +1 @@
+01_xi2-support.patch
Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules 2009-10-11 10:26:46 UTC (rev 3573)
+++ desktop/trunk/xfce4-settings/debian/rules 2009-10-11 12:19:32 UTC (rev 3574)
@@ -9,4 +9,4 @@
dh_installman debian/*.1
%:
- dh $@
+ dh --with quilt $@
More information about the Pkg-xfce-commits
mailing list