From 2f8db31405fac68eea6f7257d58529243815033b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 30 Apr 2018 21:33:31 +0100 Subject: gentoo resync : 30.04.2018 --- gnome-base/gnome-settings-daemon/Manifest | 7 - .../files/3.24.2-reduce-memory-usage.patch | 177 --------------------- .../files/3.24.2-remove-unneeded-gtk-init.patch | 77 --------- .../files/3.24.2-udevrulesdir-configure.patch | 48 ------ .../files/3.24.3-fix-wayland-build.patch | 53 ------ .../files/3.24.3-optional.patch | 169 -------------------- .../gnome-settings-daemon-3.24.3.ebuild | 160 ------------------- 7 files changed, 691 deletions(-) delete mode 100644 gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch delete mode 100644 gnome-base/gnome-settings-daemon/files/3.24.3-optional.patch delete mode 100644 gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild (limited to 'gnome-base/gnome-settings-daemon') diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest index 96ccb04535a5..6c7ccbadd17d 100644 --- a/gnome-base/gnome-settings-daemon/Manifest +++ b/gnome-base/gnome-settings-daemon/Manifest @@ -1,11 +1,4 @@ -AUX 3.24.2-reduce-memory-usage.patch 6121 BLAKE2B 8420de9b07a1a3b5d882c5aae516350d4ea203d9205fe8e69329951e869c1fd8c120372c024407e5b057643e307835659040edf2268b79966468844211fcfdb0 SHA512 c6b172e171461d79f2dfc37b26a0f17a44b2bba0ce6392053129a9137b76c35956d9ab88e22e111d2613c0ff6ee2affc87756c8e0c4fd28d928d948feebd2a41 -AUX 3.24.2-remove-unneeded-gtk-init.patch 2101 BLAKE2B 7983b10dd3ba55e15209640dd1edd822d8515bd7ee5ff4d7865529491ca26fcd3a852f5af3589a715d118fa8bf86e8ea70e89244b5ebbc37e8dc3f9bc587fb96 SHA512 6da74748bbee31bb2b98ba090927c0e787552cabe2ef028781f3e12ccf9b444bf41480f561a307cc71777efaca23ce2f65e2ebb559a33b6a0d9a4270e9da5016 -AUX 3.24.2-udevrulesdir-configure.patch 1918 BLAKE2B 3e831c580ac4348c2d528c5162d821eee42283360651c802be6467bfe6868ac6e51802639e2bf7fd22d1326f46457f697d5ed8ad9bf77d0c9e41ac6de095ad60 SHA512 4d30c85add1c667a4c2fd712c7bf208f358a9313baf29172407eab4236817c86b30d8fca0141541abf8ff0ccd09f51065ceee12a2dbb39827d4facac255c8564 -AUX 3.24.3-fix-wayland-build.patch 1836 BLAKE2B 32bae28672ca5e779826dd908ca2349a0c90898de77138c1ad73157590d51638311640ab59025d2196302d0c60de52ece2d60422536a28967ffbd3c60306b26b SHA512 edf8bcea8fa705cc0a212c1523ebc948751aba61fd2060245439fbf9825b2416bb79c35b1873b49deddb77eff21ee41644e2c6bf311f88607343227ca3526193 -AUX 3.24.3-optional.patch 5311 BLAKE2B d2f9f7dd3e58f88b23604703773f1bb783798d48f81388043bce3c288535d48e14de0dca33c4ddb9ccf266ffc43f772b58f999ed460789b0f6803a566fd12038 SHA512 a466e658f5c02070620aaf6b96f1c2516664d20092ba555f5fa3cd01e5738e79ba4418062380923401c9e8b7b52478b3468335100757babe4326102d55eb4717 -DIST gnome-settings-daemon-3.24.3.tar.xz 1583044 BLAKE2B f075abe574663cb9e6092e9698efb12d598584fe004042b5ac63df7e30ba9dfdb28ac4d0fac4148fa8fd49ccb6991414dc9a3dc49400efbe2cf4752d6295d62c SHA512 2450c3bb31746fe4883f194094cf79e94207e74d39c992107244d89f36c3ea373a33a2dca4a55af138f03fb4abd8733da4bacb215e2202bbc0976b566f8529a6 DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0 -EBUILD gnome-settings-daemon-3.24.3.ebuild 4904 BLAKE2B 8b38af85f86bd9f4b694f9b4dad4d4ade3da5cda4241cc5ce70e0882567555eb3ec6d5a8b711b0a1be9a71375efc8947f4afd07e9c000ff49602add3510f4ace SHA512 5f60a54dfd9c0eb1eeedc18692be773916e4e62442e02441f45a657d5060caee941ae157526635b3c942ffb702c43612f5fbfdacfae838d956074ed262ca0695 EBUILD gnome-settings-daemon-3.24.4.ebuild 4758 BLAKE2B e94120f3002c588f5434bf2455fc70b5993dcbb98cdb75ae7512cb09dc3dee741265b4d03800d1ae23ad36138f98841b5dee85b49933b46d79b280a254dc0967 SHA512 9990f6f670cccf62e59862e1e770a2a52563eb0f30bc23fdc382ada13fd773cd2cbbfa64ddd9b593ba978ff8b98c1f44adc752dcbb7bc91ce3691f40553bea2a MISC metadata.xml 591 BLAKE2B 6dfcef2c04291096bef621cb68ed9f2fa2c379920fb2072783b6245673fb37a6b6903d80ac8da46439a6a6be81372a3474585abbe4234559b558f48c3e23a1a6 SHA512 8cd323d8cfa69cb2630805fca3cffcf373980ea9da041e5088dc6cef83acf4b001dead2cce394e41f0d57152b4b0f06498918d54324367941049f4cf180be96a diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch deleted file mode 100644 index 9e683b06d3ba..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.24.2-reduce-memory-usage.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 386f456eda7a027dfc706ebb675602d6f067f5c6 Mon Sep 17 00:00:00 2001 -From: Christian Hergert -Date: Mon, 27 Mar 2017 00:17:59 -0700 -Subject: [PATCH 5/5] common: avoid loading Adwaita CSS theme into memory - -The various Gtk programs are not dependent on any specific theme being -loaded. Therefore, the parsing the Adwaita CSS theme (which is quite a -detailed theme) is unnecessary and a few MB of overhead to each gsd -subprocess. - -By setting the GTK_THEME environment variable in main() and providing an -alternate CSS file (which is empty), we can force Gtk to never load the -default theme, but instead our empty theme. This is important as otherwise -GtkSettings can force-load Adwaita upon first use, and that fragments the -heap. - -https://bugzilla.gnome.org/show_bug.cgi?id=780555 ---- - configure.ac | 1 + - plugins/common/Makefile.am | 10 ++++++++++ - plugins/common/Makefile.am.gresources | 34 ++++++++++++++++++++++++++++++++++ - plugins/common/daemon-skeleton-gtk.h | 28 ++++++++++++++++++++++++++++ - plugins/common/gsd.gresources.xml | 6 ++++++ - plugins/common/gtk.css | 0 - 6 files changed, 79 insertions(+) - create mode 100644 plugins/common/Makefile.am.gresources - create mode 100644 plugins/common/gsd.gresources.xml - create mode 100644 plugins/common/gtk.css - -diff --git a/configure.ac b/configure.ac -index 475821d..df86831 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -73,6 +73,7 @@ AC_SUBST([GSD_PLUGIN_LDFLAGS]) - - AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) - AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) -+AC_PATH_PROG([GLIB_COMPILE_RESOURCES], [glib-compile-resources]) - - LT_LIB_M - AC_SUBST(LIBM) -diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am -index 239c601..706be12 100644 ---- a/plugins/common/Makefile.am -+++ b/plugins/common/Makefile.am -@@ -33,6 +33,8 @@ libcommon_la_SOURCES = \ - gsd-device-mapper.h \ - gsd-input-helper.c \ - gsd-input-helper.h \ -+ gsd-resources.c \ -+ gsd-resources.h \ - gsd-settings-migrate.c \ - gsd-settings-migrate.h \ - gsd-shell-helper.c \ -@@ -68,3 +70,11 @@ EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h - - CLEANFILES = \ - $(GSD_COMMON_ENUM_FILES) -+ -+DISTCLEANFILES = -+ -+glib_resources_c = gsd-resources.c -+glib_resources_h = gsd-resources.h -+glib_resources_xml = gsd.gresources.xml -+glib_resources_namespace = gsd -+include Makefile.am.gresources -diff --git a/plugins/common/Makefile.am.gresources b/plugins/common/Makefile.am.gresources -new file mode 100644 -index 0000000..1441d0e ---- /dev/null -+++ b/plugins/common/Makefile.am.gresources -@@ -0,0 +1,34 @@ -+resources_xml=$(addprefix $(srcdir)/,$(glib_resources_xml)) -+resources_srcdir=$(dir $(resources_xml)) -+ -+DISTCLEANFILES += $(glib_resources_h) $(glib_resources_c) -+BUILT_SOURCES += $(glib_resources_h) $(glib_resources_c) -+CLEANFILES += stamp-resources $(glib_resources_c) $(glib_resources_h) -+EXTRA_DIST += \ -+ $(glib_resources_xml) \ -+ $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) \ -+ $(NULL) -+ -+stamp-resources: $(glib_resources_c) $(resources_xml) -+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \ -+ --target=xgen-gr.h \ -+ --sourcedir=$(resources_srcdir) \ -+ --generate-header \ -+ --c-name $(glib_resources_namespace) \ -+ $(resources_xml) \ -+ && (cmp -s xgen-gr.h $(glib_resources_h) || cp -f xgen-gr.h $(glib_resources_h)) \ -+ && rm -f xgen-gr.h \ -+ && echo timestamp > $(@F) -+ -+$(glib_resources_h): stamp-resources -+ @true -+ -+$(glib_resources_c): $(resources_xml) $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(resources_srcdir) --generate-dependencies $(resources_xml)) -+ $(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \ -+ --target=xgen-gr.c \ -+ --sourcedir=$(resources_srcdir) \ -+ --generate-source \ -+ --c-name $(glib_resources_namespace) \ -+ $(resources_xml) \ -+ && (cmp -s xgen-gr.c $(glib_resources_c) || cp -f xgen-gr.c $(glib_resources_c)) \ -+ && rm -f xgen-gr.c -diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h -index 3bfd618..3ba0422 100644 ---- a/plugins/common/daemon-skeleton-gtk.h -+++ b/plugins/common/daemon-skeleton-gtk.h -@@ -163,6 +163,30 @@ register_with_gnome_session (void) - NULL); - } - -+static void -+set_empty_gtk_theme (gboolean set) -+{ -+ static char *old_gtk_theme = NULL; -+ -+ if (set) { -+ /* Override GTK_THEME to reduce overhead of CSS engine. By using -+ * GTK_THEME environment variable, GtkSettings is not allowed to -+ * initially parse the Adwaita theme. -+ * -+ * https://bugzilla.gnome.org/show_bug.cgi?id=780555 */ -+ old_gtk_theme = g_strdup (g_getenv ("GTK_THEME")); -+ g_setenv ("GTK_THEME", "Disabled", TRUE); -+ } else { -+ /* GtkSettings has loaded, so we can drop GTK_THEME used to initialize -+ * our internal theme. Only the main thread accesses the GTK_THEME -+ * environment variable, so this is safe to release. */ -+ if (old_gtk_theme != NULL) -+ g_setenv ("GTK_THEME", old_gtk_theme, TRUE); -+ else -+ g_unsetenv ("GTK_THEME"); -+ } -+} -+ - int - main (int argc, char **argv) - { -@@ -172,6 +196,8 @@ main (int argc, char **argv) - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - -+ set_empty_gtk_theme (TRUE); -+ - /* Work around https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ - g_type_ensure (G_TYPE_DBUS_CONNECTION); - g_type_ensure (G_TYPE_DBUS_PROXY); -@@ -187,6 +213,8 @@ main (int argc, char **argv) - exit (1); - } - -+ set_empty_gtk_theme (FALSE); -+ - if (verbose) - g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); - -diff --git a/plugins/common/gsd.gresources.xml b/plugins/common/gsd.gresources.xml -new file mode 100644 -index 0000000..e4ac1cd ---- /dev/null -+++ b/plugins/common/gsd.gresources.xml -@@ -0,0 +1,6 @@ -+ -+ -+ -+ gtk.css -+ -+ -diff --git a/plugins/common/gtk.css b/plugins/common/gtk.css -new file mode 100644 -index 0000000..e69de29 --- -2.10.2 - diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch deleted file mode 100644 index e47ba34c60dc..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.24.2-remove-unneeded-gtk-init.patch +++ /dev/null @@ -1,77 +0,0 @@ -From b567ec92d5b3004ad52fa02fb02990fcafb63373 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 27 Mar 2017 18:47:54 +0200 -Subject: [PATCH 1/3] housekeeping: Don't init GTK+ - -We don't use it. - -https://bugzilla.gnome.org/show_bug.cgi?id=780555 ---- - plugins/housekeeping/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/housekeeping/main.c b/plugins/housekeeping/main.c -index 5ccd83d..89c12f7 100644 ---- a/plugins/housekeeping/main.c -+++ b/plugins/housekeeping/main.c -@@ -4,4 +4,4 @@ - #define MANAGER GsdHousekeepingManager - #include "gsd-housekeeping-manager.h" - --#include "daemon-skeleton-gtk.h" -+#include "daemon-skeleton.h" --- -2.10.2 - - -From 92d45cd2ce2c4f252db21993f30777433ed84623 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 27 Mar 2017 18:49:35 +0200 -Subject: [PATCH 2/3] print-notifications: Don't init GTK+ - -We don't use it. - -https://bugzilla.gnome.org/show_bug.cgi?id=780555 ---- - plugins/print-notifications/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/print-notifications/main.c b/plugins/print-notifications/main.c -index 57155d0..a0dd406 100644 ---- a/plugins/print-notifications/main.c -+++ b/plugins/print-notifications/main.c -@@ -4,4 +4,4 @@ - #define MANAGER GsdPrintNotificationsManager - #include "gsd-print-notifications-manager.h" - --#include "daemon-skeleton-gtk.h" -+#include "daemon-skeleton.h" --- -2.10.2 - - -From e7e4b2145efebf132f1398da77790849becd7f6b Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 27 Mar 2017 18:50:01 +0200 -Subject: [PATCH 3/3] wacom: Don't init GTK+ - -We don't use it. - -https://bugzilla.gnome.org/show_bug.cgi?id=780555 ---- - plugins/wacom/main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/wacom/main.c b/plugins/wacom/main.c -index a19a71b..ad1367c 100644 ---- a/plugins/wacom/main.c -+++ b/plugins/wacom/main.c -@@ -4,4 +4,4 @@ - #define MANAGER GsdWacomManager - #include "gsd-wacom-manager.h" - --#include "daemon-skeleton-gtk.h" -+#include "daemon-skeleton.h" --- -2.10.2 - diff --git a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch b/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch deleted file mode 100644 index 16988f945d21..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.24.2-udevrulesdir-configure.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 04d399edc26bfa44d6053aba929e0776a193cea8 Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp -Date: Mon, 29 May 2017 00:38:57 +0300 -Subject: [PATCH 1/5] 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 1107578..475821d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -104,6 +104,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 3c5ec47..bfc34c6 100644 ---- a/plugins/rfkill/Makefile.am -+++ b/plugins/rfkill/Makefile.am -@@ -30,7 +30,6 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - org.gnome.SettingsDaemon.Rfkill.desktop: $(desktop_in_files) Makefile - $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - --udevrulesdir = $(prefix)/lib/udev/rules.d - udevrules_DATA = 61-gnome-settings-daemon-rfkill.rules - - EXTRA_DIST = $(udevrules_DATA) $(desktop_in_files) --- -2.10.2 - diff --git a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch b/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch deleted file mode 100644 index 4a06889aaa23..000000000000 --- a/gnome-base/gnome-settings-daemon/files/3.24.3-fix-wayland-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 58403ad7677d98fbb14b020dc4d15c52a695496e Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Fri, 18 Aug 2017 09:42:56 +0200 -Subject: [PATCH] Fix build issue when gudev is detected in the absence of - wayland - -See https://bugs.gentoo.org/show_bug.cgi?id=627966 ---- - configure.ac | 5 +++++ - plugins/common/Makefile.am | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 908b3a3a..c89d5e2d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -140,15 +140,20 @@ AC_ARG_ENABLE(wayland, - AS_HELP_STRING([--disable-wayland],[Disable wayland support (default: auto)]), - enable_wayland=$enableval, enable_wayland=auto) - if test x$enable_wayland != xno; then -+ AS_IF([test "$have_udev" = no], -+ [AC_MSG_ERROR([udev is required for Wayland support])]) -+ - PKG_CHECK_MODULES(WAYLAND, wayland-client, have_wayland=yes, have_wayland=no) - if test x$have_wayland = xyes; then - AC_DEFINE(HAVE_WAYLAND, 1, [Define if libwayland-client is available]) -+ GUDEV_PKG="$GUDEV_PKG gdk-wayland-3.0" - else - if test x$enable_wayland = xyes; then - AC_MSG_ERROR([Wayland enabled but not found]) - fi - fi - fi -+AM_CONDITIONAL(HAVE_WAYLAND, test x$have_wayland = xyes) - - dnl ================================================================ - dnl Plugins -diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am -index 107e4d3b..760f3198 100644 ---- a/plugins/common/Makefile.am -+++ b/plugins/common/Makefile.am -@@ -40,7 +40,7 @@ libcommon_la_SOURCES = \ - gsd-shell-helper.c \ - gsd-shell-helper.h - --if HAVE_GUDEV -+if HAVE_WAYLAND - libcommon_la_SOURCES += \ - gsd-device-manager-udev.c \ - gsd-device-manager-udev.h --- -2.14.1 - 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 -Date: Tue, 15 Aug 2017 18:51:42 +0200 -Subject: [PATCH 1/6] Make colord and wacom support optional - -Signed-off-by: Gilles Dartiguelongue -Signed-off-by: Timo Tambet -Signed-off-by: Yuh-Horng Chen ---- - 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 - diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild deleted file mode 100644 index f8ecb153f4d6..000000000000 --- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.24.3.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_EAUTORECONF="yes" -GNOME2_LA_PUNT="yes" -#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 -PYTHON_COMPAT=( python2_7 ) - -inherit gnome2 python-any-r1 systemd udev virtualx - -DESCRIPTION="Gnome Settings Daemon" -HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" - -LICENSE="GPL-2+" -SLOT="0" -IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" -REQUIRED_USE=" - input_devices_wacom? ( udev ) - smartcard? ( udev ) - wayland? ( udev ) -" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gtk+-3.15.3:3[X,wayland?] - >=gnome-base/gnome-desktop-3.11.1:3= - >=gnome-base/gsettings-desktop-schemas-3.23.3 - >=gnome-base/librsvg-2.36.2:2 - media-fonts/cantarell - media-libs/alsa-lib - media-libs/fontconfig - media-libs/libcanberra[gtk3] - >=media-sound/pulseaudio-2 - >=sys-power/upower-0.99:= - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/libnotify-0.7.3:= - x11-libs/libX11 - x11-libs/libxkbfile - x11-libs/libXi - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXtst - x11-libs/libXxf86misc - x11-misc/xkeyboard-config - - >=app-misc/geoclue-2.3.1:2.0 - >=dev-libs/libgweather-3.9.5:2= - >=sci-geosciences/geocode-glib-3.10 - >=sys-auth/polkit-0.103 - - colord? ( - >=media-libs/lcms-2.2:2 - >=x11-misc/colord-1.0.2:= ) - cups? ( >=net-print/cups-1.4[dbus] ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=x11-libs/pango-1.20 - x11-drivers/xf86-input-wacom - virtual/libgudev:= ) - networkmanager? ( >=net-misc/networkmanager-1.0 ) - smartcard? ( >=dev-libs/nss-3.11.2 ) - udev? ( virtual/libgudev:= ) - wayland? ( dev-libs/wayland ) -" -# Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly -#