diff options
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch | 169 |
1 files changed, 0 insertions, 169 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch deleted file mode 100644 index 608784c43bb4..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 9116667b39f7a3ef622b0fd4e09ffa77718fa5c2 Mon Sep 17 00:00:00 2001 -From: Ole Reifschneider <mail@ole-reifschneider.de> -Date: Tue, 15 Aug 2017 18:51:42 +0200 -Subject: [PATCH 1/6] Make colord and wacom support optional - -Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org> -Signed-off-by: Timo Tambet <ttambet@gmail.com> -Signed-off-by: Yuh-Horng Chen <yhchens@gmail.com> ---- - configure.ac | 54 ++++++++++++++++++++++++++++++---------------- - plugins/Makefile.am | 9 ++++++-- - plugins/common/Makefile.am | 7 ++++-- - plugins/dummy/Makefile.am | 5 ++++- - 4 files changed, 52 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 73fe91e6..d8778c93 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -158,13 +158,23 @@ PKG_CHECK_MODULES(CLIPBOARD, - gtk+-x11-3.0 - x11) - --PKG_CHECK_MODULES(COLOR, -- colord >= 1.0.2 -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -- libcanberra-gtk3 -- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION -- lcms2 >= $LCMS_REQUIRED_VERSION -- libnotify) -+AC_ARG_ENABLE([color], -+ AS_HELP_STRING([--disable-color], -+ [turn off color plugin]), -+ [], -+ [enable_color=yes]) -+ -+AS_IF([test "$enable_color" = "yes"], -+ [PKG_CHECK_MODULES(COLOR, -+ colord >= 1.0.2 -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION -+ libcanberra-gtk3 -+ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION -+ lcms2 >= $LCMS_REQUIRED_VERSION -+ libnotify) -+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) -+ ]) -+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") - - PKG_CHECK_MODULES(DATETIME, - libnotify >= $LIBNOTIFY_REQUIRED_VERSION -@@ -268,23 +278,31 @@ case $host_os in - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- if test x$enable_gudev != xno; then -- LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION" -- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -- else -- AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) -- fi -- AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -- have_wacom=yes -+ have_wacom=no -+ AS_IF([test "$enable_gudev" != "no"], -+ [AC_ARG_ENABLE([wacom], -+ AS_HELP_STRING([--disable-wacom], -+ [turn off wacom plugin]), -+ [], -+ [enable_wacom=no]) dnl Default value -+ AS_IF([test "$enable_wacom" = "yes"], -+ [ -+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM, [gtk+-3.0 pango >= $PANGO_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0]) -+ have_wacom=yes -+ AC_DEFINE_UNQUOTED(HAVE_WACOM, 1, [Define to 1 if wacom support is available]) -+ ]) -+ ], [ -+ AC_MSG_ERROR([GUdev is necessary to compile Wacom support]) -+ ]) - fi - ;; - *) - have_wacom=no - ;; - esac --AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes) -+AM_CONDITIONAL(BUILD_WACOM, test x$have_wacom = xyes) - - dnl --------------------------------------------------------------------------- - dnl - common -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 9324b406..ee78d6d0 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -4,7 +4,6 @@ enabled_plugins = \ - a11y-keyboard \ - a11y-settings \ - clipboard \ -- color \ - datetime \ - dummy \ - power \ -@@ -22,13 +21,19 @@ enabled_plugins = \ - - disabled_plugins = $(NULL) - -+if BUILD_COLOR -+enabled_plugins += color -+else -+disabled_plugins += color -+endif -+ - if SMARTCARD_SUPPORT - enabled_plugins += smartcard - else - disabled_plugins += smartcard - endif - --if HAVE_WACOM -+if BUILD_WACOM - enabled_plugins += wacom - else - disabled_plugins += wacom -diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am -index 239c6015..65de4007 100644 ---- a/plugins/common/Makefile.am -+++ b/plugins/common/Makefile.am -@@ -49,14 +49,17 @@ libcommon_la_CPPFLAGS = \ - -I$(top_builddir)/gnome-settings-daemon \ - -I$(top_srcdir)/data/ - --libcommon_la_CFLAGS = $(COMMON_CFLAGS) -+libcommon_la_CFLAGS = \ -+ $(COMMON_CFLAGS) \ -+ $(LIBWACOM_CFLAGS) - - libcommon_la_LDFLAGS = \ - $(GSD_PLUGIN_LDFLAGS) - - libcommon_la_LIBADD = \ - $(top_builddir)/gnome-settings-daemon/libgsd.la \ -- $(COMMON_LIBS) -+ $(COMMON_LIBS) \ -+ $(LIBWACOM_LIBS) - - libexec_PROGRAMS = gsd-test-input-helper - -diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am -index cb5856cf..d8e8bc4e 100644 ---- a/plugins/dummy/Makefile.am -+++ b/plugins/dummy/Makefile.am -@@ -25,7 +25,10 @@ desktop_DATA = - if !SMARTCARD_SUPPORT - desktop_DATA += org.gnome.SettingsDaemon.Smartcard.desktop - endif --if !HAVE_WACOM -+if !BUILD_COLOR -+desktop_DATA += org.gnome.SettingsDaemon.Color.desktop -+endif -+if !BUILD_WACOM - desktop_DATA += org.gnome.SettingsDaemon.Wacom.desktop - endif - if !BUILD_PRINT_NOTIFICATIONS --- -2.14.1 - |