r35043 - in /desktop/experimental/gnome-settings-daemon/debian: changelog control control.in patches/20_disable-wacom-support-on-s390-s390x.patch patches/21_disable-wacom-on-non-Linux-platforms.patch patches/series
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat May 19 06:50:38 UTC 2012
Author: biebl
Date: Sat May 19 06:50:38 2012
New Revision: 35043
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35043
Log:
Cherry-pick two upstream patches which disable wacom support on s390,
s390x and non-Linux plattforms as xserver-xorg-input-wacom is not available
there. Mark the xserver-xorg-input-wacom and libwacom-dev Build-Depends
accordingly.
Added:
desktop/experimental/gnome-settings-daemon/debian/patches/20_disable-wacom-support-on-s390-s390x.patch
desktop/experimental/gnome-settings-daemon/debian/patches/21_disable-wacom-on-non-Linux-platforms.patch
Modified:
desktop/experimental/gnome-settings-daemon/debian/changelog
desktop/experimental/gnome-settings-daemon/debian/control
desktop/experimental/gnome-settings-daemon/debian/control.in
desktop/experimental/gnome-settings-daemon/debian/patches/series
Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=35043&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sat May 19 06:50:38 2012
@@ -26,6 +26,10 @@
* Refresh patches.
* Drop dependency on hwdata. This is no longer necessary and handled via
libgnome-desktop now.
+ * Cherry-pick two upstream patches which disable wacom support on s390,
+ s390x and non-Linux plattforms as xserver-xorg-input-wacom is not available
+ there. Mark the xserver-xorg-input-wacom and libwacom-dev Build-Depends
+ accordingly.
-- Sjoerd Simons <sjoerd at debian.org> Fri, 18 May 2012 22:10:13 +0200
Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=35043&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control [utf-8] Sat May 19 06:50:38 2012
@@ -41,8 +41,8 @@
libcolord-dev (>= 0.1.12),
liblcms2-dev,
libnss3-dev,
- libwacom-dev (>= 0.3),
- xserver-xorg-input-wacom,
+ libwacom-dev (>= 0.3) [!hurd-any !kfreebsd-any !s390 !s390x],
+ xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x]
Standards-Version: 3.9.2
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Modified: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=35043&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] Sat May 19 06:50:38 2012
@@ -36,8 +36,8 @@
libcolord-dev (>= 0.1.12),
liblcms2-dev,
libnss3-dev,
- libwacom-dev (>= 0.3),
- xserver-xorg-input-wacom,
+ libwacom-dev (>= 0.3) [!hurd-any !kfreebsd-any !s390 !s390x],
+ xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x]
Standards-Version: 3.9.2
Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Added: desktop/experimental/gnome-settings-daemon/debian/patches/20_disable-wacom-support-on-s390-s390x.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/20_disable-wacom-support-on-s390-s390x.patch?rev=35043&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/20_disable-wacom-support-on-s390-s390x.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/20_disable-wacom-support-on-s390-s390x.patch [utf-8] Sat May 19 06:50:38 2012
@@ -1,0 +1,93 @@
+From 6aa4ae5ba0d4afce8a418f6b2b3198772f5e8cb5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Wed, 21 Mar 2012 18:40:06 +0100
+Subject: [PATCH 1/2] disable wacom support on s390/s390x
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672576
+---
+ configure.ac | 11 +++++++++--
+ data/Makefile.am | 7 ++++++-
+ plugins/Makefile.am | 7 ++++++-
+ 3 files changed, 21 insertions(+), 4 deletions(-)
+
+Index: gnome-settings-daemon-3.4.2/configure.ac
+===================================================================
+--- gnome-settings-daemon-3.4.2.orig/configure.ac 2012-05-19 02:59:56.470485127 +0200
++++ gnome-settings-daemon-3.4.2/configure.ac 2012-05-19 02:59:57.118485100 +0200
+@@ -215,10 +215,16 @@
+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+
+ dnl ---------------------------------------------------------------------------
+-dnl - wacom
++dnl - wacom (disabled for s390/s390x)
+ dnl ---------------------------------------------------------------------------
+
+-PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
++ have_wacom=no
++else
++ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++ have_wacom=yes
++fi
++AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
+
+ dnl ==============================================
+ dnl PackageKit section
+@@ -565,6 +571,7 @@
+ PackageKit support: ${have_packagekit}
+ Smartcard support: ${have_smartcard_support}
+ Cups support: ${have_cups}
++ Wacom support: ${have_wacom}
+ ${NSS_DATABASE:+\
+ System nssdb: ${NSS_DATABASE}
+ }\
+Index: gnome-settings-daemon-3.4.2/data/Makefile.am
+===================================================================
+--- gnome-settings-daemon-3.4.2.orig/data/Makefile.am 2012-05-15 12:14:49.000000000 +0200
++++ gnome-settings-daemon-3.4.2/data/Makefile.am 2012-05-19 02:59:57.118485100 +0200
+@@ -16,7 +16,6 @@
+ org.gnome.settings-daemon.plugins.xsettings.gschema.xml \
+ org.gnome.settings-daemon.plugins.housekeeping.gschema.xml \
+ org.gnome.settings-daemon.plugins.print-notifications.gschema.xml \
+- org.gnome.settings-daemon.peripherals.wacom.gschema.xml \
+ org.gnome.settings-daemon.plugins.xrandr.gschema.xml
+
+ all_schemas = $(gsettings_SCHEMAS)
+@@ -33,6 +32,12 @@
+ all_schemas += org.gnome.settings-daemon.plugins.orientation.gschema.xml
+ endif
+
++if HAVE_WACOM
++gsettings_SCHEMAS += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++else
++all_schemas += org.gnome.settings-daemon.peripherals.wacom.gschema.xml
++endif
++
+ @INTLTOOL_XML_NOMERGE_RULE@
+
+ @GSETTINGS_RULES@
+Index: gnome-settings-daemon-3.4.2/plugins/Makefile.am
+===================================================================
+--- gnome-settings-daemon-3.4.2.orig/plugins/Makefile.am 2012-05-19 02:59:56.474485125 +0200
++++ gnome-settings-daemon-3.4.2/plugins/Makefile.am 2012-05-19 02:59:57.118485100 +0200
+@@ -16,7 +16,6 @@
+ media-keys \
+ mouse \
+ sound \
+- wacom \
+ xrandr \
+ xsettings \
+ $(NULL)
+@@ -41,6 +40,12 @@
+ disabled_plugins += orientation
+ endif
+
++if HAVE_WACOM
++enabled_plugins += wacom
++else
++disabled_plugins += wacom
++endif
++
+ if BUILD_PRINT_NOTIFICATIONS
+ enabled_plugins += print-notifications
+ else
Added: desktop/experimental/gnome-settings-daemon/debian/patches/21_disable-wacom-on-non-Linux-platforms.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/21_disable-wacom-on-non-Linux-platforms.patch?rev=35043&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/21_disable-wacom-on-non-Linux-platforms.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/21_disable-wacom-on-non-Linux-platforms.patch [utf-8] Sat May 19 06:50:38 2012
@@ -1,0 +1,45 @@
+From 039875c74e384264d0f060cf4838e80ad027df88 Mon Sep 17 00:00:00 2001
+From: Antoine Jacoutot <ajacoutot at gnome.org>
+Date: Fri, 27 Apr 2012 13:37:36 +0200
+Subject: [PATCH 2/2] disable wacom on non Linux platforms.
+
+wacom requires udev which is only available on Linux.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674935
+---
+ configure.ac | 19 +++++++++++++------
+ 1 file changed, 13 insertions(+), 6 deletions(-)
+
+Index: gnome-settings-daemon-3.4.2/configure.ac
+===================================================================
+--- gnome-settings-daemon-3.4.2.orig/configure.ac 2012-05-19 02:59:57.118485100 +0200
++++ gnome-settings-daemon-3.4.2/configure.ac 2012-05-19 03:00:01.206484961 +0200
+@@ -215,15 +215,22 @@
+ PKG_CHECK_MODULES(COLOR, [colord >= 0.1.9 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3])
+
+ dnl ---------------------------------------------------------------------------
+-dnl - wacom (disabled for s390/s390x)
++dnl - wacom (disabled for s390/s390x and non Linux platforms)
+ dnl ---------------------------------------------------------------------------
+
+-if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
++case $host_os in
++ linux*)
++ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
++ have_wacom=no
++ else
++ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
++ have_wacom=yes
++ fi
++ ;;
++ *)
+ have_wacom=no
+-else
+- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst $GUDEV_PKG gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom])
+- have_wacom=yes
+-fi
++ ;;
++esac
+ AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
+
+ dnl ==============================================
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=35043&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Sat May 19 06:50:38 2012
@@ -3,3 +3,5 @@
power-check-null-devices.patch
power-ignore-bad-dbus-requests.patch
revert_git_datetime_dropping.patch
+20_disable-wacom-support-on-s390-s390x.patch
+21_disable-wacom-on-non-Linux-platforms.patch
More information about the pkg-gnome-commits
mailing list