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/Manifest.gz | Bin 6024 -> 6022 bytes gnome-base/gnome-control-center/Manifest | 3 - .../gnome-control-center-3.24.3.ebuild | 166 ------------------- 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 ------------------- 10 files changed, 860 deletions(-) delete mode 100644 gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild 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') diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz index 69b49bbcd528..db97c5f78df0 100644 Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest index 3cbfa37750be..95e1331225c7 100644 --- a/gnome-base/gnome-control-center/Manifest +++ b/gnome-base/gnome-control-center/Manifest @@ -1,7 +1,4 @@ -DIST gnome-control-center-3.24.2-patchset.tar.xz 8496 BLAKE2B 8bdbfcef3917ec12e82e7a5ea163f14954f9793b806c4a827620d1f693220527540f1b8a8ac0f121dae0bc8fc687f1974544b35cccd0b9e50474386c28d9ddbf SHA512 967258cf003c013881a2555be7624bad227d898cff72fe2899243692f7a06730e5dc79a849728cce6f9a7234a74b2b8433d1689c2846e8389eb9813fe5df1da1 -DIST gnome-control-center-3.24.3.tar.xz 7302120 BLAKE2B 026ad3bb34c2bfc2f7a6d398a3c47bc3f620a3f947a0cb43336b437b4926e7a360e287d6020dc0e82eda43955cfb38ffcd7ed94593adac119d7413f63bc437c8 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb DIST gnome-control-center-3.24.4-patchset.tar.xz 8076 BLAKE2B e70086987957b4c33fff6d3b5038ffc260fc47520de4606fa96a0993cee4eea699bb57e8c0a6406e7d5c99adde702351d6462bf0594398f48f6ba4c9bc217417 SHA512 6228bffb71b61a100248f2f3ffc659532e9a067579d0dcf869e58ba9fb5d0b3e745a3bda2a92caa5bc86f8809885268b543f6863262dc6fef52b61e74eaef927 DIST gnome-control-center-3.24.4.tar.xz 7320232 BLAKE2B 29a5860b8cc27f161451ae8c053db1d28e8c5f8714cbccac7674c00689569ac4e51f7deb0a341e0868b1467a095f87d685ea0ec733f69274f02ecaf5badfef6e SHA512 34a59d4d89971054b1f54e7a7e3cbc3c306a3fbe3cc94adf1241ad37076a6179c93f04a95e51e57982eda57187e578005060d711a5d955734d5a138e61b3598a -EBUILD gnome-control-center-3.24.3.ebuild 5395 BLAKE2B 48189e84413a93ce2e60edf6f40757dc29c47e0f17d2e65a91a176f8ae9bb18924d9792168f5a5948ebf145461eef26ef3cff0d8eaf1b4c4a814c0f2fcb48b9e SHA512 e390b7a0aff69f8ce52adef09b5fdbc78efff85b907a0f10af4b3f6b351f866049692962616f474089a28cb6c4edb5ee5812f1e40d50230d48fe0eb5f0ab51e8 EBUILD gnome-control-center-3.24.4.ebuild 4887 BLAKE2B 65f684a560ed9ccf73b8ffad6a2c215ceb2e9a65639ebb24db11cf429c345905816924a48b3582d5ae663839e4804d61383e249ddeb9ff197e68dbbcf2bfdd08 SHA512 2a671d3845b1fd2f6d32b3ddc6a058bd45c4e23958eb74a35f30663badae8ece2ed485e3ee6fa857a345571d101940ae131976b7d0e7514dd469c0bac0ded07c MISC metadata.xml 592 BLAKE2B b868af571d6fb58f3a7baaa586261025de5be5a928f963f6fde8db3b6549b6dd30c0d73752e296f9ba3b128c96f3a942ed6cecc8acb98d745502483822c9866b SHA512 af75d12dbd91e798b6f81933f5e6cbb73aa0a81858ec711e88e79c2a4a239dbefa9da0375bf01f2614b5098af6a883b5baf27f2f74fc166838ab00e00108b104 diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild deleted file mode 100644 index 0d5ed1ea8135..000000000000 --- a/gnome-base/gnome-control-center/gnome-control-center-3.24.3.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -GNOME2_EAUTORECONF="yes" - -inherit bash-completion-r1 gnome2 - -DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" -HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" -SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-3.24.2-patchset.tar.xz" - -LICENSE="GPL-2+" -SLOT="2" -IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" - -# False positives caused by nested configure scripts -QA_CONFIGURE_OPTIONS=".*" - -# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# g-s-d[policykit] needed for bug #403527 -# kerberos unfortunately means mit-krb5; build fails with heimdal -# udev could be made optional, only conditions gsd-device-panel -# (mouse, keyboards, touchscreen, etc) -# display panel requires colord and gnome-settings-daemon[colord] -# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) -COMMON_DEPEND=" - >=dev-libs/glib-2.44.0:2[dbus] - >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.22.0:3[X,wayland?] - >=gnome-base/gsettings-desktop-schemas-3.21.4 - >=gnome-base/gnome-desktop-3.21.2:3= - >=gnome-base/gnome-settings-daemon-3.23.90[colord,policykit] - >=x11-misc/colord-0.1.34:0= - - >=dev-libs/libpwquality-1.2.2 - dev-libs/libxml2:2 - gnome-base/libgtop:2= - media-libs/fontconfig - >=sys-apps/accountsservice-0.6.39 - - >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-2[glib] - >=sys-auth/polkit-0.97 - >=sys-power/upower-0.99:= - - virtual/libgudev - x11-apps/xmodmap - x11-libs/cairo - x11-libs/libX11 - x11-libs/libXxf86misc - >=x11-libs/libXi-1.2 - - bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) - colord? ( - net-libs/libsoup:2.4 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/colord-gtk-0.1.24 ) - cups? ( - >=net-print/cups-1.7[dbus] - >=net-fs/samba-4.0.0[client] - ) - gnome-online-accounts? ( - >=media-libs/grilo-0.3.0:0.3= - >=net-libs/gnome-online-accounts-3.21.5:= ) - ibus? ( >=app-i18n/ibus-1.5.2 ) - kerberos? ( app-crypt/mit-krb5 ) - networkmanager? ( - >=gnome-extra/nm-applet-1.2.0 - >=net-misc/networkmanager-1.2.0:=[modemmanager] - >=net-misc/modemmanager-0.7.990 ) - v4l? ( - media-libs/clutter-gtk:1.0 - >=media-video/cheese-3.5.91 ) - input_devices_wacom? ( - >=dev-libs/libwacom-0.7 - >=media-libs/clutter-1.11.3:1.0 - media-libs/clutter-gtk:1.0 - >=x11-libs/libXi-1.2 ) -" -# -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 -#