diff options
Diffstat (limited to 'gnome-base/gnome-settings-daemon/files')
| -rw-r--r-- | gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch | 48 | ||||
| -rw-r--r-- | gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch | 111 |
2 files changed, 0 insertions, 159 deletions
diff --git a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch deleted file mode 100644 index d0436ecdc6e1..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.22.2-udevrulesdir-configure.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 19394974869513ab4a98d72593dce18f08105983 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <leio@gentoo.org> -Date: Tue, 21 Mar 2017 01:30:52 +0200 -Subject: [PATCH] build: Get udevrulesdir from pkg-config - -Use the standard way to find the udev rules directory via pkg-config by default, -and support specifying it, should it be necessary. -This is the same logic as in colord. ---- - configure.ac | 9 +++++++++ - plugins/rfkill/Makefile.am | 1 - - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8d4f5cb..5390404 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -135,6 +135,15 @@ fi - AM_CONDITIONAL(HAVE_GUDEV, test x$have_gudev = xyes) - - dnl --------------------------------------------------------------------------- -+dnl - Where to install udev rules -+dnl --------------------------------------------------------------------------- -+AC_ARG_WITH([udevrulesdir], -+ AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]), -+ [], -+ [with_udevrulesdir=$($PKG_CONFIG --variable=udevdir udev)/rules.d]) -+AC_SUBST([udevrulesdir], [$with_udevrulesdir]) -+ -+dnl --------------------------------------------------------------------------- - dnl - ALSA integration (default enabled) - dnl --------------------------------------------------------------------------- - ALSA_PKG="" -diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am -index fed7adc..05f2c78 100644 ---- a/plugins/rfkill/Makefile.am -+++ b/plugins/rfkill/Makefile.am -@@ -59,7 +59,6 @@ plugin_in_files = rfkill.gnome-settings-plugin.in - - plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) - --udevrulesdir = $(prefix)/lib/udev/rules.d - udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules - - EXTRA_DIST = $(plugin_in_files) $(udevrules_DATA) --- -2.10.1 - diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch deleted file mode 100644 index 9b5369bb3462..000000000000 --- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.22.0-optional.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 2aa9a92b06418642339cf27a3df5051f63eb8ddb Mon Sep 17 00:00:00 2001 -From: Ole Reifschneider <mail@ole-reifschneider.de> -Date: Sat, 11 Apr 2015 23:10:21 +0200 -Subject: [PATCH] Make colord and wacom support optional - ---- - configure.ac | 41 ++++++++++++++++++++++++++++++----------- - plugins/Makefile.am | 9 +++++++-- - 2 files changed, 37 insertions(+), 13 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6d9408a..628af0e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -245,7 +245,17 @@ dnl --------------------------------------------------------------------------- - dnl - color - dnl --------------------------------------------------------------------------- - --PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION]) -+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 lcms2 >= $LCMS_REQUIRED_VERSION]) -+ AC_DEFINE(HAVE_COLOR, 1, [Define if color plugin is enabled]) -+ ]) -+AM_CONDITIONAL(BUILD_COLOR, test "x$enable_color" = "xyes") - - dnl --------------------------------------------------------------------------- - dnl - datetime -@@ -270,22 +280,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 -- PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -- PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION 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 "x$enable_wacom" = "xyes"], -+ [ -+ PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION]) -+ PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION libnotify >= $LIBNOTIFY_REQUIRED_VERSION 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 smartcard section -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 9324b40..ee78d6d 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 --- -2.10.1 - |