* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2016-11-02 23:39 Gilles Dartiguelongue
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue @ 2016-11-02 23:39 UTC (permalink / raw
To: gentoo-commits
commit: 0fb28074d8bb9a3bd8407231dc627a04f0fb239c
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 2 23:37:56 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Nov 2 23:39:03 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb28074
gnome-base/gnome-control-center: refresh patch stack against 3.22
Package-Manager: portage-2.3.2
.../gnome-control-center-3.22.0-gentoo-paths.patch | 120 +++++
...ontrol-center-3.22.0-keep-panels-optional.patch | 40 ++
...enter-3.22.0-make-networkmanager-optional.patch | 67 +++
...ntrol-center-3.22.0-make-wayland-optional.patch | 45 ++
.../gnome-control-center-3.22.0-optional.patch | 569 +++++++++++++++++++++
.../gnome-control-center-3.22.1.ebuild | 12 +-
6 files changed, 847 insertions(+), 6 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch
new file mode 100644
index 00000000..5d5af0d
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch
@@ -0,0 +1,120 @@
+From c093ce404bf9868980fe7b83d6aa2ab3ec7831e2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 8 Dec 2013 23:44:56 +0100
+Subject: [PATCH 5/5] Fix some absolute paths to be appropriate for Gentoo
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ panels/datetime/Makefile.am | 1 +
+ panels/datetime/test-endianess.c | 4 ++--
+ panels/datetime/test-timezone.c | 2 +-
+ panels/datetime/tz.h | 4 ++--
+ panels/printers/Makefile.am | 3 +++
+ panels/printers/cc-printers-panel.c | 4 ++--
+ panels/printers/pp-host.c | 2 +-
+ 7 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index 43523a6..d8d677d 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
+ $(DATETIME_PANEL_CFLAGS) \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
+ $(NULL)
+
+ # test-timezone is still too noisy
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
+index 06b2613..eb52bb6 100644
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -26,11 +26,11 @@ test_endianess (void)
+ GDir *dir;
+ const char *name;
+
+- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
+ if (dir == NULL) {
+ /* Try with /usr/share/locale/
+ * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+- dir = g_dir_open ("/usr/share/locale/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
+ if (dir == NULL) {
+ g_assert_not_reached ();
+ }
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
+index db5c030..7ef5cef 100644
+--- a/panels/datetime/test-timezone.c
++++ b/panels/datetime/test-timezone.c
+@@ -2,7 +2,7 @@
+ #include <gtk/gtk.h>
+ #include "cc-timezone-map.h"
+
+-#define TZ_DIR "/usr/share/zoneinfo/"
++#define TZ_DIR REALDATADIR "/zoneinfo/"
+
+ static GList *
+ get_timezone_list (GList *tzs,
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
+index 93905b3..1ba918c 100644
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -28,9 +28,9 @@
+ #include <glib.h>
+
+ #ifndef __sun
+-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
+ #else
+-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
++# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
+
+ typedef struct _TzDB TzDB;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 512cda5..87726dd 100644
+--- a/panels/printers/Makefile.am
++++ b/panels/printers/Makefile.am
+@@ -10,6 +10,9 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/shell/ \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DTEST_SRCDIR=\""$(srcdir)/"\" \
++ -DREALDATADIR="\"$(datadir)\"" \
++ -DPREFIX="\"$(prefix)\"" \
++ -DLIBEXECDIR="\"$(libexecdir)\"" \
+ $(NULL)
+
+ noinst_LTLIBRARIES = libprinters.la
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
+index fb55608..a6dfb90 100644
+--- a/panels/printers/cc-printers-panel.c
++++ b/panels/printers/cc-printers-panel.c
+@@ -2590,8 +2590,8 @@ test_page_cb (GtkButton *button,
+
+ if (printer_name)
+ {
+- const gchar *const dirs[] = { "/usr/share/cups",
+- "/usr/local/share/cups",
++ const gchar *const dirs[] = { REALDATADIR "/cups",
++ PREFIX "/local/share/cups",
+ NULL };
+ const gchar *datadir = NULL;
+ http_t *http = NULL;
+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
+index fbfb434..bd00518 100644
+--- a/panels/printers/pp-host.c
++++ b/panels/printers/pp-host.c
+@@ -254,7 +254,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
+ data->devices->devices = NULL;
+
+ argv = g_new0 (gchar *, 3);
+- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
++ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
+ argv[1] = g_strdup (priv->hostname);
+
+ /* Use SNMP to get printer's informations */
+--
+2.10.1
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch
new file mode 100644
index 00000000..2bd4e0e
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch
@@ -0,0 +1,40 @@
+From 0ee5e7191e62e6df9067fa5b0886d09952d4e315 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 11 May 2015 23:59:03 +0200
+Subject: [PATCH 3/5] Optional gotta be optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 140459c..fe947d7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -512,22 +512,6 @@ else
+ AC_MSG_RESULT(no)
+ fi
+
+-case $host_os in
+- linux*)
+- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+- # Nothing
+- echo "USB-related panels disabled on S390"
+- else
+- if test "x$have_networkmanager" != "xyes" -o \
+- "x$have_bluetooth" != "xyes" -o \
+- "x$enable_cups" != "xyes" -o \
+- "x$have_wacom" != "xyes"; then
+- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems])
+- fi
+- fi
+- ;;
+-esac
+-
+ AC_CONFIG_FILES([
+ Makefile
+ panels/Makefile
+--
+2.10.1
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch
new file mode 100644
index 00000000..f4a7d3b
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch
@@ -0,0 +1,67 @@
+From 1ad9510963dc634cb1805ca9e4726004130fc7e3 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 12 May 2015 00:32:11 +0200
+Subject: [PATCH 4/5] Make network panel optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 43 +++++++++++++++++++++++++------------------
+ 1 file changed, 25 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe947d7..6ecda91 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -241,24 +241,31 @@ AS_IF([test "$enable_wayland" != "no"],
+ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
+ ])
+
+-PKG_CHECK_MODULES(NETWORK_MANAGER,
+- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
+- libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
+- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
+- [have_networkmanager=yes], have_networkmanager=no)
+-if test "x$have_networkmanager" = xno ; then
+- AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
+-else
+- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
+-fi
+-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
+-if test x${have_networkmanager} = xyes; then
+- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
+- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
+- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
+- AC_SUBST(NM_VPN_CONFIG_DIR)
+- AC_SUBST(NM_VPN_MODULE_DIR)
+-fi
++AC_ARG_ENABLE([networkmanager],
++ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]),
++ [],
++ [enable_networkmanager=auto])
++AS_IF([test "$enable_networkmanager" != "no"],
++ [
++ PKG_CHECK_MODULES(NETWORK_MANAGER,
++ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
++ libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
++ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
++ [have_networkmanager=yes], [have_networkmanager=no])
++
++ AS_IF([test "$have_networkmanager" = "no"],
++ [
++ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***])
++ ], [
++ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
++ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
++ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
++ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
++ AC_SUBST([NM_VPN_CONFIG_DIR])
++ AC_SUBST([NM_VPN_MODULE_DIR])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
+
+ # Check for power panel
+ if test x${have_networkmanager} = xyes; then
+--
+2.10.1
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch
new file mode 100644
index 00000000..2c06408
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch
@@ -0,0 +1,45 @@
+From 09d1f1a057268a6acdfb42e7dcb2843c0066f542 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <tranquility@gentoo.org>
+Date: Sat, 25 Apr 2015 22:22:09 +0200
+Subject: [PATCH 2/5] Make wayland support optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19096f5..140459c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -225,12 +225,21 @@ if test "x$have_udev" = xyes ; then
+ fi
+ AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
+
+-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
+-if test "x$have_wayland" = xyes ; then
+- if test "x$have_udev" != xyes ; then
+- AC_MSG_ERROR([udev is required for Wayland support])
+- fi
+-fi
++AC_ARG_ENABLE(
++ [wayland],
++ AS_HELP_STRING([--disable-wayland], [disable wayland support]),
++ [],
++ enable_wayland=auto
++)
++
++AS_IF([test "$enable_wayland" != "no"],
++ [
++ AS_IF([test "x$have_udev" = xno],
++ [AC_MSG_ERROR([udev is required for Wayland support])],
++ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
++
++ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
++])
+
+ PKG_CHECK_MODULES(NETWORK_MANAGER,
+ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
+--
+2.10.1
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch
new file mode 100644
index 00000000..fd1226c
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch
@@ -0,0 +1,569 @@
+From 108d79460d42d5e8167ad52747628f9dfd21058d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 2 Nov 2016 23:40:52 +0100
+Subject: [PATCH 1/5] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 185 +++++++++++++++++++++++---------
+ panels/Makefile.am | 10 +-
+ panels/background/Makefile.am | 8 +-
+ panels/background/bg-pictures-source.c | 20 ++++
+ panels/power/cc-power-panel.c | 2 +-
+ panels/user-accounts/um-realm-manager.c | 9 ++
+ shell/Makefile.am | 10 +-
+ shell/cc-panel-loader.c | 8 ++
+ 8 files changed, 196 insertions(+), 56 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1e07acd..19096f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+- goa-1.0 >= $GOA_REQUIRED_VERSION
+- grilo-0.3 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -140,12 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+- colord >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- libsoup-2.4
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_online_accounts=no
++background_online_accounts=
++AC_ARG_ENABLE([goa],
++ AS_HELP_STRING([--disable-goa],
++ [disable online accounts management panel]),
++ [],
++ [enable_goa=auto])
++
++AS_IF([test "$enable_goa" != "no"],
++ [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL],
++ [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION],
++ [
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++ build_online_accounts=yes
++ background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION"
++ ], [
++ AS_IF([test "$enable_goa" = "yes"],
++ [AC_MSG_ERROR([gnome-online-accounts support requested but not found])])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes")
++
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++ $background_goa_dependencies)
++
++build_color=no
++AC_ARG_ENABLE([color],
++ AS_HELP_STRING([--disable-color],
++ [disable color management panel]),
++ []
++ [enable_color=auto])
++
++AS_IF([test "$enable_color" != "no"],
++ [PKG_CHECK_MODULES([COLOR_PANEL],
++ [
++ $COMMON_MODULES
++ colord >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++ ], [
++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++ build_color=yes
++ ], [
++ AS_IF([test "$enable_goa" = "yes"],
++ [AC_MSG_ERROR([colord support requested but not found])])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -220,15 +262,27 @@ else
+ fi
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
+- [have_bluetooth=yes], have_bluetooth=no)
+-if test "x$have_bluetooth" = xyes ; then
+- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+-fi
+-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
+-if test x${have_bluetooth} = xyes; then
+- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
+-fi
++have_bluetooth=no
++AC_ARG_ENABLE([bluetooth],
++ AS_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [],
++ [enable_bluetooth=auto])
++
++AS_IF([test "$enable_bluetooth" = "yes"],
++ [PKG_CHECK_MODULES([BLUETOOTH],
++ [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2],
++ [
++ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
++ have_bluetooth=yes
++ ],
++ [
++ have_bluetooth=no
++ AS_IF([test "$enable_bluetooth" = "yes"],
++ [AC_MSG_ERROR([bluetooth support requested but not found])])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
+
+ # Check for smbclient
+ PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])
+@@ -301,38 +355,61 @@ fi
+ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
+
+ # wacom is disabled for s390/s390x and non Linux platforms (needs udev)
+-case $host_os in
+- linux*)
+- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+- have_wacom=no
+- else
+- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+- clutter-gtk-1.0
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+- have_wacom=yes
+- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
+- fi
+- ;;
+- *)
+- have_wacom=no
+- ;;
+-esac
+-AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
++have_wacom=no
++AS_CASE([$host_os],
++ [linux*],
++ [AS_IF([test "$host_cpu" = "s390" -o "$host_cpu" = "s390x"],
++ [have_wacom=no],
++ [
++ AC_ARG_ENABLE([wacom],
++ AS_HELP_STRING([--disable-wacom],
++ [disable wacom management panel]),
++ [],
++ [enable_wacom=yes])
++ AS_IF([test "$enable_wacom" = "yes"],
++ [PKG_CHECK_MODULES([WACOM_PANEL],
++ [
++ $COMMON_MODULES
++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++ clutter-gtk-1.0
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION
++ ], [
++ have_wacom=yes
++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ ], [
++ have_wacom=no
++ AS_IF([test "$enable_wacom" = "yes"],
++ [AC_MSG_ERROR([wacom support requested but not found])])
++ ])
++ ])
++ ])
++ ],
++ [have_wacom=no])
++AM_CONDITIONAL(BUILD_WACOM, [test "$have_wacom" = "yes"])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos],
++ [disable kerberos support (default: enabled)]),
++ [],
++ [enable_kerberos=yes])
++
++AS_IF([test "$enable_kerberos" != "no"],
++ [
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++
++ AS_IF([test "$KRB5_CONFIG" = "no"],
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]))
++
++ AC_MSG_CHECKING([for krb5 libraries and flags])
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++ ])
+
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+@@ -569,6 +646,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ else
+ AC_MSG_NOTICE([ Bluetooth panel disabled])
+ fi
++if test "x$build_color" = "xyes"; then
++ AC_MSG_NOTICE([** colord (Color panel)])
++else
++ AC_MSG_NOTICE([ Color panel disabled])
++fi
+ if test "x$enable_cups" = "xyes"; then
+ AC_MSG_NOTICE([** CUPS (Printers panel)])
+ else
+@@ -579,6 +661,11 @@ if test "x$have_cheese" = "xyes"; then
+ else
+ AC_MSG_NOTICE([ Users panel webcam support disabled])
+ fi
++if test "x$build_online_accounts" = "xyes"; then
++ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
++else
++ AC_MSG_NOTICE([ Online Accounts panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+- online-accounts \
+ region \
+ info \
+ sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ privacy \
+ sharing
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb8017..bde4cdf 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ cc-background-chooser-dialog.c \
+ cc-background-chooser-dialog.h \
+- cc-background-grilo-miner.c \
+- cc-background-grilo-miner.h \
+ cc-background-item.c \
+ cc-background-item.h \
+ cc-background-xml.c \
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
+ bg-colors-source.c \
+ bg-colors-source.h
+
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES += \
++ cc-background-grilo-miner.c \
++ cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
+ libbackground_la_SOURCES = \
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index a33cee7..408359c 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+
+ #include "bg-pictures-source.h"
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+ GCancellable *cancellable;
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ CcBackgroundGriloMiner *grl_miner;
++#endif
+
+ GnomeDesktopThumbnailFactory *thumb_factory;
+
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+ g_clear_object (&priv->cancellable);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ g_clear_object (&priv->grl_miner);
++#endif
+ g_clear_object (&priv->thumb_factory);
+
+ G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
+ gboolean needs_download;
+ gboolean retval = FALSE;
+ GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+ GrlMedia *media;
++#else
++ gpointer media = NULL;
++#endif
+
+ /* find png and jpeg files */
+ if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
+
+ read_file:
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+ if (media == NULL)
+ {
+ g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
+ return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+ GFile *file,
+@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+
+ return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ gboolean
+ bg_pictures_source_add (BgPicturesSource *bg_source,
+@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self,
+ return monitor;
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+ add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+ priv->cache_dir_monitor = monitor_path (self, cache_path);
+ g_free (cache_path);
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ priv->grl_miner = cc_background_grilo_miner_new ();
+ g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+ cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ priv->thumb_factory =
+ gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index db4e69a..7677b58 100644
+--- a/panels/power/cc-power-panel.c
++++ b/panels/power/cc-power-panel.c
+@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self)
+ G_CALLBACK (wifi_switch_changed), self);
+ #endif
+
+-#ifdef HAVE_BLUETOOTH
++#ifdef BUILD_BLUETOOTH
+ priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 8a0a0e6..22c6b94 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -698,6 +700,7 @@ login_closure_free (gpointer data)
+ g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+ const gchar *realm,
+@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5,
+
+ return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+ GObject *object,
+ GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+ krb5_context k5 = NULL;
+ krb5_error_code code;
+@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+ if (k5)
+ krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++ _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index 45f6363..b76f343 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/common/libdevice.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+ $(top_builddir)/panels/keyboard/libkeyboard.la \
+ $(top_builddir)/panels/mouse/libmouse-properties.la \
+ $(top_builddir)/panels/notifications/libnotifications.la \
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
+ $(top_builddir)/panels/power/libpower.la \
+ $(top_builddir)/panels/privacy/libprivacy.la \
+ $(top_builddir)/panels/region/libregion.la \
+@@ -111,6 +109,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ gnome_control_center_alt_LDADD = \
+ $(gnome_control_center_LDADD) \
+ alt/libshell_alt.la
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 03dbfb1..a713079 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+@@ -87,7 +93,9 @@ static struct {
+ PANEL_TYPE("network", cc_network_panel_get_type ),
+ #endif
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
++#endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
+ #ifdef BUILD_PRINTERS
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
+--
+2.10.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
index 77c52d4..c190e73 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild
@@ -27,7 +27,7 @@ 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.19.3
+ >=gnome-base/gsettings-desktop-schemas-3.21.4
>=gnome-base/gnome-desktop-3.21.2:3=
>=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
@@ -127,13 +127,13 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- eapply "${FILESDIR}"/${PN}-3.20.0-optional.patch
- eapply "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
- eapply "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
- eapply "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-optional.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-keep-panels-optional.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-make-networkmanager-optional.patch
# Fix some absolute paths to be appropriate for Gentoo
- eapply "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-gentoo-paths.patch
eautoreconf
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2024-04-28 20:44 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2024-04-28 20:44 UTC (permalink / raw
To: gentoo-commits
commit: da5993731c13d2158af53e840fab334bc3ab56e6
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 17:15:15 2024 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 20:43:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da599373
gnome-base/gnome-control-center: drop 44.3, 45.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-control-center/Manifest | 3 -
.../45.2-fix_incompatible_type_warnings.patch | 39 ----
.../gnome-control-center-44.3.ebuild | 202 -------------------
.../gnome-control-center-45.2.ebuild | 216 ---------------------
4 files changed, 460 deletions(-)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 1997277317c2..8b3665d85208 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,7 +1,4 @@
-DIST gnome-control-center-44.0-patchset.tar.xz 6004 BLAKE2B a647cd83fe5d2283edc341afaa6d55661b905fea740729cf21679c3593e5e339aec507b835fd57c11d1fdde8db338b57ff8e24f464bb1296ad7a5bd1fb7319c3 SHA512 85cdcf4d55028550cfd871285729d265f1f8b74ec46ad656ada122f511ec617a21c5927923e4000f3a2d7ca08f49aafc28cecbd4ab840db377fa2d4054997b6f
-DIST gnome-control-center-44.3.tar.xz 7634240 BLAKE2B edd9cdd0f2cccd628670020f58f4c56f90fe7264593f8546a4d98c46cd12a1d3618f92532b1afdbd405e1ac8921d69f4f02a91e68507e8c3cd6aa29637ec0f41 SHA512 4eb4b2bd0109acc4626d64eaf948dc2b0442602a8219a9be880472710c124d2b4dabbcc74aaab1192d6bef74ad2757e719efd81b5d09850f348bc925d6f60355
DIST gnome-control-center-45.0-patchset.tar.xz 5888 BLAKE2B 7b7d818392e8758ca4d9247f55b84e4e8a37419859040e35d8fb3cef16f09423ad74a88a821a5f5947b3f36543ccc328f9a61cb71f92155b6a14669732569910 SHA512 e58adc6bb61d04f8c5ecf36335fedd190e063e42eed8e1023dcac95665a270d57c7cbd377fd0f5239f2c144040a9699b428536ffdbac798655b2c9aef25e71ae
-DIST gnome-control-center-45.2.tar.xz 7715304 BLAKE2B 5b0b42cf8b1e4e908cbf4dc24018fd645cf4e9643f0233e953bcce5975302eb103306dae37270cce11f0fbe059fbd5dfd6b10cb6dcc08cf4765f648f8f73b32b SHA512 08749b6246e401982bd9c0088a5e2e517c7e8e2cea2fdce5fd29841a6c73b6bad9fba2d2af726f31cde3b64705cc9db22982673117f170cea27bae48911775de
DIST gnome-control-center-45.3.tar.xz 7757512 BLAKE2B 2f38b9b6a5c7171eefd8899bb9156b49f6b41f60ce2bfb36d7ade7261cd038ddb60bcc9a6a71e6c49209f0f3c13c49b38758a19f02cc9735cea2874368602434 SHA512 0aad27f3324940292551c0aa9fa79771d1d41cc5a633970c709836a2d6af575f688df8553755f936495f75a02268a5a1f89e7f3b5fb03512140c73bf14fc4cf5
DIST gnome-control-center-gentoo-logo-dark.svg 14293 BLAKE2B 570e9326b8abe45849c31fd5cdb3fcfb1b2f18eac522f958928df5c3b747b0699f50a882f31cf7c0ae1f2138194f18596f738f42c942b57d340c53d46d82c551 SHA512 91227dafcf2091bb1568b0f9eec68b5e371ec64c9a6bc3605821f60d6bf2bd94dec0564f6a16a4a70d1db4d4df49fc25b6c910367bae3b85205cc609a9f2701b
DIST gnome-control-center-gentoo-logo.svg 14288 BLAKE2B 371fc68b1015c8672db3e3858ae9077b1e3a9937e6add8690c39db36302ec031391c4d35e0c0b87094ca474a00c4187849e2d7111df34f43bc5bd7be52678527 SHA512 cf88933546de54ca15e2e830ac1086a78c4150f0ff59b8091e7e1cade5961c4e4cb83120a818a960b77841353ce3584ddc8f36b6edbde05543600283a143ad7b
diff --git a/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch b/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch
deleted file mode 100644
index 4b0867bfa0b2..000000000000
--- a/gnome-base/gnome-control-center/files/45.2-fix_incompatible_type_warnings.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 13c939659a844049ddc68e90c7830bf96ebe174d Mon Sep 17 00:00:00 2001
-From: Marco Melorio <marco.melorio@protonmail.com>
-Date: Thu, 5 Oct 2023 19:21:39 +0200
-Subject: [PATCH] misc: Fix incompatible type warnings
-
----
- panels/datetime/cc-datetime-panel.c | 2 +-
- panels/network/net-device-wifi.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
-index 3544411d04..204b8ce44d 100644
---- a/panels/datetime/cc-datetime-panel.c
-+++ b/panels/datetime/cc-datetime-panel.c
-@@ -695,7 +695,7 @@ list_box_row_activated (CcDateTimePanel *self,
- }
- else if (row == GTK_LIST_BOX_ROW (self->timezone_row))
- {
-- present_window (self, self->timezone_dialog);
-+ present_window (self, GTK_WINDOW (self->timezone_dialog));
- }
- }
-
-diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
-index dd4453d0f8..3cb66e19fa 100644
---- a/panels/network/net-device-wifi.c
-+++ b/panels/network/net-device-wifi.c
-@@ -780,7 +780,7 @@ net_device_wifi_dispose (GObject *object)
- NetDeviceWifi *self = NET_DEVICE_WIFI (object);
-
- if (self->hotspot_dialog) {
-- gtk_window_destroy (self->hotspot_dialog);
-+ gtk_window_destroy (GTK_WINDOW (self->hotspot_dialog));
- self->hotspot_dialog = NULL;
- }
-
---
-GitLab
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-44.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-44.3.ebuild
deleted file mode 100644
index 0f5bbbb36bd9..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-44.3.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-44.0-patchset.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
-# Logo is CC-BY-SA-2.5
-LICENSE="GPL-2+ CC-BY-SA-2.5"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- ^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime, but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
- gnome-online-accounts? (
- x11-libs/gtk+:3
- >=net-libs/gnome-online-accounts-3.25.3:=
- )
- >=media-libs/libpulse-2.0[glib]
- >=gui-libs/gtk-4.9.3:4[X,wayland=]
- >=gui-libs/libadwaita-1.2.0:1
- >=sys-apps/accountsservice-0.6.39
- >=x11-misc/colord-0.1.34:0=
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=dev-libs/glib-2.75.0:2
- gnome-base/gnome-desktop:4=
- >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
- >=gnome-base/gsettings-desktop-schemas-42_alpha
- dev-libs/libxml2:2
- >=sys-power/upower-0.99.8:=
- >=dev-libs/libgudev-232
- >=x11-libs/libX11-1.8
- >=x11-libs/libXi-1.2
- media-libs/libepoxy
- app-crypt/gcr:0=
- >=dev-libs/libpwquality-1.2.2
- >=sys-auth/polkit-0.114
- cups? (
- >=net-print/cups-1.7[dbus]
- >=net-fs/samba-4.0.0[client]
- )
- ibus? ( >=app-i18n/ibus-1.5.2 )
- networkmanager? (
- >=net-libs/libnma-1.10.2
- >=net-misc/networkmanager-1.24.0[modemmanager]
- >=net-misc/modemmanager-0.7.990:=
- )
- bluetooth? ( net-wireless/gnome-bluetooth:3= )
- input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
- kerberos? ( app-crypt/mit-krb5 )
-
- x11-libs/cairo[glib]
- >=x11-libs/colord-gtk-0.3.0:=
- media-libs/fontconfig
- gnome-base/libgtop:2=
- >=sys-fs/udisks-2.1.8:2
- app-crypt/libsecret
- net-libs/gnutls:=
- media-libs/gsound
-
- x11-libs/pango
-"
-# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
-# Settings/Sound/Output/Output Device, bug #814110
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
- media-libs/libcanberra[pulseaudio,sound]
- systemd? ( >=sys-apps/systemd-31 )
- elogind? (
- app-admin/openrc-settingsd
- sys-auth/elogind
- )
- x11-themes/adwaita-icon-theme
- >=gnome-extra/gnome-color-manager-3.1.2
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper
- )
- >=gnome-base/libgnomekbd-3
- wayland? ( dev-libs/libinput )
- !wayland? (
- >=x11-drivers/xf86-input-libinput-0.19.0
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
- )
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
- networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- x11-base/xorg-proto
- dev-libs/libxml2:2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? (
- $(python_gen_any_dep '
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ')
- x11-apps/setxkbmap
- )
-"
-
-PATCHES=(
- # Patches from gnome-43 branch
- # Makes some panels and dependencies optional
- # https://bugzilla.gnome.org/686840, 697478, 700145
- # Fix some absolute paths to be appropriate for Gentoo
- "${WORKDIR}"/patches/
-)
-
-python_check_deps() {
- use test || return 0
- python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- xdg_environment_reset
- # Mark python tests with shebang executable, so that meson will launch them directly, instead
- # of via its own python-single-r1 version, which might not match what we get from python_check_deps
- chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth)
- -Dcups=$(usex cups enabled disabled)
- -Ddocumentation=true # manpage
- -Dgoa=$(usex gnome-online-accounts enabled disabled)
- $(meson_use ibus)
- -Dkerberos=$(usex kerberos enabled disabled)
- $(meson_use networkmanager network_manager)
- -Dprivileged_group=wheel
- -Dsnap=false
- $(meson_use test tests)
- $(meson_use input_devices_wacom wacom)
- #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
- # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
- -Dmalcontent=false # unpackaged
- -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
- -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-src_install() {
- meson_src_install
- insinto /usr/share/pixmaps
- doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
- doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild
deleted file mode 100644
index 4dc180b6f5ed..000000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-45.2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit flag-o-matic gnome.org gnome2-utils meson python-any-r1 virtualx xdg
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-control-center"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-45.0-patchset.tar.xz"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo.svg"
-SRC_URI+=" https://dev.gentoo.org/~mattst88/distfiles/${PN}-gentoo-logo-dark.svg"
-# Logo is CC-BY-SA-2.5
-LICENSE="GPL-2+ CC-BY-SA-2.5"
-SLOT="2"
-IUSE="+bluetooth +cups debug elogind +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager systemd test wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- ^^ ( elogind systemd )
-" # Theoretically "?? ( elogind systemd )" is fine too, lacking some functionality at runtime,
-# but needs testing if handled gracefully enough
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-
-# meson.build depends on python unconditionally
-BDEPEND="${PYTHON_DEPS}"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional).
-# Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-DEPEND="
- gnome-online-accounts? (
- x11-libs/gtk+:3
- >=net-libs/gnome-online-accounts-3.25.3:=
- )
- >=media-libs/libpulse-2.0[glib]
- >=gui-libs/gtk-4.11.2:4[X,wayland=]
- >=gui-libs/libadwaita-1.4_alpha:1
- >=sys-apps/accountsservice-0.6.39
- >=x11-misc/colord-0.1.34:0=
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=dev-libs/glib-2.75.0:2
- gnome-base/gnome-desktop:4=
- >=gnome-base/gnome-settings-daemon-41.0[colord,input_devices_wacom?]
- >=gnome-base/gsettings-desktop-schemas-42_alpha
- dev-libs/libxml2:2
- >=sys-power/upower-0.99.8:=
- >=dev-libs/libgudev-232
- >=x11-libs/libX11-1.8
- >=x11-libs/libXi-1.2
- media-libs/libepoxy
- app-crypt/gcr:0=
- >=dev-libs/libpwquality-1.2.2
- >=sys-auth/polkit-0.114
- cups? (
- >=net-print/cups-1.7[dbus]
- >=net-fs/samba-4.0.0[client]
- )
- ibus? ( >=app-i18n/ibus-1.5.2 )
- networkmanager? (
- >=net-libs/libnma-1.10.2
- >=net-misc/networkmanager-1.24.0[modemmanager]
- >=net-misc/modemmanager-0.7.990:=
- )
- bluetooth? ( net-wireless/gnome-bluetooth:3= )
- input_devices_wacom? ( >=dev-libs/libwacom-0.27:= )
- kerberos? ( app-crypt/mit-krb5 )
-
- x11-libs/cairo[glib]
- >=x11-libs/colord-gtk-0.3.0:=
- media-libs/fontconfig
- gnome-base/libgtop:2=
- >=sys-fs/udisks-2.1.8:2
- app-crypt/libsecret
- net-libs/gnutls:=
- media-libs/gsound
-
- x11-libs/pango
-"
-# media-libs/libcanberra[pulseaudio,sound] needed for Speaker tests in
-# Settings/Sound/Output/Output Device, bug #814110
-# systemd/elogind USE flagged because package manager will potentially try to satisfy a
-# "|| ( systemd ( elogind openrc-settingsd)" via systemd if openrc-settingsd isn't already installed.
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${DEPEND}
- media-libs/libcanberra[pulseaudio,sound]
- systemd? ( >=sys-apps/systemd-31 )
- elogind? (
- app-admin/openrc-settingsd
- sys-auth/elogind
- )
- x11-themes/adwaita-icon-theme
- >=gnome-extra/gnome-color-manager-3.1.2
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper
- )
- gnome-extra/tecla
- wayland? ( dev-libs/libinput )
- !wayland? (
- >=x11-drivers/xf86-input-libinput-0.19.0
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 )
- )
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1
- networkmanager? ( gnome-extra/nm-applet )" # networking panel can call into nm-connection-editor
-
-BDEPEND="
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- x11-base/xorg-proto
- dev-libs/libxml2:2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
- test? (
- $(python_gen_any_dep '
- dev-python/python-dbusmock[${PYTHON_USEDEP}]
- ')
- x11-apps/setxkbmap
- )
-"
-
-PATCHES=(
- # Patches from gnome-43 branch
- # Makes some panels and dependencies optional
- # https://bugzilla.gnome.org/686840, 697478, 700145
- # Fix some absolute paths to be appropriate for Gentoo
- "${WORKDIR}"/patches/
- # misc: Fix incompatible type warnings
- "${FILESDIR}"/45.2-fix_incompatible_type_warnings.patch
-)
-
-python_check_deps() {
- use test || return 0
- python_has_version "dev-python/python-dbusmock[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- xdg_environment_reset
- # Mark python tests with shebang executable, so that meson will launch them directly, instead
- # of via its own python-single-r1 version, which might not match what we get from python_check_deps
- chmod a+x tests/network/test-network-panel.py tests/datetime/test-datetime.py || die
-}
-
-src_configure() {
- # -Werror=strict-aliasing
- # https://bugs.gentoo.org/889008
- # https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/2563
- #
- # Do not trust with LTO either
- append-flags -fno-strict-aliasing
- filter-lto
-
- local emesonargs=(
- $(meson_use bluetooth)
- -Dcups=$(usex cups enabled disabled)
- -Ddocumentation=true # manpage
- -Dgoa=$(usex gnome-online-accounts enabled disabled)
- $(meson_use ibus)
- -Dkerberos=$(usex kerberos enabled disabled)
- $(meson_use networkmanager network_manager)
- -Dprivileged_group=wheel
- -Dsnap=false
- $(meson_use test tests)
- $(meson_use input_devices_wacom wacom)
- #$(meson_use wayland) # doesn't do anything in 3.34 and 3.36 due to unified gudev handling code
- # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2,
- # which is the same as $(get_bashcompdir)
- -Dmalcontent=false # unpackaged
- -Ddistributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo.svg
- -Ddark_mode_distributor_logo=/usr/share/pixmaps/gnome-control-center-gentoo-logo-dark.svg
- )
- meson_src_configure
-}
-
-src_test() {
- virtx meson_src_test
-}
-
-src_install() {
- meson_src_install
- insinto /usr/share/pixmaps
- doins "${DISTDIR}"/gnome-control-center-gentoo-logo.svg
- doins "${DISTDIR}"/gnome-control-center-gentoo-logo-dark.svg
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2022-04-08 18:04 Matt Turner
0 siblings, 0 replies; 12+ messages in thread
From: Matt Turner @ 2022-04-08 18:04 UTC (permalink / raw
To: gentoo-commits
commit: e1b75bb5ecb953f5501cce82dabe07994aff338f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 18:03:29 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 18:04:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b75bb5
gnome-base/gnome-control-center: Add patch to fix goa-helper on X11
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
...2.0-online-accounts-Fix-goa-helper-on-X11.patch | 32 ++++++++++++++++++++++
....ebuild => gnome-control-center-42.0-r1.ebuild} | 2 ++
2 files changed, 34 insertions(+)
diff --git a/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch b/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch
new file mode 100644
index 000000000000..dfa56eab9e61
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/42.0-online-accounts-Fix-goa-helper-on-X11.patch
@@ -0,0 +1,32 @@
+From 7fe322b9cedae313cd9af6f403eab9bfc6027674 Mon Sep 17 00:00:00 2001
+From: Jan Tojnar <jtojnar@gmail.com>
+Date: Mon, 28 Mar 2022 21:02:23 +0200
+Subject: [PATCH] online-accounts: Fix goa-helper on X11
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The handle_str contains the “x11:” prefix so strtol would return 0.
+We need to pass it the numeric substring.
+
+Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1651
+---
+ panels/online-accounts/gnome-control-center-goa-helper.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/online-accounts/gnome-control-center-goa-helper.c b/panels/online-accounts/gnome-control-center-goa-helper.c
+index 56513147e..533609cbc 100644
+--- a/panels/online-accounts/gnome-control-center-goa-helper.c
++++ b/panels/online-accounts/gnome-control-center-goa-helper.c
+@@ -129,7 +129,7 @@ set_external_parent_from_handle (GtkApplication *application,
+ int xid;
+
+ errno = 0;
+- xid = strtol (handle_str, NULL, 16);
++ xid = strtol (handle_str + strlen (x11_prefix), NULL, 16);
+ if (errno != 0)
+ {
+ g_warning ("Failed to reference external X11 window, invalid XID %s", handle_str);
+--
+2.35.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild
similarity index 98%
rename from gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild
index 43a08b3e178c..70008f3ef6ff 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-42.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-42.0-r1.ebuild
@@ -118,6 +118,8 @@ BDEPEND="
"
PATCHES=(
+ "${FILESDIR}"/${PV}-online-accounts-Fix-goa-helper-on-X11.patch
+
# Patches from gnome-40 branch on top of 40.0
# Makes some panels and dependencies optional
# https://bugzilla.gnome.org/686840, 697478, 700145
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2019-03-30 21:56 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-03-30 21:56 UTC (permalink / raw
To: gentoo-commits
commit: 3c5020795bc5ad4cc124b7793d7e5cd60e237042
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 30 21:51:35 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 21:56:28 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c502079
gnome-base/gnome-control-center: remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
gnome-base/gnome-control-center/Manifest | 4 -
.../files/3.26.2-gnome-desktop-3-28-compat.patch | 78 ----------
.../files/3.26.2-goa-lifecycle.patch | 95 ------------
.../files/3.26.2-without-wayland-fix.patch | 46 ------
.../gnome-control-center-3.26.2-r28.ebuild | 159 --------------------
.../gnome-control-center-3.26.2-r3.ebuild | 160 ---------------------
.../gnome-control-center-3.28.2.ebuild | 149 -------------------
.../gnome-control-center-3.30.3.ebuild | 153 --------------------
8 files changed, 844 deletions(-)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 633ab568c15..8f8fc06e162 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,8 +1,4 @@
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
-DIST gnome-control-center-3.26.2-patchset.tar.xz 159088 BLAKE2B 521af115f7d4372ecf645b915e9081607a6699528b2914e73f11856fc9a8ae80406c210ad97b5d84b616d324d0c1539e2155c5e6db4920cbd8355b85f21a8e3b SHA512 90bf9e19b98dcc39fe5af6604876e5d9fe31358a4da602fe518589d9b3a9261fee3b3785f40a889295e3e7b38370173d03350f475be576830efa2ad74718c19e
-DIST gnome-control-center-3.26.2.tar.xz 7386516 BLAKE2B 156c24bc2ab60943ade1e255976e29478c9b0e9dbad12921a835ec55f09ad62c71886750a50fa74f2a0afb660cac073c9ff54cef4b72c790b6dd91c7cac8aaa9 SHA512 d3ad9067c7e66a3a6bf5b6c058f3862f6e4b59c0254fd47f0b4a9093f3b7e2d7f1900b510aba8bbdac7c1212a0f6cdd4974c3d04003af63edb72ed3e56f7dbca
-DIST gnome-control-center-3.28.2-patchset.tar.xz 75820 BLAKE2B 7f7cda69248862eb9ddba5d69d84c6cf1e550a9db6d914d4f5327b107d01bcb4b40152889ffc13700a8e777b805b037a267e9b641df65612a86099e0851ab417 SHA512 927287e98d1b958b27a644a90fe3da38ba3040a60e4318268f46e764226906d851148370635ab232748f5ef78cf9406b71025738cdec951582042ce4282914c6
-DIST gnome-control-center-3.28.2.tar.xz 5857128 BLAKE2B 253c220fdc759a26f23210a7665323ccdfb18e5f76652791718f2523badbac1f42c9c0fd75e5505c1e3d5f7391abc344b47cb101741ef35ed60859c4c16d7988 SHA512 3e1b54cf1a603ee7c47d8b0f1fb025405c8d133c9e0dbe0eaf2f287eff82109e95581c79f131d227422d682b7049ccb6e6297dba1ff2276cff5f715308195d7f
DIST gnome-control-center-3.30.3-patchset.tar.xz 65244 BLAKE2B d210f94e0058e628401ea74fa90582721aaffddfb0e3f8e78013edde0d2f712d4433c316b3da08c9ec1038200cfd4e9b1a315b224d2e881d056b0f685f7067eb SHA512 99519c54ef223b94d5101987b7d7dc203c447765ef79374a3f0911282cd77917f64dea7318d70c63b8df8506c058fa1fcb1d71b23488b3ca9be993667509b7d1
DIST gnome-control-center-3.30.3.tar.xz 5889900 BLAKE2B a03153cb689edc3c8c96a0f184f8831a8df218691fefd035842170871eebb6f17e34405e7c4c18da6a191b92c7b58fcd40b252cdb67154becdf7e7ac6a63aa8f SHA512 85c7b51d6bc32f73d7f4ad6df8d4cc14c59e19da88d7a17b7337f995483f41008213ca829247a3c9db43c4b31eae0be321ed6804570660fbe0356da3dd0948dc
diff --git a/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch b/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch
deleted file mode 100644
index f90e0514dd7..00000000000
--- a/gnome-base/gnome-control-center/files/3.26.2-gnome-desktop-3-28-compat.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 6c98cbb514b2a455dd27f3a32a48e43a65cd29a2 Mon Sep 17 00:00:00 2001
-From: Robert Ancell <robert.ancell@canonical.com>
-Date: Tue, 26 Sep 2017 14:12:13 -0400
-Subject: [PATCH 2/2] background: Remove GdkColor deprecation warnings
-
-https://bugzilla.gnome.org/show_bug.cgi?id=788205
-(cherry picked from commit ed03e9c49faafba132ab4077daeaf213b541aed7)
----
- configure.ac | 2 +-
- panels/background/cc-background-item.c | 19 ++++++++++---------
- 2 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 90579ac9f..f810bfb1f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,7 +97,7 @@ NETWORK_MANAGER_REQUIRED_VERSION=1.2.0
- NETWORK_MANAGER_APPLET_REQUIRED_VERSION=1.2.0
- MODEM_MANAGER_REQUIRED_VERSION=0.7
- LIBNOTIFY_REQUIRED_VERSION=0.7.3
--GNOME_DESKTOP_REQUIRED_VERSION=3.21.2
-+GNOME_DESKTOP_REQUIRED_VERSION=3.27.3
- SCHEMAS_REQUIRED_VERSION=3.21.4
- LIBWACOM_REQUIRED_VERSION=0.7
- CLUTTER_REQUIRED_VERSION=1.11.3
-diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c
-index 92220f823..8f8759bd0 100644
---- a/panels/background/cc-background-item.c
-+++ b/panels/background/cc-background-item.c
-@@ -150,8 +150,9 @@ get_emblemed_pixbuf (CcBackgroundItem *item, GdkPixbuf *pixbuf, gint scale_facto
- static void
- set_bg_properties (CcBackgroundItem *item)
- {
-- GdkColor pcolor = { 0, 0, 0, 0 };
-- GdkColor scolor = { 0, 0, 0, 0 };
-+ GdkRGBA pcolor = { 0, 0, 0, 0 };
-+ GdkRGBA scolor = { 0, 0, 0, 0 };
-+ GdkColor p, s;
-
- if (item->priv->uri) {
- GFile *file;
-@@ -166,13 +167,13 @@ set_bg_properties (CcBackgroundItem *item)
- }
-
- if (item->priv->primary_color != NULL) {
-- gdk_color_parse (item->priv->primary_color, &pcolor);
-+ gdk_rgba_parse (&pcolor, item->priv->primary_color);
- }
- if (item->priv->secondary_color != NULL) {
-- gdk_color_parse (item->priv->secondary_color, &scolor);
-+ gdk_rgba_parse (&scolor, item->priv->secondary_color);
- }
-
-- gnome_bg_set_color (item->priv->bg, item->priv->shading, &pcolor, &scolor);
-+ gnome_bg_set_rgba (item->priv->bg, item->priv->shading, &pcolor, &scolor);
- gnome_bg_set_placement (item->priv->bg, item->priv->placement);
- }
-
-@@ -996,12 +997,12 @@ static gboolean
- colors_equal (const char *a,
- const char *b)
- {
-- GdkColor color1, color2;
-+ GdkRGBA color1, color2;
-
-- gdk_color_parse (a, &color1);
-- gdk_color_parse (b, &color2);
-+ gdk_rgba_parse (&color1, a);
-+ gdk_rgba_parse (&color2, b);
-
-- return gdk_color_equal (&color1, &color2);
-+ return gdk_rgba_equal (&color1, &color2);
- }
-
- gboolean
---
-2.17.0
-
diff --git a/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch b/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch
deleted file mode 100644
index bbc8befdf28..00000000000
--- a/gnome-base/gnome-control-center/files/3.26.2-goa-lifecycle.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From a1bc1ae54d2330e32eac7b4df7c07393df87e7da Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Thu, 4 Oct 2018 11:28:15 +0200
-Subject: [PATCH 1/2] online-accounts: Track the lifecycle of CcGoaPanel across
- async calls
-
-Due to an API bug in GNOME Online Accounts, the asynchronous
-goa_provider_get_all method doesn't accept a GCancellable argument.
-This makes it difficult to cancel an ongoing call when the CcGoaPanel
-gets destroyed.
-
-Prior to commit c26f8ae018900a55, this was hacked around by taking a
-reference on the panel for the duration of the call. Instead of
-cancelling a pending call on destruction, it would keep the panel alive
-until the call was over. However, that was lost during commit
-c26f8ae018900a55.
-
-One thing to bear in mind is that GtkWidgets, CcGoaPanel is one, can
-be destroyed by a gtk_widget_destroy call, which is subtly different
-than a simple sequence of g_object_unref calls. When gtk_widget_destroy
-is used, it invokes the GObject::dispose virtual method of the widget.
-It is expected this will cause anything holding a reference to this
-widget to drop their references, leading to GObject::finalize being
-called. However, there is no guarantee that this will happen in the
-same iteration of the GMainLoop. Therefore, it is possible that when
-the goa_provider_get_all call finishes, the CcGoaPanel might be in a
-disposed, but not yet finalized state.
-
-When a GObject is in a disposed-but-not-finalized state, only a very
-limited number of operations can be performed on it. Its reference
-count can be altered, the memory used by the instance struct can be
-accessed, but none of the member GObjects can be assumed to be valid.
-eg., it's definitely illegal to add new rows to the member GtkListBox.
-Hence a boolean flag is used to mark the destroyed state of the panel.
-
-This second part is a small improvement over the earlier hack.
-
-https://gitlab.gnome.org/GNOME/gnome-control-center/issues/208
-(cherry picked from commit 83558429b3f98a4bf4ada17b64f09f073a6b8c38)
----
- panels/online-accounts/cc-online-accounts-panel.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/panels/online-accounts/cc-online-accounts-panel.c b/panels/online-accounts/cc-online-accounts-panel.c
-index edd140e4b..1640c74c4 100644
---- a/panels/online-accounts/cc-online-accounts-panel.c
-+++ b/panels/online-accounts/cc-online-accounts-panel.c
-@@ -56,6 +56,7 @@ struct _CcGoaPanel
- GtkWidget *stack;
- GtkWidget *accounts_vbox;
-
-+ gboolean destroyed;
- guint remove_account_timeout_id;
- };
-
-@@ -401,6 +402,8 @@ cc_goa_panel_dispose (GObject *object)
- /* Must be destroyed in dispose, not finalize. */
- g_clear_pointer (&panel->edit_account_dialog, gtk_widget_destroy);
-
-+ panel->destroyed = TRUE;
-+
- G_OBJECT_CLASS (cc_goa_panel_parent_class)->dispose (object);
- }
-
-@@ -480,7 +483,7 @@ cc_goa_panel_init (CcGoaPanel *panel)
- panel);
-
- fill_accounts_listbox (panel);
-- goa_provider_get_all (get_all_providers_cb, panel);
-+ goa_provider_get_all (get_all_providers_cb, g_object_ref_sink (panel));
-
- gtk_widget_show (GTK_WIDGET (panel));
- }
-@@ -843,7 +846,7 @@ get_all_providers_cb (GObject *source,
- GAsyncResult *res,
- gpointer user_data)
- {
-- CcGoaPanel *self = user_data;
-+ g_autoptr (CcGoaPanel) self = user_data;
- GList *providers;
- GList *l;
-
-@@ -851,6 +854,9 @@ get_all_providers_cb (GObject *source,
- if (!goa_provider_get_all_finish (&providers, res, NULL))
- return;
-
-+ if (self->destroyed)
-+ return;
-+
- for (l = providers; l != NULL; l = l->next)
- {
- GoaProvider *provider;
---
-2.17.0
-
diff --git a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
deleted file mode 100644
index d045790d6c7..00000000000
--- a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 75dc553f10df3cf48227ec69b9465009eebf7b8b Mon Sep 17 00:00:00 2001
-From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
-Date: Wed, 17 Jan 2018 20:05:03 -0200
-Subject: [PATCH] common: Don't unconditionally define HAVE_WAYLAND
-
-This header unconditionally defines HAVE_WAYLAND when GTK
-is built with Wayland support. This breaks the build when
-building with Wayland disabled.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785414
-(cherry picked from commit 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf)
-[Added HAVE_WAYLAND config.h definition for autotools to fix runtime]
-Signed-off-by: Mart Raudsepp <leio@gentoo.org>
----
- configure.ac | 1 +
- panels/common/gnome-settings-bus.h | 2 --
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index f810bfb1f..24940a798 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,6 +291,7 @@ AS_IF([test "$enable_wayland" != "no"],
- [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
-
- PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
-+ AC_DEFINE(HAVE_WAYLAND, 1, [Compile with Wayland support])
- ])
- AM_CONDITIONAL(HAVE_WAYLAND, [test "x$enable_wayland" != "xno"])
-
-diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h
-index ce58f5805..763a9cca7 100644
---- a/panels/common/gnome-settings-bus.h
-+++ b/panels/common/gnome-settings-bus.h
-@@ -5,8 +5,6 @@
-
- #ifdef GDK_WINDOWING_WAYLAND
-
--#define HAVE_WAYLAND 1
--
- static inline gboolean
- gnome_settings_is_wayland (void)
- {
---
-2.17.0
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild
deleted file mode 100644
index 62bb2625cd0..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/~leio/distfiles/${P}-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"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# 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.53.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.27.3:3=
- >=gnome-base/gnome-settings-daemon-3.25.90[colord]
- >=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.25.3:= )
- 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 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
- || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
- x11-themes/adwaita-icon-theme
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
- >=gnome-base/libgnomekbd-3
- wayland? ( dev-libs/libinput )
- !wayland? (
- >=x11-drivers/xf86-input-libinput-0.19.0
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
- !<gnome-base/gdm-2.91.94
- !<gnome-extra/gnome-color-manager-3.1.2
- !gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
- x11-base/xorg-proto
-
- dev-libs/libxml2:2
- dev-libs/libxslt
- dev-util/glib-utils
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
- sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-# sys-devel/autoconf-archive
-
-PATCHES=(
- # Lots of patches from gnome-3-26 branch on top of 3.26.2
- # Makes some panels and dependencies optional; requires eautoreconf
- # https://bugzilla.gnome.org/686840, 697478, 700145
- # Fix some absolute paths to be appropriate for Gentoo
- "${WORKDIR}"/patches/
- "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
- "${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
- "${FILESDIR}"/${PV}-gnome-desktop-3-28-compat.patch # backport of porting to gnome-desktop-3.28 API changes; but due to runtime issues we ended up still needing to lock the wayland flags between gtk+ and g-c-c (TODO)
-)
-
-src_configure() {
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable bluetooth) \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable ibus) \
- $(use_enable kerberos) \
- $(use_enable networkmanager) \
- $(use_with v4l cheese) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_install() {
- gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild
deleted file mode 100644
index 3cb36611c3d..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/~leio/distfiles/${P}-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"
-
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
-# 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)
-# Requires gnome_bg_set_color, which was replaced with gnome_bg_set_rgba in 3.27.90
-COMMON_DEPEND="
- >=dev-libs/glib-2.53.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-desktop-3.27.90:3
- >=gnome-base/gnome-settings-daemon-3.25.90[colord]
- >=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.25.3:= )
- 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 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
- || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
- x11-themes/adwaita-icon-theme
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
- >=gnome-base/libgnomekbd-3
- wayland? ( dev-libs/libinput )
- !wayland? (
- >=x11-drivers/xf86-input-libinput-0.19.0
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
-
- !<gnome-base/gdm-2.91.94
- !<gnome-extra/gnome-color-manager-3.1.2
- !gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
- x11-base/xorg-proto
-
- dev-libs/libxml2:2
- dev-libs/libxslt
- dev-util/glib-utils
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
- sys-devel/autoconf-archive
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-# sys-devel/autoconf-archive
-
-PATCHES=(
- # Lots of patches from gnome-3-26 branch on top of 3.26.2
- # Makes some panels and dependencies optional; requires eautoreconf
- # https://bugzilla.gnome.org/686840, 697478, 700145
- # Fix some absolute paths to be appropriate for Gentoo
- "${WORKDIR}"/patches/
- "${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
- "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]; but due to runtime issues we ended up still needing to lock the wayland flags between gtk+ and g-c-c (TODO)
-)
-
-src_configure() {
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable bluetooth) \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable ibus) \
- $(use_enable kerberos) \
- $(use_enable networkmanager) \
- $(use_with v4l cheese) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_install() {
- gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild
deleted file mode 100644
index e48ea0dd21f..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.28.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-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/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-REQUIRED_USE="flickr? ( gnome-online-accounts )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# >=polkit-0.114 for .policy files gettext ITS
-clutter_gtk_dep="media-libs/clutter-gtk:1.0"
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-COMMON_DEPEND="
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
- >=media-sound/pulseaudio-2.0[glib]
- >=sys-apps/accountsservice-0.6.39
- >=x11-misc/colord-0.1.34:0=
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gnome-desktop-3.27.90:3=
- >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?]
- >=gnome-base/gsettings-desktop-schemas-3.27.2
- dev-libs/libxml2:2
- >=sys-auth/polkit-0.114
- >=sys-power/upower-0.99:=
- x11-libs/libX11
- >=x11-libs/libXi-1.2
- flickr? ( >=media-libs/grilo-0.3.0:0.3= )
- >=x11-libs/gtk+-3.22.0:3[X,wayland=]
- cups? (
- >=net-print/cups-1.7[dbus]
- >=net-fs/samba-4.0.0[client]
- )
- v4l? (
- ${clutter_gtk_dep}
- >=media-video/cheese-3.28.0 )
- ibus? ( >=app-i18n/ibus-1.5.2 )
- wayland? ( virtual/libgudev )
- networkmanager? (
- >=gnome-extra/nm-applet-1.2.0
- >=net-misc/networkmanager-1.2.0:=[modemmanager]
- >=net-misc/modemmanager-0.7.990 )
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
- input_devices_wacom? (
- ${clutter_gtk_dep}
- >=dev-libs/libwacom-0.27
- >=media-libs/clutter-1.11.3:1.0 )
- kerberos? ( app-crypt/mit-krb5 )
-
- x11-libs/cairo[glib]
- >=x11-libs/colord-gtk-0.1.24
- net-libs/libsoup:2.4
- media-libs/fontconfig
- gnome-base/libgtop:2=
- >=media-libs/libcanberra-0.13[gtk3]
- >=dev-libs/libpwquality-1.2.2
-"
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
- || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
- x11-themes/adwaita-icon-theme
- >=gnome-extra/gnome-color-manager-3.1.2
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- >=gnome-base/libgnomekbd-3
- wayland? ( dev-libs/libinput )
- !wayland? (
- >=x11-drivers/xf86-input-libinput-0.19.0
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
- flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
-
- !<gnome-base/gdm-2.91.94
- !gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- x11-base/xorg-proto
- dev-libs/libxml2:2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Patches from gnome-3-28 branch on top of 3.28.2
- # Makes some panels and dependencies optional
- # https://bugzilla.gnome.org/686840, 697478, 700145
- # Fix some absolute paths to be appropriate for Gentoo
- "${WORKDIR}"/patches/
-)
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth)
- $(meson_use v4l cheese)
- -Dcups=$(usex cups enabled disabled)
- -Ddocumentation=true # manpage
- -Dgoa=$(usex gnome-online-accounts enabled disabled)
- -Dgrilo=$(usex flickr enabled disabled)
- $(meson_use ibus)
- -Dkerberos=$(usex kerberos enabled disabled)
- $(meson_use networkmanager network_manager)
- $(meson_use input_devices_wacom wacom)
- $(meson_use wayland)
- # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
deleted file mode 100644
index 7beb2fd313c..00000000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-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/~leio/distfiles/${P}-patchset.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +cups debug flickr +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
-REQUIRED_USE="flickr? ( gnome-online-accounts )"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-
-# kerberos unfortunately means mit-krb5; build fails with heimdal
-# display panel requires colord and gnome-settings-daemon[colord]
-# wacom panel requires gsd-enums.h from gsd at build time, probably also runtime support
-# printer panel requires cups and smbclient (the latter is not patched yet to be separately optional)
-# >=polkit-0.114 for .policy files gettext ITS
-clutter_gtk_dep="media-libs/clutter-gtk:1.0"
-# First block is toplevel meson.build deps in order of occurrence (plus deeper deps if in same conditional). Second block is dependency() from subdir meson.builds, sorted by directory name occurrence order
-COMMON_DEPEND="
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.25.3:= )
- >=media-sound/pulseaudio-2.0[glib]
- >=sys-apps/accountsservice-0.6.39
- >=x11-misc/colord-0.1.34:0=
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=dev-libs/glib-2.53.0:2
- >=gnome-base/gnome-desktop-3.27.90:3=
- >=gnome-base/gnome-settings-daemon-3.25.90[colord,input_devices_wacom?]
- >=gnome-base/gsettings-desktop-schemas-3.27.2
- dev-libs/libxml2:2
- >=sys-auth/polkit-0.114
- >=sys-power/upower-0.99:=
- x11-libs/libX11
- >=x11-libs/libXi-1.2
- flickr? ( >=media-libs/grilo-0.3.0:0.3= )
- >=x11-libs/gtk+-3.22.0:3[X,wayland=]
- cups? (
- >=net-print/cups-1.7[dbus]
- >=net-fs/samba-4.0.0[client]
- )
- v4l? (
- ${clutter_gtk_dep}
- >=media-video/cheese-3.28.0 )
- ibus? ( >=app-i18n/ibus-1.5.2 )
- wayland? ( virtual/libgudev )
- networkmanager? (
- >=gnome-extra/nm-applet-1.8.0
- >=net-misc/networkmanager-1.10.0:=[modemmanager]
- >=net-misc/modemmanager-0.7.990 )
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
- input_devices_wacom? (
- ${clutter_gtk_dep}
- >=dev-libs/libwacom-0.27
- >=media-libs/clutter-1.11.3:1.0 )
- kerberos? ( app-crypt/mit-krb5 )
-
- x11-libs/cairo[glib]
- >=x11-libs/colord-gtk-0.1.24
- net-libs/libsoup:2.4
- media-libs/fontconfig
- gnome-base/libgtop:2=
- app-crypt/libsecret
- >=media-libs/libcanberra-0.13[gtk3]
- >=dev-libs/libpwquality-1.2.2
-"
-# libgnomekbd needed only for gkbd-keyboard-display tool
-# gnome-color-manager needed for gcm-calibrate and gcm-viewer calls from color panel
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-#
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
-# Also we need newer driver versions to allow wacom and libinput drivers to
-# not collide
-#
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy
-RDEPEND="${COMMON_DEPEND}
- || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
- x11-themes/adwaita-icon-theme
- >=gnome-extra/gnome-color-manager-3.1.2
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- >=gnome-base/libgnomekbd-3
- wayland? ( dev-libs/libinput )
- !wayland? (
- >=x11-drivers/xf86-input-libinput-0.19.0
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
- flickr? ( media-plugins/grilo-plugins:0.3[flickr,gnome-online-accounts] )
-
- !<gnome-base/gdm-2.91.94
- !gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency; gnome-session-check-accelerated called by info panel
-# gnome-session-2.91.6-r1 also needed so that 10-user-dirs-update is run at login
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/docbook-xml-dtd:4.2
- x11-base/xorg-proto
- dev-libs/libxml2:2
- dev-util/gdbus-codegen
- dev-util/glib-utils
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-PATCHES=(
- # Patches from gnome-3-28 branch on top of 3.28.2
- # Makes some panels and dependencies optional
- # https://bugzilla.gnome.org/686840, 697478, 700145
- # Fix some absolute paths to be appropriate for Gentoo
- "${WORKDIR}"/patches/
- # Extra patch to fix incomplete USE=-cups support in patchset; amend it into the cups optionality commit for next patchset
- "${FILESDIR}"/${PV}-conditional-cups-tests.patch
-)
-
-src_configure() {
- local emesonargs=(
- $(meson_use bluetooth)
- $(meson_use v4l cheese)
- -Dcups=$(usex cups enabled disabled)
- -Ddocumentation=true # manpage
- -Dgoa=$(usex gnome-online-accounts enabled disabled)
- -Dgrilo=$(usex flickr enabled disabled)
- $(meson_use ibus)
- -Dkerberos=$(usex kerberos enabled disabled)
- $(meson_use networkmanager network_manager)
- -Dtracing=false
- $(meson_use input_devices_wacom wacom)
- $(meson_use wayland)
- # bashcompletions installed to $datadir/bash-completion/completions by v3.28.2, which is the same as $(get_bashcompdir)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
- gnome2_schemas_update
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2019-03-14 21:52 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-03-14 21:52 UTC (permalink / raw
To: gentoo-commits
commit: 4be168f317269bae57ec50cd551e0f798f517f47
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 21:51:21 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 21:51:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4be168f3
gnome-base/gnome-control-center-3.30: fix build with USE=-cups
Fixes: https://bugs.gentoo.org/680354
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/3.30.3-conditional-cups-tests.patch | 28 ++++++++++++++++++++++
.../gnome-control-center-3.30.3.ebuild | 2 ++
2 files changed, 30 insertions(+)
diff --git a/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch
new file mode 100644
index 00000000000..8b9d738c10f
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.30.3-conditional-cups-tests.patch
@@ -0,0 +1,28 @@
+From f724fb0f41672bfa5cd6fe098223acc795de90a4 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Thu, 14 Mar 2019 23:35:08 +0200
+Subject: [PATCH] build: Conditionalize printer panel tests with enable_cups
+
+3.30 moved various tests from being alongside the panels to a
+separate toplevel tests/ subdirectory, which was missed while
+porting the patchset. Fix it.
+---
+ tests/meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 7c894e480..fb39c9f48 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -3,5 +3,7 @@ subdir('common')
+ #if host_is_linux
+ # subdir('network')
+ #endif
+-subdir('printers')
++if enable_cups
++ subdir('printers')
++endif
+ subdir('info')
+--
+2.17.0
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
index 0e9bf5c64ab..7beb2fd313c 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.30.3.ebuild
@@ -119,6 +119,8 @@ PATCHES=(
# https://bugzilla.gnome.org/686840, 697478, 700145
# Fix some absolute paths to be appropriate for Gentoo
"${WORKDIR}"/patches/
+ # Extra patch to fix incomplete USE=-cups support in patchset; amend it into the cups optionality commit for next patchset
+ "${FILESDIR}"/${PV}-conditional-cups-tests.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2019-02-28 20:29 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-02-28 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 42573ff70a244a861b4090c870528722bbcb7464
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 28 20:26:54 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Thu Feb 28 20:28:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42573ff7
gnome-base/gnome-control-center: fix runtime crash on wayland from build fix
Unfortunately we will need to lock USE=wayland between gtk+ and here for now.
If gtk+ supports wayland, it will run gnome-control-center with native
wayland, and when g-c-c doesn't have the code to match, it'll try to iterate
devices with X11 methods, which will crash just like it did on full wayland
(USE=wayland on both) before the fix in this commit.
One option could be to restrict gdk allowed backends to not include wayland
if wayland support isn't included, but that's something to tackle on top of
3.32 in the future.
Closes: https://bugs.gentoo.org/679042
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/3.26.2-without-wayland-fix.patch | 20 ++++++++++++++++++--
...ebuild => gnome-control-center-3.26.2-r28.ebuild} | 4 ++--
....ebuild => gnome-control-center-3.26.2-r3.ebuild} | 5 +++--
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
index 92f4d4bdaee..d045790d6c7 100644
--- a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
+++ b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
@@ -1,4 +1,4 @@
-From 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf Mon Sep 17 00:00:00 2001
+From 75dc553f10df3cf48227ec69b9465009eebf7b8b Mon Sep 17 00:00:00 2001
From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
Date: Wed, 17 Jan 2018 20:05:03 -0200
Subject: [PATCH] common: Don't unconditionally define HAVE_WAYLAND
@@ -8,10 +8,26 @@ is built with Wayland support. This breaks the build when
building with Wayland disabled.
https://bugzilla.gnome.org/show_bug.cgi?id=785414
+(cherry picked from commit 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf)
+[Added HAVE_WAYLAND config.h definition for autotools to fix runtime]
+Signed-off-by: Mart Raudsepp <leio@gentoo.org>
---
+ configure.ac | 1 +
panels/common/gnome-settings-bus.h | 2 --
- 1 file changed, 2 deletions(-)
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+diff --git a/configure.ac b/configure.ac
+index f810bfb1f..24940a798 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,6 +291,7 @@ AS_IF([test "$enable_wayland" != "no"],
+ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
+
+ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
++ AC_DEFINE(HAVE_WAYLAND, 1, [Compile with Wayland support])
+ ])
+ AM_CONDITIONAL(HAVE_WAYLAND, [test "x$enable_wayland" != "xno"])
+
diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h
index ce58f5805..763a9cca7 100644
--- a/panels/common/gnome-settings-bus.h
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild
similarity index 96%
rename from gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild
index edf0afe1e5e..616a44779d2 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r28.ebuild
@@ -26,7 +26,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~
COMMON_DEPEND="
>=dev-libs/glib-2.53.0:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.22.0:3[X,wayland?]
+ >=x11-libs/gtk+-3.22.0:3[X,wayland=]
>=gnome-base/gsettings-desktop-schemas-3.21.4
>=gnome-base/gnome-desktop-3.27.3:3=
>=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit]
@@ -134,7 +134,7 @@ PATCHES=(
"${WORKDIR}"/patches/
"${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
"${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
- "${FILESDIR}"/${PV}-gnome-desktop-3-28-compat.patch # backport of porting to gnome-desktop-3.28 API changes
+ "${FILESDIR}"/${PV}-gnome-desktop-3-28-compat.patch # backport of porting to gnome-desktop-3.28 API changes; but due to runtime issues we ended up still needing to lock the wayland flags between gtk+ and g-c-c (TODO)
)
src_configure() {
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild
similarity index 95%
rename from gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild
index 5e554968fdb..9078a9e5204 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r3.ebuild
@@ -27,7 +27,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~
COMMON_DEPEND="
>=dev-libs/glib-2.53.0:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.22.0:3[X,wayland?]
+ >=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-desktop-3.27.90:3
@@ -134,7 +134,8 @@ PATCHES=(
# https://bugzilla.gnome.org/686840, 697478, 700145
# Fix some absolute paths to be appropriate for Gentoo
"${WORKDIR}"/patches/
- "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
+ "${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
+ "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]; but due to runtime issues we ended up still needing to lock the wayland flags between gtk+ and g-c-c (TODO)
)
src_configure() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2019-02-24 9:51 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2019-02-24 9:51 UTC (permalink / raw
To: gentoo-commits
commit: fdf76328d1eaed6f547d30159f8805a6234c120a
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 09:49:11 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 09:49:50 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdf76328
gnome-base/gnome-control-center: fix non-wayland build against gtk+[wayland]
Closes: https://bugs.gentoo.org/674684
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../files/3.26.2-without-wayland-fix.patch | 30 ++++++++++++++++++++++
.../gnome-control-center-3.26.2-r1.ebuild | 1 +
.../gnome-control-center-3.26.2-r2.ebuild | 1 +
3 files changed, 32 insertions(+)
diff --git a/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
new file mode 100644
index 00000000000..92f4d4bdaee
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.26.2-without-wayland-fix.patch
@@ -0,0 +1,30 @@
+From 62f07b2c6d8a28378e1f2c9f5d0c3241332ee8cf Mon Sep 17 00:00:00 2001
+From: Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
+Date: Wed, 17 Jan 2018 20:05:03 -0200
+Subject: [PATCH] common: Don't unconditionally define HAVE_WAYLAND
+
+This header unconditionally defines HAVE_WAYLAND when GTK
+is built with Wayland support. This breaks the build when
+building with Wayland disabled.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=785414
+---
+ panels/common/gnome-settings-bus.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/panels/common/gnome-settings-bus.h b/panels/common/gnome-settings-bus.h
+index ce58f5805..763a9cca7 100644
+--- a/panels/common/gnome-settings-bus.h
++++ b/panels/common/gnome-settings-bus.h
+@@ -5,8 +5,6 @@
+
+ #ifdef GDK_WINDOWING_WAYLAND
+
+-#define HAVE_WAYLAND 1
+-
+ static inline gboolean
+ gnome_settings_is_wayland (void)
+ {
+--
+2.17.0
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
index ff36d5d2a6b..5e554968fdb 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r1.ebuild
@@ -134,6 +134,7 @@ PATCHES=(
# https://bugzilla.gnome.org/686840, 697478, 700145
# Fix some absolute paths to be appropriate for Gentoo
"${WORKDIR}"/patches/
+ "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
)
src_configure() {
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
index 148131fa7cc..edf0afe1e5e 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.26.2-r2.ebuild
@@ -132,6 +132,7 @@ PATCHES=(
# https://bugzilla.gnome.org/686840, 697478, 700145
# Fix some absolute paths to be appropriate for Gentoo
"${WORKDIR}"/patches/
+ "${FILESDIR}"/${PV}-without-wayland-fix.patch # Fixes USE=-wayland build against gtk+[wayland]
"${FILESDIR}"/${PV}-goa-lifecycle.patch # extra patch from gnome-3-26
"${FILESDIR}"/${PV}-gnome-desktop-3-28-compat.patch # backport of porting to gnome-desktop-3.28 API changes
)
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2017-12-08 19:05 Michał Górny
0 siblings, 0 replies; 12+ messages in thread
From: Michał Górny @ 2017-12-08 19:05 UTC (permalink / raw
To: gentoo-commits
commit: bc0e91a47f340a40d14c05e93b3a87de406dfa33
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 19:01:23 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 19:04:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc0e91a4
gnome-base/gnome-control-center: [QA] Move patches to distfiles
Closes: https://bugs.gentoo.org/620576
gnome-base/gnome-control-center/Manifest | 8 +-
.../files/3.22.2-fix-build-without-wayland.patch | 35 --
.../files/3.22.2-fix-dual-gpu-crash.patch | 32 --
.../files/3.24.2-fix-without-gdkwayland.patch | 47 --
.../files/3.24.2-gentoo-paths.patch | 107 ----
.../files/3.24.2-optional-cups.patch | 196 -------
.../files/3.24.2-optional-networkmanager.patch | 69 ---
.../files/3.24.2-optional-wayland.patch | 46 --
.../files/3.24.2-optional.patch | 556 --------------------
.../gnome-control-center-3.22.0-gentoo-paths.patch | 120 -----
...ontrol-center-3.22.0-keep-panels-optional.patch | 40 --
...enter-3.22.0-make-networkmanager-optional.patch | 67 ---
...ntrol-center-3.22.0-make-wayland-optional.patch | 45 --
.../gnome-control-center-3.22.0-optional.patch | 569 ---------------------
.../gnome-control-center-3.22.2-r1.ebuild | 15 +-
.../gnome-control-center-3.24.2.ebuild | 13 +-
.../gnome-control-center-3.24.3.ebuild | 13 +-
17 files changed, 27 insertions(+), 1951 deletions(-)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index d59503cbc52..671fac40e8e 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,3 +1,5 @@
-DIST gnome-control-center-3.22.2.tar.xz 7277380 SHA256 7512ff3e256c1d43a746752e90a8079d0b064aae35283cfe863e19706ce22f92 SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a WHIRLPOOL 393fa9d1752330ebac81215f35df5da6ed4b457cbc5ce56a5497191584266161c4ab0105b16535ef245be62aec27c6556fca2416ce7b91651b266f224592b686
-DIST gnome-control-center-3.24.2.tar.xz 7269112 SHA256 382a4b1bf54754c1f5f83adb1faeca2e9de70df5d3d85ac6b0fb192801518f2b SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0 WHIRLPOOL 6e42ec6ac877eb19cc64d5d52106662a872cd4cba25bf0fb2f0fa4a4c1d82fc4149a52f7922e1e1e6dd005133cf54d5e154f75807da58d510e7d09610b41cb7b
-DIST gnome-control-center-3.24.3.tar.xz 7302120 SHA256 43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb WHIRLPOOL 3e5b9c47ef2ecf9fdba3037ace51eefab765e7dfa829586b90da267ccbd099658f48967600aaaa3259796e56805fe3c90fa55577787ca84bdd5e6cfb2729757b
+DIST gnome-control-center-3.22.2-patchset.tar.xz 8204 BLAKE2B 5e0c32a2bc48d620def362967ec064772060f9a7d313998c2e970485ff99daf61841532335cb6fa987cf9319a5142b6731173fe400e5081df73ea505e4688dda SHA512 f20b4e53f82fcf31c635aa070e1af7f69a125eb4f67b1ac9e1e9f594da4649031d9e4cc6021a674abfee0046fe1af944f73ed68451db9fc7b168dcd6e765afe7
+DIST gnome-control-center-3.22.2.tar.xz 7277380 BLAKE2B 0966189d3f1e791e11920261bfc37c6ae77af0a4f312263b6623850becd3ba1ad22e886d6a96cc3cdfccc492dc998c6891d583ce8d55f9a4e08daa5de829f55e SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a
+DIST gnome-control-center-3.24.2-patchset.tar.xz 8496 BLAKE2B 8bdbfcef3917ec12e82e7a5ea163f14954f9793b806c4a827620d1f693220527540f1b8a8ac0f121dae0bc8fc687f1974544b35cccd0b9e50474386c28d9ddbf SHA512 967258cf003c013881a2555be7624bad227d898cff72fe2899243692f7a06730e5dc79a849728cce6f9a7234a74b2b8433d1689c2846e8389eb9813fe5df1da1
+DIST gnome-control-center-3.24.2.tar.xz 7269112 BLAKE2B 41049a7176eb3de146d8ac8034cce9cdc7365eec11f6db9a1bd21964c5a30b73c22debcd48058ad72cf6ac24bf60e1956ec203502a3dadcceb83350461302387 SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0
+DIST gnome-control-center-3.24.3.tar.xz 7302120 BLAKE2B 026ad3bb34c2bfc2f7a6d398a3c47bc3f620a3f947a0cb43336b437b4926e7a360e287d6020dc0e82eda43955cfb38ffcd7ed94593adac119d7413f63bc437c8 SHA512 70b827f70fb95e8db0ee01e3ba80242dfdb0f90e31c391ca470c372cb6c8626f054e1e5b79e954935e9b567564129b80957091039e16e921e1c93b3d584c71cb
diff --git a/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch b/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch
deleted file mode 100644
index 0895a743a71..00000000000
--- a/gnome-base/gnome-control-center/files/3.22.2-fix-build-without-wayland.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4825881b129bdde0eaa5419ece6198ebda420825 Mon Sep 17 00:00:00 2001
-From: Ting-Wei Lan <lantw@src.gnome.org>
-Date: Thu, 10 Nov 2016 22:27:11 +0800
-Subject: [PATCH 1/2] info: Fix build when Wayland is disabled
-
-https://bugzilla.gnome.org/show_bug.cgi?id=774324
----
- panels/info/cc-info-panel.c | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
-index 4584766..1d596a3 100644
---- a/panels/info/cc-info-panel.c
-+++ b/panels/info/cc-info-panel.c
-@@ -351,8 +351,15 @@ get_graphics_data (void)
- display = gdk_display_get_default ();
-
- #if defined(GDK_WINDOWING_X11) || defined(GDK_WINDOWING_WAYLAND)
-- if (GDK_IS_X11_DISPLAY (display) ||
-- GDK_IS_WAYLAND_DISPLAY (display))
-+ gboolean x11_or_wayland = FALSE;
-+#ifdef GDK_WINDOWING_X11
-+ x11_or_wayland = GDK_IS_X11_DISPLAY (display);
-+#endif
-+#ifdef GDK_WINDOWING_WAYLAND
-+ x11_or_wayland = x11_or_wayland || GDK_IS_WAYLAND_DISPLAY (display);
-+#endif
-+
-+ if (x11_or_wayland)
- {
- char *discrete_renderer = NULL;
- char *renderer;
---
-2.10.1
-
diff --git a/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch b/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch
deleted file mode 100644
index a390477a424..00000000000
--- a/gnome-base/gnome-control-center/files/3.22.2-fix-dual-gpu-crash.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 97e4d87ae8a123d5b1711ddbaba6bc0d3a0a39a8 Mon Sep 17 00:00:00 2001
-From: Ondrej Holy <oholy@redhat.com>
-Date: Mon, 5 Dec 2016 10:15:12 +0100
-Subject: [PATCH 2/2] info: Do not crash if Renderer is not set by
- SessionManager
-
-This regression has been introduced by commit 52da4da. The
-info panel crashes if prettify_info() returns NULL. This happens
-if Renderer property from SessionManager is empty.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=774240
----
- panels/info/info-cleanup.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/panels/info/info-cleanup.c b/panels/info/info-cleanup.c
-index 20243ec..bb47493 100644
---- a/panels/info/info-cleanup.c
-+++ b/panels/info/info-cleanup.c
-@@ -99,6 +99,9 @@ remove_duplicate_whitespace (const char *old)
- GRegex *re;
- GError *error;
-
-+ if (old == NULL)
-+ return NULL;
-+
- error = NULL;
- re = g_regex_new ("[ \t\n\r]+", G_REGEX_MULTILINE, 0, &error);
- if (re == NULL)
---
-2.10.1
-
diff --git a/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch b/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch
deleted file mode 100644
index 0d41cca4704..00000000000
--- a/gnome-base/gnome-control-center/files/3.24.2-fix-without-gdkwayland.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 13437b364fe56ffaaa421b8396ba761a2e0cc13d Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Sat, 15 Jul 2017 06:22:16 +0300
-Subject: [PATCH] common: Add missing GDK_WINDOWING_WAYLAND guards for
- gsd_udev_device_manager_lookup_device
-
-commit 8f9259ac06db added a gdkwayland specific lookup_device implementation, guard it
-with compile-time GDK_WINDOWING_WAYLAND as other places are.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=780544
----
- panels/common/gsd-device-manager-udev.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/panels/common/gsd-device-manager-udev.c b/panels/common/gsd-device-manager-udev.c
-index fdda02a..5dc4447 100644
---- a/panels/common/gsd-device-manager-udev.c
-+++ b/panels/common/gsd-device-manager-udev.c
-@@ -24,7 +24,9 @@
- #include <string.h>
- #include <gudev/gudev.h>
-
-+#ifdef GDK_WINDOWING_WAYLAND
- #include <gdk/gdkwayland.h>
-+#endif
- #include "gsd-device-manager-udev.h"
-
- struct _GsdUdevDeviceManager
-@@ -227,6 +229,7 @@ static GsdDevice *
- gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager,
- GdkDevice *gdk_device)
- {
-+#ifdef GDK_WINDOWING_WAYLAND
- const gchar *node_path;
- GHashTableIter iter;
- GsdDevice *device;
-@@ -243,6 +246,7 @@ gsd_udev_device_manager_lookup_device (GsdDeviceManager *manager,
- return device;
- }
- }
-+#endif
-
- return NULL;
- }
---
-2.10.2
-
diff --git a/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch
deleted file mode 100644
index 1c7f9278378..00000000000
--- a/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 522dcaf9de0378394c4558961da99ddf0b8b87e7 Mon Sep 17 00:00:00 2001
-From: Timo Tambet <ttambet@gmail.com>
-Date: Sun, 26 Feb 2017 01:04:05 +0200
-Subject: [PATCH 4/5] Fix some absolute paths to be appropriate for Gentoo
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
-[Updated for 3.23.90; printer panel /usr/share path went away with print testpage button]
-Signed-off-by: Timo Tambet <ttambet@gmail.com>
----
- panels/datetime/Makefile.am | 1 +
- panels/datetime/test-endianess.c | 4 ++--
- panels/datetime/test-timezone.c | 2 +-
- panels/datetime/tz.h | 4 ++--
- panels/printers/Makefile.am | 3 +++
- panels/printers/pp-host.c | 2 +-
- 6 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
-index a003f0b..c43062e 100644
---- a/panels/datetime/Makefile.am
-+++ b/panels/datetime/Makefile.am
-@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
- $(DATETIME_PANEL_CFLAGS) \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-+ -DREALDATADIR="\"$(datadir)\"" \
- $(NULL)
-
- # test-timezone is still too noisy
-diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
-index 06b2613..eb52bb6 100644
---- a/panels/datetime/test-endianess.c
-+++ b/panels/datetime/test-endianess.c
-@@ -26,11 +26,11 @@ test_endianess (void)
- GDir *dir;
- const char *name;
-
-- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
-+ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
- if (dir == NULL) {
- /* Try with /usr/share/locale/
- * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
-- dir = g_dir_open ("/usr/share/locale/", 0, NULL);
-+ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
- if (dir == NULL) {
- g_assert_not_reached ();
- }
-diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
-index db5c030..7ef5cef 100644
---- a/panels/datetime/test-timezone.c
-+++ b/panels/datetime/test-timezone.c
-@@ -2,7 +2,7 @@
- #include <gtk/gtk.h>
- #include "cc-timezone-map.h"
-
--#define TZ_DIR "/usr/share/zoneinfo/"
-+#define TZ_DIR REALDATADIR "/zoneinfo/"
-
- static GList *
- get_timezone_list (GList *tzs,
-diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
-index 93905b3..1ba918c 100644
---- a/panels/datetime/tz.h
-+++ b/panels/datetime/tz.h
-@@ -28,9 +28,9 @@
- #include <glib.h>
-
- #ifndef __sun
--# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
-+# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
- #else
--# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
-+# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
- #endif
-
- typedef struct _TzDB TzDB;
-diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
-index 575cda3..d5da0bf 100644
---- a/panels/printers/Makefile.am
-+++ b/panels/printers/Makefile.am
-@@ -9,6 +9,9 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/shell/ \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DTEST_SRCDIR=\""$(srcdir)/"\" \
-+ -DREALDATADIR="\"$(datadir)\"" \
-+ -DPREFIX="\"$(prefix)\"" \
-+ -DLIBEXECDIR="\"$(libexecdir)\"" \
- $(NULL)
-
- noinst_LTLIBRARIES = libprinters.la
-diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index 8af77e9..bb6df78 100644
---- a/panels/printers/pp-host.c
-+++ b/panels/printers/pp-host.c
-@@ -267,7 +267,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
- data->devices->devices = NULL;
-
- argv = g_new0 (gchar *, 3);
-- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
-+ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
- argv[1] = g_strdup (priv->hostname);
-
- /* Use SNMP to get printer's informations */
---
-2.10.2
-
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch
deleted file mode 100644
index c634d77a53c..00000000000
--- a/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From f76cc5a97dfa94b03abb878767c8dc15b4461685 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 14 Jul 2017 05:07:42 +0300
-Subject: [PATCH 5/5] Make printers panel optional
-
----
- configure.ac | 96 ++++++++++++++++++++++++++++++-------------------
- panels/Makefile.am | 7 ++--
- shell/Makefile.am | 7 ++--
- shell/cc-panel-loader.c | 4 +++
- 4 files changed, 73 insertions(+), 41 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 4af24d0..7629621 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -189,9 +189,59 @@ AS_IF([test "$enable_color" != "no"],
- ])
- AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
-
--PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
-- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-- smbclient)
-+# Check for CUPS 1.4 or newer
-+build_printers=no
-+AC_PROG_SED
-+
-+AC_ARG_ENABLE([cups],
-+ AS_HELP_STRING([--disable-cups], [disable printer management panel]),
-+ [],
-+ enable_cups=yes
-+)
-+
-+AS_IF([test "x$enable_cups" != "xno"],
-+ [
-+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
-+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-+ smbclient)
-+
-+ AC_PATH_PROG(CUPS_CONFIG, cups-config)
-+
-+ if test x$CUPS_CONFIG = x; then
-+ AC_MSG_ERROR([cups-config not found])
-+ fi
-+
-+ CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
-+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
-+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
-+
-+ AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
-+ AC_MSG_ERROR([CUPS headers not found]))
-+
-+ if ! test $CUPS_API_MAJOR -gt 1 -o \
-+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
-+ AC_MSG_ERROR([CUPS 1.4 or newer not found])
-+ fi
-+
-+ # https://bugzilla.gnome.org/show_bug.cgi?id=696766
-+ CUPS_CPPFLAGS=""
-+ if test $CUPS_API_MAJOR -gt 1 -o \
-+ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
-+ CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
-+ fi
-+
-+ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
-+ CUPS_LIBS=`$CUPS_CONFIG --libs`
-+
-+ AC_SUBST(CUPS_CPPFLAGS)
-+ AC_SUBST(CUPS_CFLAGS)
-+ AC_SUBST(CUPS_LIBS)
-+ build_printers=yes
-+ AC_DEFINE(BUILD_PRINTERS, 1, [Define to 1 to build the Printers panel])
-+ ]
-+)
-+AM_CONDITIONAL(BUILD_PRINTERS, test "x$build_printers" = "xyes")
-+
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-@@ -334,40 +384,6 @@ AS_IF([test "$enable_bluetooth" = "yes"],
- ])
- AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
-
--# Check for CUPS 1.4 or newer
--AC_PROG_SED
--
--AC_PATH_PROG(CUPS_CONFIG, cups-config)
--
--if test x$CUPS_CONFIG = x; then
-- AC_MSG_ERROR([cups-config not found])
--fi
--
--CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
--CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
--CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
--
--AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
-- AC_MSG_ERROR([CUPS headers not found]))
--
--if ! test $CUPS_API_MAJOR -gt 1 -o \
-- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
-- AC_MSG_ERROR([CUPS 1.4 or newer not found])
--fi
--
--# https://bugzilla.gnome.org/show_bug.cgi?id=696766
--CUPS_CPPFLAGS=""
--if test $CUPS_API_MAJOR -gt 1 -o \
-- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
-- CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
--fi
--
--CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
--CUPS_LIBS=`$CUPS_CONFIG --libs`
--AC_SUBST(CUPS_CPPFLAGS)
--AC_SUBST(CUPS_CFLAGS)
--AC_SUBST(CUPS_LIBS)
--
- # Optional dependency for the user accounts panel
- AC_ARG_WITH([cheese],
- AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
-@@ -671,6 +687,12 @@ else
- AC_MSG_NOTICE([ Color panel disabled])
- fi
-
-+if test "x$build_printers" = "xyes"; then
-+ AC_MSG_NOTICE([** CUPS (Printers panel)])
-+else
-+ AC_MSG_NOTICE([ Printers panel disabled])
-+fi
-+
-
- if test "x$have_cheese" = "xyes"; then
- AC_MSG_NOTICE([** Cheese (Users panel webcam support)])
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 2806c45..b68561e 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -14,8 +14,11 @@ SUBDIRS= \
- datetime \
- search \
- privacy \
-- sharing \
-- printers
-+ sharing
-+
-+if BUILD_PRINTERS
-+SUBDIRS += printers
-+endif
-
- if BUILD_COLOR
- SUBDIRS += color
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index f3e49c7..af782ea 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -91,8 +91,11 @@ gnome_control_center_LDADD = \
- $(top_builddir)/panels/sharing/libsharing.la \
- $(top_builddir)/panels/sound/libsound.la \
- $(top_builddir)/panels/universal-access/libuniversal-access.la \
-- $(top_builddir)/panels/user-accounts/libuser-accounts.la \
-- $(top_builddir)/panels/printers/libprinters.la
-+ $(top_builddir)/panels/user-accounts/libuser-accounts.la
-+
-+if BUILD_PRINTERS
-+gnome_control_center_LDADD += $(top_builddir)/panels/printers/libprinters.la
-+endif
-
- if BUILD_WACOM
- gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 9104b45..a713079 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
-@@ -49,7 +49,9 @@ extern GType cc_notifications_panel_get_type (void);
- extern GType cc_goa_panel_get_type (void);
- #endif /* BUILD_ONLINE_ACCOUNTS */
- extern GType cc_power_panel_get_type (void);
-+#ifdef BUILD_PRINTERS
- extern GType cc_printers_panel_get_type (void);
-+#endif /* BUILD_PRINTERS */
- extern GType cc_privacy_panel_get_type (void);
- extern GType cc_region_panel_get_type (void);
- extern GType cc_search_panel_get_type (void);
-@@ -95,7 +97,9 @@ static struct {
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
- #endif
- PANEL_TYPE("power", cc_power_panel_get_type ),
-+#ifdef BUILD_PRINTERS
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
-+#endif
- PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
- PANEL_TYPE("region", cc_region_panel_get_type ),
- PANEL_TYPE("search", cc_search_panel_get_type ),
---
-2.10.2
-
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch
deleted file mode 100644
index e4efa1c7c1c..00000000000
--- a/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From c19cbe68d5a4a1363b320debfc6b3e93dbb7e8ac Mon Sep 17 00:00:00 2001
-From: Timo Tambet <ttambet@gmail.com>
-Date: Sun, 26 Feb 2017 00:37:06 +0200
-Subject: [PATCH 3/5] Make network panel optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-[Updated for 3.23.90]
-Signed-off-by: Timo Tambet <ttambet@gmail.com>
----
- configure.ac | 43 +++++++++++++++++++++++++------------------
- 1 file changed, 25 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b47dbc8..4af24d0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -275,24 +275,31 @@ linux_usb_error_or_warn()
- esac
- }
-
--PKG_CHECK_MODULES(NETWORK_MANAGER,
-- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
-- libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
-- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
-- [have_networkmanager=yes], have_networkmanager=no)
--if test "x$have_networkmanager" = xno ; then
-- linux_error_or_warn "*** Network panel will not be built (NetworkManager or ModemManager not found) ***"
--else
-- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
--fi
--AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
--if test x${have_networkmanager} = xyes; then
-- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
-- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
-- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
-- AC_SUBST(NM_VPN_CONFIG_DIR)
-- AC_SUBST(NM_VPN_MODULE_DIR)
--fi
-+AC_ARG_ENABLE([networkmanager],
-+ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]),
-+ [],
-+ [enable_networkmanager=auto])
-+AS_IF([test "$enable_networkmanager" != "no"],
-+ [
-+ PKG_CHECK_MODULES(NETWORK_MANAGER,
-+ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
-+ libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
-+ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
-+ [have_networkmanager=yes], [have_networkmanager=no])
-+
-+ AS_IF([test "$have_networkmanager" = "no"],
-+ [
-+ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***])
-+ ], [
-+ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
-+ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
-+ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
-+ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
-+ AC_SUBST([NM_VPN_CONFIG_DIR])
-+ AC_SUBST([NM_VPN_MODULE_DIR])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
-
- # Check for power panel
- if test x${have_networkmanager} = xyes; then
---
-2.10.2
-
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch
deleted file mode 100644
index 21d4a45b8f1..00000000000
--- a/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From e18ff93353a432867e373e549206928d3ced04cc Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <tranquility@gentoo.org>
-Date: Sat, 25 Apr 2015 22:22:09 +0200
-Subject: [PATCH 2/5] Make wayland support optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-Signed-off-by: Mart Raudsepp <leio@gentoo.org>
----
- configure.ac | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9566fb7..b47dbc8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -227,12 +227,21 @@ if test "x$have_udev" = xyes ; then
- fi
- AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
-
--PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
--if test "x$have_wayland" = xyes ; then
-- if test "x$have_udev" != xyes ; then
-- AC_MSG_ERROR([udev is required for Wayland support])
-- fi
--fi
-+AC_ARG_ENABLE(
-+ [wayland],
-+ AS_HELP_STRING([--disable-wayland], [disable wayland support]),
-+ [],
-+ enable_wayland=auto
-+)
-+
-+AS_IF([test "$enable_wayland" != "no"],
-+ [
-+ AS_IF([test "x$have_udev" = xno],
-+ [AC_MSG_ERROR([udev is required for Wayland support])],
-+ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
-+
-+ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
-+])
-
- # Panels that must be built on Linux systems
- linux_error_or_warn()
---
-2.10.2
-
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional.patch b/gnome-base/gnome-control-center/files/3.24.2-optional.patch
deleted file mode 100644
index 54e3f65f568..00000000000
--- a/gnome-base/gnome-control-center/files/3.24.2-optional.patch
+++ /dev/null
@@ -1,556 +0,0 @@
-From c3b0d1123cae5a895452d2a8d75e663e76cbf5bd Mon Sep 17 00:00:00 2001
-From: Timo Tambet <ttambet@gmail.com>
-Date: Sat, 25 Feb 2017 23:29:10 +0200
-Subject: [PATCH 1/5] Make bluetooth/colord/goa/kerberos/wacom optional
-
-Upstream is not interested in any part of this patch:
-
-https://bugzilla.gnome.org/686840
-https://bugzilla.gnome.org/697478
-https://bugzilla.gnome.org/700145
-
-Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
-Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
----
- configure.ac | 171 ++++++++++++++++++++++++--------
- panels/Makefile.am | 10 +-
- panels/background/Makefile.am | 8 +-
- panels/background/bg-pictures-source.c | 20 ++++
- panels/power/cc-power-panel.c | 2 +-
- panels/user-accounts/um-realm-manager.c | 9 ++
- shell/Makefile.am | 10 +-
- shell/cc-panel-loader.c | 8 ++
- 8 files changed, 188 insertions(+), 50 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11fc9fc..9566fb7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,10 +120,6 @@ LIBGD_INIT([_view-common static])
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-- goa-1.0 >= $GOA_REQUIRED_VERSION
-- grilo-0.3 >= $GRILO_REQUIRED_VERSION)
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-@@ -141,12 +137,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-- colord >= $COLORD_REQUIRED_VERSION
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-- libsoup-2.4
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+
-+build_online_accounts=no
-+background_online_accounts=
-+AC_ARG_ENABLE([goa],
-+ AS_HELP_STRING([--disable-goa],
-+ [disable online accounts management panel]),
-+ [],
-+ [enable_goa=auto])
-+
-+AS_IF([test "$enable_goa" != "no"],
-+ [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL],
-+ [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION],
-+ [
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
-+ build_online_accounts=yes
-+ background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION"
-+ ], [
-+ AS_IF([test "$enable_goa" = "yes"],
-+ [AC_MSG_ERROR([gnome-online-accounts support requested but not found])])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes")
-+
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-+ $background_goa_dependencies)
-+
-+build_color=no
-+AC_ARG_ENABLE([color],
-+ AS_HELP_STRING([--disable-color],
-+ [disable color management panel]),
-+ [],
-+ [enable_color=auto])
-+
-+AS_IF([test "$enable_color" != "no"],
-+ [PKG_CHECK_MODULES([COLOR_PANEL],
-+ [
-+ $COMMON_MODULES
-+ colord >= $COLORD_REQUIRED_VERSION
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+ libsoup-2.4
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+ ], [
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+ build_color=yes
-+ ], [
-+ AS_IF([test "$enable_color" = "yes"],
-+ [AC_MSG_ERROR([colord support requested but not found])])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- smbclient)
-@@ -254,17 +296,27 @@ else
- fi
-
- # Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
-- [have_bluetooth=yes], have_bluetooth=no)
--if test "x$have_bluetooth" = xyes ; then
-- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
--else
-- linux_usb_error_or_warn "*** Bluetooth panel will not be built"
--fi
--AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
--if test x${have_bluetooth} = xyes; then
-- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
--fi
-+have_bluetooth=no
-+AC_ARG_ENABLE([bluetooth],
-+ AS_HELP_STRING([--disable-bluetooth],
-+ [disable bluetooth management panel]),
-+ [],
-+ [enable_bluetooth=auto])
-+
-+AS_IF([test "$enable_bluetooth" = "yes"],
-+ [PKG_CHECK_MODULES([BLUETOOTH],
-+ [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2],
-+ [
-+ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
-+ have_bluetooth=yes
-+ ],
-+ [
-+ have_bluetooth=no
-+ AS_IF([test "$enable_bluetooth" = "yes"],
-+ [AC_MSG_ERROR([bluetooth support requested but not found])])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
-
- # Check for CUPS 1.4 or newer
- AC_PROG_SED
-@@ -319,32 +371,52 @@ fi
- AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
-
- # Wacom
--PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-- clutter-gtk-1.0
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
-- [have_wacom=yes], [have_wacom=no])
-+AC_ARG_ENABLE([wacom],
-+ AS_HELP_STRING([--disable-wacom],
-+ [disable wacom management panel]),
-+ [],
-+ [enable_wacom=yes])
-+AS_IF([test "x$enable_wacom" = "xyes"],
-+ [PKG_CHECK_MODULES([WACOM_PANEL],
-+ [
-+ $COMMON_MODULES
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+ clutter-gtk-1.0
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION
-+ ], [
-+ have_wacom=yes
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-+ ], [
-+ have_wacom=no
-+ AC_MSG_ERROR([wacom support requested but not found])
-+ ])
-+ ])
-
--if test "x$have_wacom" = xyes ; then
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
--else
-- linux_usb_error_or_warn "*** Wacom panel will not be built"
--fi
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
-
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
--
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+ AS_HELP_STRING([--disable-kerberos],
-+ [disable kerberos support (default: enabled)]),
-+ [],
-+ [enable_kerberos=yes])
-+
-+AS_IF([test "$enable_kerberos" != "no"],
-+ [
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+
-+ AS_IF([test "$KRB5_CONFIG" = "no"],
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]))
-+
-+ AC_MSG_CHECKING([for krb5 libraries and flags])
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
-+ ])
-
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
-@@ -576,11 +648,24 @@ if test "x$have_bluetooth" = "xyes"; then
- else
- AC_MSG_NOTICE([ Bluetooth panel disabled])
- fi
-+
-+if test "x$build_color" = "xyes"; then
-+ AC_MSG_NOTICE([** colord (Color panel)])
-+else
-+ AC_MSG_NOTICE([ Color panel disabled])
-+fi
-+
-+
- if test "x$have_cheese" = "xyes"; then
- AC_MSG_NOTICE([** Cheese (Users panel webcam support)])
- else
- AC_MSG_NOTICE([ Users panel webcam support disabled])
- fi
-+if test "x$build_online_accounts" = "xyes"; then
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
-+else
-+ AC_MSG_NOTICE([ Online Accounts panel disabled])
-+fi
- if test "x$have_wacom" = "xyes"; then
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 507cd2f..2806c45 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -2,11 +2,9 @@ SUBDIRS= \
- common \
- background \
- power \
-- color \
- display \
- mouse \
- notifications \
-- online-accounts \
- region \
- info \
- sound \
-@@ -19,6 +17,10 @@ SUBDIRS= \
- sharing \
- printers
-
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -31,4 +33,8 @@ if BUILD_BLUETOOTH
- SUBDIRS += bluetooth
- endif
-
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
-index ccb8017..bde4cdf 100644
---- a/panels/background/Makefile.am
-+++ b/panels/background/Makefile.am
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
- $(BUILT_SOURCES) \
- cc-background-chooser-dialog.c \
- cc-background-chooser-dialog.h \
-- cc-background-grilo-miner.c \
-- cc-background-grilo-miner.h \
- cc-background-item.c \
- cc-background-item.h \
- cc-background-xml.c \
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
- bg-colors-source.c \
- bg-colors-source.h
-
-+if BUILD_ONLINE_ACCOUNTS
-+libbackground_chooser_la_SOURCES += \
-+ cc-background-grilo-miner.c \
-+ cc-background-grilo-miner.h
-+endif
-+
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
-
- libbackground_la_SOURCES = \
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
-index a33cee7..408359c 100644
---- a/panels/background/bg-pictures-source.c
-+++ b/panels/background/bg-pictures-source.c
-@@ -23,13 +23,17 @@
-
- #include "bg-pictures-source.h"
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include "cc-background-grilo-miner.h"
-+#endif
- #include "cc-background-item.h"
-
- #include <string.h>
- #include <cairo-gobject.h>
- #include <gio/gio.h>
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include <grilo.h>
-+#endif
- #include <libgnome-desktop/gnome-desktop-thumbnail.h>
- #include <gdesktop-enums.h>
-
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
- {
- GCancellable *cancellable;
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- CcBackgroundGriloMiner *grl_miner;
-+#endif
-
- GnomeDesktopThumbnailFactory *thumb_factory;
-
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
- g_clear_object (&priv->cancellable);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- g_clear_object (&priv->grl_miner);
-+#endif
- g_clear_object (&priv->thumb_factory);
-
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
- gboolean needs_download;
- gboolean retval = FALSE;
- GFile *pictures_dir, *cache_dir;
-+#ifdef BUILD_ONLINE_ACCOUNTS
- GrlMedia *media;
-+#else
-+ gpointer media = NULL;
-+#endif
-
- /* find png and jpeg files */
- if (!content_type)
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
-
- read_file:
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- media = g_object_get_data (G_OBJECT (file), "grl-media");
-+#endif
- if (media == NULL)
- {
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static gboolean
- add_single_file_from_media (BgPicturesSource *bg_source,
- GFile *file,
-@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
-
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- gboolean
- bg_pictures_source_add (BgPicturesSource *bg_source,
-@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self,
- return monitor;
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static void
- media_found_cb (BgPicturesSource *self, GrlMedia *media)
- {
-@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
- add_single_file_from_media (self, file, media);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- static void
- bg_pictures_source_init (BgPicturesSource *self)
-@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self)
- priv->cache_dir_monitor = monitor_path (self, cache_path);
- g_free (cache_path);
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- priv->grl_miner = cc_background_grilo_miner_new ();
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
- cc_background_grilo_miner_start (priv->grl_miner);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- priv->thumb_factory =
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
-diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
-index db4e69a..7677b58 100644
---- a/panels/power/cc-power-panel.c
-+++ b/panels/power/cc-power-panel.c
-@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self)
- G_CALLBACK (wifi_switch_changed), self);
- #endif
-
--#ifdef HAVE_BLUETOOTH
-+#ifdef BUILD_BLUETOOTH
- priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 2639148..977dab1 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -22,7 +22,9 @@
-
- #include "um-realm-manager.h"
-
-+#ifdef HAVE_KERBEROS
- #include <krb5/krb5.h>
-+#endif
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -698,6 +700,7 @@ login_closure_free (gpointer data)
- g_slice_free (LoginClosure, login);
- }
-
-+#ifdef HAVE_KERBEROS
- static krb5_error_code
- login_perform_kinit (krb5_context k5,
- const gchar *realm,
-@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5,
-
- return code;
- }
-+#endif /* HAVE_KERBEROS */
-
- static void
- kinit_thread_func (GSimpleAsyncResult *async,
- GObject *object,
- GCancellable *cancellable)
- {
-+#ifdef HAVE_KERBEROS
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
- krb5_context k5 = NULL;
- krb5_error_code code;
-@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
-
- if (k5)
- krb5_free_context (k5);
-+#else /* HAVE_KERBEROS */
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
-+ _("gnome-control-center was built without kerberos support"));
-+#endif
- }
-
- void
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index 6af3199..f3e49c7 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \
- $(top_builddir)/panels/common/liblanguage.la \
- $(top_builddir)/panels/common/libdevice.la \
- $(top_builddir)/panels/background/libbackground.la \
-- $(top_builddir)/panels/color/libcolor.la \
- $(top_builddir)/panels/datetime/libdate_time.la \
- $(top_builddir)/panels/display/libdisplay.la \
- $(top_builddir)/panels/info/libinfo.la \
- $(top_builddir)/panels/keyboard/libkeyboard.la \
- $(top_builddir)/panels/mouse/libmouse-properties.la \
- $(top_builddir)/panels/notifications/libnotifications.la \
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
- $(top_builddir)/panels/power/libpower.la \
- $(top_builddir)/panels/privacy/libprivacy.la \
- $(top_builddir)/panels/region/libregion.la \
-@@ -108,6 +106,14 @@ if BUILD_BLUETOOTH
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
- endif
-
-+if BUILD_COLOR
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
-+endif
-+
-+if BUILD_ONLINE_ACCOUNTS
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
-+endif
-+
- gnome_control_center_alt_LDADD = \
- $(gnome_control_center_LDADD) \
- alt/libshell_alt.la
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 20ebb85..9104b45 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
- #ifdef BUILD_BLUETOOTH
- extern GType cc_bluetooth_panel_get_type (void);
- #endif /* BUILD_BLUETOOTH */
-+#ifdef BUILD_COLOR
- extern GType cc_color_panel_get_type (void);
-+#endif /* BUILD_COLOR */
- extern GType cc_date_time_panel_get_type (void);
- extern GType cc_display_panel_get_type (void);
- extern GType cc_info_panel_get_type (void);
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
- extern GType cc_network_panel_get_type (void);
- #endif /* BUILD_NETWORK */
- extern GType cc_notifications_panel_get_type (void);
-+#ifdef BUILD_ONLINE_ACCOUNTS
- extern GType cc_goa_panel_get_type (void);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
- extern GType cc_power_panel_get_type (void);
- extern GType cc_printers_panel_get_type (void);
- extern GType cc_privacy_panel_get_type (void);
-@@ -75,7 +79,9 @@ static struct {
- #ifdef BUILD_BLUETOOTH
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
- #endif
-+#ifdef BUILD_COLOR
- PANEL_TYPE("color", cc_color_panel_get_type ),
-+#endif
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
- PANEL_TYPE("display", cc_display_panel_get_type ),
- PANEL_TYPE("info", cc_info_panel_get_type ),
-@@ -85,7 +91,9 @@ static struct {
- PANEL_TYPE("network", cc_network_panel_get_type ),
- #endif
- PANEL_TYPE("notifications", cc_notifications_panel_get_type),
-+#ifdef BUILD_ONLINE_ACCOUNTS
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
-+#endif
- PANEL_TYPE("power", cc_power_panel_get_type ),
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
- PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
---
-2.10.2
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch
deleted file mode 100644
index 5d5af0d9717..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From c093ce404bf9868980fe7b83d6aa2ab3ec7831e2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 8 Dec 2013 23:44:56 +0100
-Subject: [PATCH 5/5] Fix some absolute paths to be appropriate for Gentoo
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- panels/datetime/Makefile.am | 1 +
- panels/datetime/test-endianess.c | 4 ++--
- panels/datetime/test-timezone.c | 2 +-
- panels/datetime/tz.h | 4 ++--
- panels/printers/Makefile.am | 3 +++
- panels/printers/cc-printers-panel.c | 4 ++--
- panels/printers/pp-host.c | 2 +-
- 7 files changed, 12 insertions(+), 8 deletions(-)
-
-diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
-index 43523a6..d8d677d 100644
---- a/panels/datetime/Makefile.am
-+++ b/panels/datetime/Makefile.am
-@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
- $(DATETIME_PANEL_CFLAGS) \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
-+ -DREALDATADIR="\"$(datadir)\"" \
- $(NULL)
-
- # test-timezone is still too noisy
-diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
-index 06b2613..eb52bb6 100644
---- a/panels/datetime/test-endianess.c
-+++ b/panels/datetime/test-endianess.c
-@@ -26,11 +26,11 @@ test_endianess (void)
- GDir *dir;
- const char *name;
-
-- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
-+ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
- if (dir == NULL) {
- /* Try with /usr/share/locale/
- * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
-- dir = g_dir_open ("/usr/share/locale/", 0, NULL);
-+ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
- if (dir == NULL) {
- g_assert_not_reached ();
- }
-diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
-index db5c030..7ef5cef 100644
---- a/panels/datetime/test-timezone.c
-+++ b/panels/datetime/test-timezone.c
-@@ -2,7 +2,7 @@
- #include <gtk/gtk.h>
- #include "cc-timezone-map.h"
-
--#define TZ_DIR "/usr/share/zoneinfo/"
-+#define TZ_DIR REALDATADIR "/zoneinfo/"
-
- static GList *
- get_timezone_list (GList *tzs,
-diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
-index 93905b3..1ba918c 100644
---- a/panels/datetime/tz.h
-+++ b/panels/datetime/tz.h
-@@ -28,9 +28,9 @@
- #include <glib.h>
-
- #ifndef __sun
--# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
-+# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
- #else
--# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
-+# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
- #endif
-
- typedef struct _TzDB TzDB;
-diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
-index 512cda5..87726dd 100644
---- a/panels/printers/Makefile.am
-+++ b/panels/printers/Makefile.am
-@@ -10,6 +10,9 @@ AM_CPPFLAGS = \
- -I$(top_srcdir)/shell/ \
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DTEST_SRCDIR=\""$(srcdir)/"\" \
-+ -DREALDATADIR="\"$(datadir)\"" \
-+ -DPREFIX="\"$(prefix)\"" \
-+ -DLIBEXECDIR="\"$(libexecdir)\"" \
- $(NULL)
-
- noinst_LTLIBRARIES = libprinters.la
-diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
-index fb55608..a6dfb90 100644
---- a/panels/printers/cc-printers-panel.c
-+++ b/panels/printers/cc-printers-panel.c
-@@ -2590,8 +2590,8 @@ test_page_cb (GtkButton *button,
-
- if (printer_name)
- {
-- const gchar *const dirs[] = { "/usr/share/cups",
-- "/usr/local/share/cups",
-+ const gchar *const dirs[] = { REALDATADIR "/cups",
-+ PREFIX "/local/share/cups",
- NULL };
- const gchar *datadir = NULL;
- http_t *http = NULL;
-diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index fbfb434..bd00518 100644
---- a/panels/printers/pp-host.c
-+++ b/panels/printers/pp-host.c
-@@ -254,7 +254,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
- data->devices->devices = NULL;
-
- argv = g_new0 (gchar *, 3);
-- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
-+ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
- argv[1] = g_strdup (priv->hostname);
-
- /* Use SNMP to get printer's informations */
---
-2.10.1
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch
deleted file mode 100644
index 2bd4e0e0abe..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0ee5e7191e62e6df9067fa5b0886d09952d4e315 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Mon, 11 May 2015 23:59:03 +0200
-Subject: [PATCH 3/5] Optional gotta be optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- configure.ac | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 140459c..fe947d7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -512,22 +512,6 @@ else
- AC_MSG_RESULT(no)
- fi
-
--case $host_os in
-- linux*)
-- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-- # Nothing
-- echo "USB-related panels disabled on S390"
-- else
-- if test "x$have_networkmanager" != "xyes" -o \
-- "x$have_bluetooth" != "xyes" -o \
-- "x$enable_cups" != "xyes" -o \
-- "x$have_wacom" != "xyes"; then
-- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems])
-- fi
-- fi
-- ;;
--esac
--
- AC_CONFIG_FILES([
- Makefile
- panels/Makefile
---
-2.10.1
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch
deleted file mode 100644
index f4a7d3b8ea7..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1ad9510963dc634cb1805ca9e4726004130fc7e3 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Tue, 12 May 2015 00:32:11 +0200
-Subject: [PATCH 4/5] Make network panel optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- configure.ac | 43 +++++++++++++++++++++++++------------------
- 1 file changed, 25 insertions(+), 18 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe947d7..6ecda91 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -241,24 +241,31 @@ AS_IF([test "$enable_wayland" != "no"],
- PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
- ])
-
--PKG_CHECK_MODULES(NETWORK_MANAGER,
-- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
-- libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
-- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
-- [have_networkmanager=yes], have_networkmanager=no)
--if test "x$have_networkmanager" = xno ; then
-- AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***)
--else
-- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
--fi
--AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
--if test x${have_networkmanager} = xyes; then
-- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
-- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
-- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
-- AC_SUBST(NM_VPN_CONFIG_DIR)
-- AC_SUBST(NM_VPN_MODULE_DIR)
--fi
-+AC_ARG_ENABLE([networkmanager],
-+ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]),
-+ [],
-+ [enable_networkmanager=auto])
-+AS_IF([test "$enable_networkmanager" != "no"],
-+ [
-+ PKG_CHECK_MODULES(NETWORK_MANAGER,
-+ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
-+ libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
-+ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
-+ [have_networkmanager=yes], [have_networkmanager=no])
-+
-+ AS_IF([test "$have_networkmanager" = "no"],
-+ [
-+ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***])
-+ ], [
-+ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
-+ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
-+ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
-+ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
-+ AC_SUBST([NM_VPN_CONFIG_DIR])
-+ AC_SUBST([NM_VPN_MODULE_DIR])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
-
- # Check for power panel
- if test x${have_networkmanager} = xyes; then
---
-2.10.1
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch
deleted file mode 100644
index 2c06408d1a3..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 09d1f1a057268a6acdfb42e7dcb2843c0066f542 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider <tranquility@gentoo.org>
-Date: Sat, 25 Apr 2015 22:22:09 +0200
-Subject: [PATCH 2/5] Make wayland support optional
-
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- configure.ac | 21 +++++++++++++++------
- 1 file changed, 15 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 19096f5..140459c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -225,12 +225,21 @@ if test "x$have_udev" = xyes ; then
- fi
- AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
-
--PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
--if test "x$have_wayland" = xyes ; then
-- if test "x$have_udev" != xyes ; then
-- AC_MSG_ERROR([udev is required for Wayland support])
-- fi
--fi
-+AC_ARG_ENABLE(
-+ [wayland],
-+ AS_HELP_STRING([--disable-wayland], [disable wayland support]),
-+ [],
-+ enable_wayland=auto
-+)
-+
-+AS_IF([test "$enable_wayland" != "no"],
-+ [
-+ AS_IF([test "x$have_udev" = xno],
-+ [AC_MSG_ERROR([udev is required for Wayland support])],
-+ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
-+
-+ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
-+])
-
- PKG_CHECK_MODULES(NETWORK_MANAGER,
- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
---
-2.10.1
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch
deleted file mode 100644
index 02516ced7c9..00000000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch
+++ /dev/null
@@ -1,569 +0,0 @@
-From 108d79460d42d5e8167ad52747628f9dfd21058d Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 2 Nov 2016 23:40:52 +0100
-Subject: [PATCH 1/5] Make bluetooth/colord/goa/kerberos/wacom optional
-
-Upstream is not interested in any part of this patch:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
-https://bugzilla.gnome.org/show_bug.cgi?id=697478
-https://bugzilla.gnome.org/show_bug.cgi?id=700145
-
-Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
-Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
----
- configure.ac | 185 +++++++++++++++++++++++---------
- panels/Makefile.am | 10 +-
- panels/background/Makefile.am | 8 +-
- panels/background/bg-pictures-source.c | 20 ++++
- panels/power/cc-power-panel.c | 2 +-
- panels/user-accounts/um-realm-manager.c | 9 ++
- shell/Makefile.am | 10 +-
- shell/cc-panel-loader.c | 8 ++
- 8 files changed, 196 insertions(+), 56 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1e07acd..19096f5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-- goa-1.0 >= $GOA_REQUIRED_VERSION
-- grilo-0.3 >= $GRILO_REQUIRED_VERSION)
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-@@ -140,12 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-- colord >= $COLORD_REQUIRED_VERSION
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-- libsoup-2.4
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+
-+build_online_accounts=no
-+background_online_accounts=
-+AC_ARG_ENABLE([goa],
-+ AS_HELP_STRING([--disable-goa],
-+ [disable online accounts management panel]),
-+ [],
-+ [enable_goa=auto])
-+
-+AS_IF([test "$enable_goa" != "no"],
-+ [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL],
-+ [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION],
-+ [
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
-+ build_online_accounts=yes
-+ background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION"
-+ ], [
-+ AS_IF([test "$enable_goa" = "yes"],
-+ [AC_MSG_ERROR([gnome-online-accounts support requested but not found])])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes")
-+
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-+ $background_goa_dependencies)
-+
-+build_color=no
-+AC_ARG_ENABLE([color],
-+ AS_HELP_STRING([--disable-color],
-+ [disable color management panel]),
-+ [],
-+ [enable_color=auto])
-+
-+AS_IF([test "$enable_color" != "no"],
-+ [PKG_CHECK_MODULES([COLOR_PANEL],
-+ [
-+ $COMMON_MODULES
-+ colord >= $COLORD_REQUIRED_VERSION
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+ libsoup-2.4
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+ ], [
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+ build_color=yes
-+ ], [
-+ AS_IF([test "$enable_color" = "yes"],
-+ [AC_MSG_ERROR([colord support requested but not found])])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -220,15 +262,27 @@ else
- fi
-
- # Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
-- [have_bluetooth=yes], have_bluetooth=no)
--if test "x$have_bluetooth" = xyes ; then
-- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
--fi
--AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
--if test x${have_bluetooth} = xyes; then
-- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
--fi
-+have_bluetooth=no
-+AC_ARG_ENABLE([bluetooth],
-+ AS_HELP_STRING([--disable-bluetooth],
-+ [disable bluetooth management panel]),
-+ [],
-+ [enable_bluetooth=auto])
-+
-+AS_IF([test "$enable_bluetooth" = "yes"],
-+ [PKG_CHECK_MODULES([BLUETOOTH],
-+ [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2],
-+ [
-+ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
-+ have_bluetooth=yes
-+ ],
-+ [
-+ have_bluetooth=no
-+ AS_IF([test "$enable_bluetooth" = "yes"],
-+ [AC_MSG_ERROR([bluetooth support requested but not found])])
-+ ])
-+ ])
-+AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
-
- # Check for smbclient
- PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])
-@@ -301,38 +355,61 @@ fi
- AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
-
- # wacom is disabled for s390/s390x and non Linux platforms (needs udev)
--case $host_os in
-- linux*)
-- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
-- have_wacom=no
-- else
-- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-- clutter-gtk-1.0
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
-- have_wacom=yes
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-- fi
-- ;;
-- *)
-- have_wacom=no
-- ;;
--esac
--AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
-+have_wacom=no
-+AS_CASE([$host_os],
-+ [linux*],
-+ [AS_IF([test "$host_cpu" = "s390" -o "$host_cpu" = "s390x"],
-+ [have_wacom=no],
-+ [
-+ AC_ARG_ENABLE([wacom],
-+ AS_HELP_STRING([--disable-wacom],
-+ [disable wacom management panel]),
-+ [],
-+ [enable_wacom=yes])
-+ AS_IF([test "$enable_wacom" = "yes"],
-+ [PKG_CHECK_MODULES([WACOM_PANEL],
-+ [
-+ $COMMON_MODULES
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+ clutter-gtk-1.0
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION
-+ ], [
-+ have_wacom=yes
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-+ ], [
-+ have_wacom=no
-+ AS_IF([test "$enable_wacom" = "yes"],
-+ [AC_MSG_ERROR([wacom support requested but not found])])
-+ ])
-+ ])
-+ ])
-+ ],
-+ [have_wacom=no])
-+AM_CONDITIONAL(BUILD_WACOM, [test "$have_wacom" = "yes"])
-
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
--
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+ AS_HELP_STRING([--disable-kerberos],
-+ [disable kerberos support (default: enabled)]),
-+ [],
-+ [enable_kerberos=yes])
-+
-+AS_IF([test "$enable_kerberos" != "no"],
-+ [
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+
-+ AS_IF([test "$KRB5_CONFIG" = "no"],
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]))
-+
-+ AC_MSG_CHECKING([for krb5 libraries and flags])
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
-+ ])
-
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
-@@ -569,6 +646,11 @@ if test "x$have_bluetooth" = "xyes"; then
- else
- AC_MSG_NOTICE([ Bluetooth panel disabled])
- fi
-+if test "x$build_color" = "xyes"; then
-+ AC_MSG_NOTICE([** colord (Color panel)])
-+else
-+ AC_MSG_NOTICE([ Color panel disabled])
-+fi
- if test "x$enable_cups" = "xyes"; then
- AC_MSG_NOTICE([** CUPS (Printers panel)])
- else
-@@ -579,6 +661,11 @@ if test "x$have_cheese" = "xyes"; then
- else
- AC_MSG_NOTICE([ Users panel webcam support disabled])
- fi
-+if test "x$build_online_accounts" = "xyes"; then
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
-+else
-+ AC_MSG_NOTICE([ Online Accounts panel disabled])
-+fi
- if test "x$have_wacom" = "xyes"; then
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 9961c25..0c54622 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -2,11 +2,9 @@ SUBDIRS= \
- common \
- background \
- power \
-- color \
- display \
- mouse \
- notifications \
-- online-accounts \
- region \
- info \
- sound \
-@@ -18,6 +16,10 @@ SUBDIRS= \
- privacy \
- sharing
-
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
- SUBDIRS += bluetooth
- endif
-
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
-index ccb8017..bde4cdf 100644
---- a/panels/background/Makefile.am
-+++ b/panels/background/Makefile.am
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
- $(BUILT_SOURCES) \
- cc-background-chooser-dialog.c \
- cc-background-chooser-dialog.h \
-- cc-background-grilo-miner.c \
-- cc-background-grilo-miner.h \
- cc-background-item.c \
- cc-background-item.h \
- cc-background-xml.c \
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
- bg-colors-source.c \
- bg-colors-source.h
-
-+if BUILD_ONLINE_ACCOUNTS
-+libbackground_chooser_la_SOURCES += \
-+ cc-background-grilo-miner.c \
-+ cc-background-grilo-miner.h
-+endif
-+
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
-
- libbackground_la_SOURCES = \
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
-index a33cee7..408359c 100644
---- a/panels/background/bg-pictures-source.c
-+++ b/panels/background/bg-pictures-source.c
-@@ -23,13 +23,17 @@
-
- #include "bg-pictures-source.h"
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include "cc-background-grilo-miner.h"
-+#endif
- #include "cc-background-item.h"
-
- #include <string.h>
- #include <cairo-gobject.h>
- #include <gio/gio.h>
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include <grilo.h>
-+#endif
- #include <libgnome-desktop/gnome-desktop-thumbnail.h>
- #include <gdesktop-enums.h>
-
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
- {
- GCancellable *cancellable;
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- CcBackgroundGriloMiner *grl_miner;
-+#endif
-
- GnomeDesktopThumbnailFactory *thumb_factory;
-
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
- g_clear_object (&priv->cancellable);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- g_clear_object (&priv->grl_miner);
-+#endif
- g_clear_object (&priv->thumb_factory);
-
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
- gboolean needs_download;
- gboolean retval = FALSE;
- GFile *pictures_dir, *cache_dir;
-+#ifdef BUILD_ONLINE_ACCOUNTS
- GrlMedia *media;
-+#else
-+ gpointer media = NULL;
-+#endif
-
- /* find png and jpeg files */
- if (!content_type)
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
-
- read_file:
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- media = g_object_get_data (G_OBJECT (file), "grl-media");
-+#endif
- if (media == NULL)
- {
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static gboolean
- add_single_file_from_media (BgPicturesSource *bg_source,
- GFile *file,
-@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
-
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- gboolean
- bg_pictures_source_add (BgPicturesSource *bg_source,
-@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self,
- return monitor;
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static void
- media_found_cb (BgPicturesSource *self, GrlMedia *media)
- {
-@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
- add_single_file_from_media (self, file, media);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- static void
- bg_pictures_source_init (BgPicturesSource *self)
-@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self)
- priv->cache_dir_monitor = monitor_path (self, cache_path);
- g_free (cache_path);
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- priv->grl_miner = cc_background_grilo_miner_new ();
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
- cc_background_grilo_miner_start (priv->grl_miner);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- priv->thumb_factory =
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
-diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
-index db4e69a..7677b58 100644
---- a/panels/power/cc-power-panel.c
-+++ b/panels/power/cc-power-panel.c
-@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self)
- G_CALLBACK (wifi_switch_changed), self);
- #endif
-
--#ifdef HAVE_BLUETOOTH
-+#ifdef BUILD_BLUETOOTH
- priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_NONE,
- NULL,
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 8a0a0e6..22c6b94 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -22,7 +22,9 @@
-
- #include "um-realm-manager.h"
-
-+#ifdef HAVE_KERBEROS
- #include <krb5/krb5.h>
-+#endif
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -698,6 +700,7 @@ login_closure_free (gpointer data)
- g_slice_free (LoginClosure, login);
- }
-
-+#ifdef HAVE_KERBEROS
- static krb5_error_code
- login_perform_kinit (krb5_context k5,
- const gchar *realm,
-@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5,
-
- return code;
- }
-+#endif /* HAVE_KERBEROS */
-
- static void
- kinit_thread_func (GSimpleAsyncResult *async,
- GObject *object,
- GCancellable *cancellable)
- {
-+#ifdef HAVE_KERBEROS
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
- krb5_context k5 = NULL;
- krb5_error_code code;
-@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
-
- if (k5)
- krb5_free_context (k5);
-+#else /* HAVE_KERBEROS */
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
-+ _("gnome-control-center was built without kerberos support"));
-+#endif
- }
-
- void
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index 45f6363..b76f343 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \
- $(top_builddir)/panels/common/liblanguage.la \
- $(top_builddir)/panels/common/libdevice.la \
- $(top_builddir)/panels/background/libbackground.la \
-- $(top_builddir)/panels/color/libcolor.la \
- $(top_builddir)/panels/datetime/libdate_time.la \
- $(top_builddir)/panels/display/libdisplay.la \
- $(top_builddir)/panels/info/libinfo.la \
- $(top_builddir)/panels/keyboard/libkeyboard.la \
- $(top_builddir)/panels/mouse/libmouse-properties.la \
- $(top_builddir)/panels/notifications/libnotifications.la \
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
- $(top_builddir)/panels/power/libpower.la \
- $(top_builddir)/panels/privacy/libprivacy.la \
- $(top_builddir)/panels/region/libregion.la \
-@@ -111,6 +109,14 @@ if BUILD_BLUETOOTH
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
- endif
-
-+if BUILD_COLOR
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
-+endif
-+
-+if BUILD_ONLINE_ACCOUNTS
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
-+endif
-+
- gnome_control_center_alt_LDADD = \
- $(gnome_control_center_LDADD) \
- alt/libshell_alt.la
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 03dbfb1..a713079 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
- #ifdef BUILD_BLUETOOTH
- extern GType cc_bluetooth_panel_get_type (void);
- #endif /* BUILD_BLUETOOTH */
-+#ifdef BUILD_COLOR
- extern GType cc_color_panel_get_type (void);
-+#endif /* BUILD_COLOR */
- extern GType cc_date_time_panel_get_type (void);
- extern GType cc_display_panel_get_type (void);
- extern GType cc_info_panel_get_type (void);
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
- extern GType cc_network_panel_get_type (void);
- #endif /* BUILD_NETWORK */
- extern GType cc_notifications_panel_get_type (void);
-+#ifdef BUILD_ONLINE_ACCOUNTS
- extern GType cc_goa_panel_get_type (void);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
- extern GType cc_power_panel_get_type (void);
- #ifdef BUILD_PRINTERS
- extern GType cc_printers_panel_get_type (void);
-@@ -77,7 +81,9 @@ static struct {
- #ifdef BUILD_BLUETOOTH
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
- #endif
-+#ifdef BUILD_COLOR
- PANEL_TYPE("color", cc_color_panel_get_type ),
-+#endif
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
- PANEL_TYPE("display", cc_display_panel_get_type ),
- PANEL_TYPE("info", cc_info_panel_get_type ),
-@@ -87,7 +93,9 @@ static struct {
- PANEL_TYPE("network", cc_network_panel_get_type ),
- #endif
- PANEL_TYPE("notifications", cc_notifications_panel_get_type),
-+#ifdef BUILD_ONLINE_ACCOUNTS
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
-+#endif
- PANEL_TYPE("power", cc_power_panel_get_type ),
- #ifdef BUILD_PRINTERS
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
---
-2.10.1
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild
index c9c82aa7b53..0ac1e28bd66 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.2-r1.ebuild
@@ -9,6 +9,7 @@ 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/${P}-patchset.tar.xz"
LICENSE="GPL-2+"
SLOT="2"
@@ -128,16 +129,16 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# From gnome-3-22 branch
- "${FILESDIR}"/${PV}-fix-build-without-wayland.patch # bug 613192
- "${FILESDIR}"/${PV}-fix-dual-gpu-crash.patch
+ "${WORKDIR}"/${P}-patchset/${PV}-fix-build-without-wayland.patch # bug 613192
+ "${WORKDIR}"/${P}-patchset/${PV}-fix-dual-gpu-crash.patch
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- "${FILESDIR}"/${PN}-3.22.0-optional.patch
- "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch
- "${FILESDIR}"/${PN}-3.22.0-keep-panels-optional.patch
- "${FILESDIR}"/${PN}-3.22.0-make-networkmanager-optional.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-optional.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-wayland-optional.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-keep-panels-optional.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-make-networkmanager-optional.patch
# Fix some absolute paths to be appropriate for Gentoo
- "${FILESDIR}"/${PN}-3.22.0-gentoo-paths.patch
+ "${WORKDIR}"/${P}-patchset/${PN}-3.22.0-gentoo-paths.patch
)
src_configure() {
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
index e802f6f162f..55324932108 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
@@ -9,6 +9,7 @@ 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/${P}-patchset.tar.xz"
LICENSE="GPL-2+"
SLOT="2"
@@ -132,14 +133,14 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- "${FILESDIR}"/${PV}-optional.patch
- "${FILESDIR}"/${PV}-optional-wayland.patch
- "${FILESDIR}"/${PV}-optional-networkmanager.patch
- "${FILESDIR}"/${PV}-optional-cups.patch
+ "${WORKDIR}"/${P}-patchset/${PV}-optional.patch
+ "${WORKDIR}"/${P}-patchset/${PV}-optional-wayland.patch
+ "${WORKDIR}"/${P}-patchset/${PV}-optional-networkmanager.patch
+ "${WORKDIR}"/${P}-patchset/${PV}-optional-cups.patch
# Fix some absolute paths to be appropriate for Gentoo
- "${FILESDIR}"/${PV}-gentoo-paths.patch
+ "${WORKDIR}"/${P}-patchset/${PV}-gentoo-paths.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=780544
- "${FILESDIR}"/${PV}-fix-without-gdkwayland.patch
+ "${WORKDIR}"/${P}-patchset/${PV}-fix-without-gdkwayland.patch
)
src_configure() {
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
index 4935e46c886..b7fe8aa31c0 100644
--- 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
@@ -9,6 +9,7 @@ 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"
@@ -132,14 +133,14 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- "${FILESDIR}"/3.24.2-optional.patch
- "${FILESDIR}"/3.24.2-optional-wayland.patch
- "${FILESDIR}"/3.24.2-optional-networkmanager.patch
- "${FILESDIR}"/3.24.2-optional-cups.patch
+ "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional.patch
+ "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-wayland.patch
+ "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-networkmanager.patch
+ "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-cups.patch
# Fix some absolute paths to be appropriate for Gentoo
- "${FILESDIR}"/3.24.2-gentoo-paths.patch
+ "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-gentoo-paths.patch
# https://bugzilla.gnome.org/show_bug.cgi?id=780544
- "${FILESDIR}"/3.24.2-fix-without-gdkwayland.patch
+ "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-fix-without-gdkwayland.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2017-07-14 2:46 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2017-07-14 2:46 UTC (permalink / raw
To: gentoo-commits
commit: f923dee4743f11d1cf9cdf0592ad083a771c3132
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 02:08:21 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 02:38:57 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f923dee4
gnome-base/gnome-control-center: bump to 3.24.2, make cups/smbclient optional, add back lost cups runtime deps
Package-Manager: Portage-2.3.5, Repoman-2.3.2
gnome-base/gnome-control-center/Manifest | 2 +-
...entoo-paths.patch => 3.24.2-gentoo-paths.patch} | 18 +-
.../files/3.24.2-optional-cups.patch | 196 +++++++++++++++++++++
....patch => 3.24.2-optional-networkmanager.patch} | 8 +-
.../files/3.24.2-optional-wayland.patch | 46 +++++
....23.91-optional.patch => 3.24.2-optional.patch} | 28 +--
...1.ebuild => gnome-control-center-3.24.2.ebuild} | 25 +--
7 files changed, 285 insertions(+), 38 deletions(-)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index c7f6289c178..671574759fb 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,2 @@
DIST gnome-control-center-3.22.2.tar.xz 7277380 SHA256 7512ff3e256c1d43a746752e90a8079d0b064aae35283cfe863e19706ce22f92 SHA512 a9ed72c47703fcbbd0d6f3301be7d5b3a8eff2f0c400bde19e14c5d013404fc5907765fb20af40022f7700547d06c02203a919b4db4c191f64f3ac20cb12626a WHIRLPOOL 393fa9d1752330ebac81215f35df5da6ed4b457cbc5ce56a5497191584266161c4ab0105b16535ef245be62aec27c6556fca2416ce7b91651b266f224592b686
-DIST gnome-control-center-3.23.91.tar.xz 7300216 SHA256 d8e0cfcfa43223b429aa22c7bbc47475f4763c312407a2e8256db81714c946ac SHA512 b795536afafbf87d2ecdde028651018e2c8129a89cd91077dd0a4cbeb96c2608ff7f401a2dfdf68f7b7fff4a7dfe0b95f2ebb4c6e3039d434d14850c0a76a8a0 WHIRLPOOL 1da42a542f34f6d6df626b9b1762871db5bc2679bdc9fc350ea6171f30e153a95e3c077164769a0bda2bd912af50bc695ebb25f717c127d1827316c69414d52f
+DIST gnome-control-center-3.24.2.tar.xz 7269112 SHA256 382a4b1bf54754c1f5f83adb1faeca2e9de70df5d3d85ac6b0fb192801518f2b SHA512 5041d4907cba0ea188663ad574ddaac6c341ec22b69f7a3d6332b8ae0a572fe33eb19eed758f3d593fe6224d793f2ecc3677584ebf0971f3ae145363a1769cc0 WHIRLPOOL 6e42ec6ac877eb19cc64d5d52106662a872cd4cba25bf0fb2f0fa4a4c1d82fc4149a52f7922e1e1e6dd005133cf54d5e154f75807da58d510e7d09610b41cb7b
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch b/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch
similarity index 91%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch
rename to gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch
index 8bd0169df46..1c7f9278378 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch
+++ b/gnome-base/gnome-control-center/files/3.24.2-gentoo-paths.patch
@@ -1,7 +1,7 @@
-From d646361528717fb0a9134394c62cc2d729b69d39 Mon Sep 17 00:00:00 2001
+From 522dcaf9de0378394c4558961da99ddf0b8b87e7 Mon Sep 17 00:00:00 2001
From: Timo Tambet <ttambet@gmail.com>
Date: Sun, 26 Feb 2017 01:04:05 +0200
-Subject: [PATCH 4/4] Fix some absolute paths to be appropriate for Gentoo
+Subject: [PATCH 4/5] Fix some absolute paths to be appropriate for Gentoo
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
@@ -17,7 +17,7 @@ Signed-off-by: Timo Tambet <ttambet@gmail.com>
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
-index a003f0bce..c43062e98 100644
+index a003f0b..c43062e 100644
--- a/panels/datetime/Makefile.am
+++ b/panels/datetime/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
@@ -29,7 +29,7 @@ index a003f0bce..c43062e98 100644
# test-timezone is still too noisy
diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
-index 06b26131b..eb52bb637 100644
+index 06b2613..eb52bb6 100644
--- a/panels/datetime/test-endianess.c
+++ b/panels/datetime/test-endianess.c
@@ -26,11 +26,11 @@ test_endianess (void)
@@ -47,7 +47,7 @@ index 06b26131b..eb52bb637 100644
g_assert_not_reached ();
}
diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
-index db5c0307e..7ef5cef37 100644
+index db5c030..7ef5cef 100644
--- a/panels/datetime/test-timezone.c
+++ b/panels/datetime/test-timezone.c
@@ -2,7 +2,7 @@
@@ -60,7 +60,7 @@ index db5c0307e..7ef5cef37 100644
static GList *
get_timezone_list (GList *tzs,
diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
-index 93905b3ab..1ba918c74 100644
+index 93905b3..1ba918c 100644
--- a/panels/datetime/tz.h
+++ b/panels/datetime/tz.h
@@ -28,9 +28,9 @@
@@ -76,7 +76,7 @@ index 93905b3ab..1ba918c74 100644
typedef struct _TzDB TzDB;
diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
-index 575cda38c..d5da0bf68 100644
+index 575cda3..d5da0bf 100644
--- a/panels/printers/Makefile.am
+++ b/panels/printers/Makefile.am
@@ -9,6 +9,9 @@ AM_CPPFLAGS = \
@@ -90,7 +90,7 @@ index 575cda38c..d5da0bf68 100644
noinst_LTLIBRARIES = libprinters.la
diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index 8af77e9a9..bb6df7880 100644
+index 8af77e9..bb6df78 100644
--- a/panels/printers/pp-host.c
+++ b/panels/printers/pp-host.c
@@ -267,7 +267,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
@@ -103,5 +103,5 @@ index 8af77e9a9..bb6df7880 100644
/* Use SNMP to get printer's informations */
--
-2.11.1
+2.10.2
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch
new file mode 100644
index 00000000000..c634d77a53c
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional-cups.patch
@@ -0,0 +1,196 @@
+From f76cc5a97dfa94b03abb878767c8dc15b4461685 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Fri, 14 Jul 2017 05:07:42 +0300
+Subject: [PATCH 5/5] Make printers panel optional
+
+---
+ configure.ac | 96 ++++++++++++++++++++++++++++++-------------------
+ panels/Makefile.am | 7 ++--
+ shell/Makefile.am | 7 ++--
+ shell/cc-panel-loader.c | 4 +++
+ 4 files changed, 73 insertions(+), 41 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4af24d0..7629621 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -189,9 +189,59 @@ AS_IF([test "$enable_color" != "no"],
+ ])
+ AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
+
+-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+- smbclient)
++# Check for CUPS 1.4 or newer
++build_printers=no
++AC_PROG_SED
++
++AC_ARG_ENABLE([cups],
++ AS_HELP_STRING([--disable-cups], [disable printer management panel]),
++ [],
++ enable_cups=yes
++)
++
++AS_IF([test "x$enable_cups" != "xno"],
++ [
++ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
++ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
++ smbclient)
++
++ AC_PATH_PROG(CUPS_CONFIG, cups-config)
++
++ if test x$CUPS_CONFIG = x; then
++ AC_MSG_ERROR([cups-config not found])
++ fi
++
++ CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
++ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
++ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
++
++ AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
++ AC_MSG_ERROR([CUPS headers not found]))
++
++ if ! test $CUPS_API_MAJOR -gt 1 -o \
++ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
++ AC_MSG_ERROR([CUPS 1.4 or newer not found])
++ fi
++
++ # https://bugzilla.gnome.org/show_bug.cgi?id=696766
++ CUPS_CPPFLAGS=""
++ if test $CUPS_API_MAJOR -gt 1 -o \
++ $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
++ CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
++ fi
++
++ CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
++ CUPS_LIBS=`$CUPS_CONFIG --libs`
++
++ AC_SUBST(CUPS_CPPFLAGS)
++ AC_SUBST(CUPS_CFLAGS)
++ AC_SUBST(CUPS_LIBS)
++ build_printers=yes
++ AC_DEFINE(BUILD_PRINTERS, 1, [Define to 1 to build the Printers panel])
++ ]
++)
++AM_CONDITIONAL(BUILD_PRINTERS, test "x$build_printers" = "xyes")
++
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -334,40 +384,6 @@ AS_IF([test "$enable_bluetooth" = "yes"],
+ ])
+ AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
+
+-# Check for CUPS 1.4 or newer
+-AC_PROG_SED
+-
+-AC_PATH_PROG(CUPS_CONFIG, cups-config)
+-
+-if test x$CUPS_CONFIG = x; then
+- AC_MSG_ERROR([cups-config not found])
+-fi
+-
+-CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
+-CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
+-CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
+-
+-AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
+- AC_MSG_ERROR([CUPS headers not found]))
+-
+-if ! test $CUPS_API_MAJOR -gt 1 -o \
+- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
+- AC_MSG_ERROR([CUPS 1.4 or newer not found])
+-fi
+-
+-# https://bugzilla.gnome.org/show_bug.cgi?id=696766
+-CUPS_CPPFLAGS=""
+-if test $CUPS_API_MAJOR -gt 1 -o \
+- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
+- CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
+-fi
+-
+-CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
+-CUPS_LIBS=`$CUPS_CONFIG --libs`
+-AC_SUBST(CUPS_CPPFLAGS)
+-AC_SUBST(CUPS_CFLAGS)
+-AC_SUBST(CUPS_LIBS)
+-
+ # Optional dependency for the user accounts panel
+ AC_ARG_WITH([cheese],
+ AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
+@@ -671,6 +687,12 @@ else
+ AC_MSG_NOTICE([ Color panel disabled])
+ fi
+
++if test "x$build_printers" = "xyes"; then
++ AC_MSG_NOTICE([** CUPS (Printers panel)])
++else
++ AC_MSG_NOTICE([ Printers panel disabled])
++fi
++
+
+ if test "x$have_cheese" = "xyes"; then
+ AC_MSG_NOTICE([** Cheese (Users panel webcam support)])
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 2806c45..b68561e 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -14,8 +14,11 @@ SUBDIRS= \
+ datetime \
+ search \
+ privacy \
+- sharing \
+- printers
++ sharing
++
++if BUILD_PRINTERS
++SUBDIRS += printers
++endif
+
+ if BUILD_COLOR
+ SUBDIRS += color
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index f3e49c7..af782ea 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -91,8 +91,11 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/panels/sharing/libsharing.la \
+ $(top_builddir)/panels/sound/libsound.la \
+ $(top_builddir)/panels/universal-access/libuniversal-access.la \
+- $(top_builddir)/panels/user-accounts/libuser-accounts.la \
+- $(top_builddir)/panels/printers/libprinters.la
++ $(top_builddir)/panels/user-accounts/libuser-accounts.la
++
++if BUILD_PRINTERS
++gnome_control_center_LDADD += $(top_builddir)/panels/printers/libprinters.la
++endif
+
+ if BUILD_WACOM
+ gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 9104b45..a713079 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -49,7 +49,9 @@ extern GType cc_notifications_panel_get_type (void);
+ extern GType cc_goa_panel_get_type (void);
+ #endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
++#ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
++#endif /* BUILD_PRINTERS */
+ extern GType cc_privacy_panel_get_type (void);
+ extern GType cc_region_panel_get_type (void);
+ extern GType cc_search_panel_get_type (void);
+@@ -95,7 +97,9 @@ static struct {
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
+ #endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
++#ifdef BUILD_PRINTERS
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
++#endif
+ PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
+ PANEL_TYPE("region", cc_region_panel_get_type ),
+ PANEL_TYPE("search", cc_search_panel_get_type ),
+--
+2.10.2
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch
similarity index 94%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch
rename to gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch
index a871e4628cf..e4efa1c7c1c 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional-networkmanager.patch
@@ -1,7 +1,7 @@
-From ef596aeb01aac8d85fd5861cff360b93cc16ef16 Mon Sep 17 00:00:00 2001
+From c19cbe68d5a4a1363b320debfc6b3e93dbb7e8ac Mon Sep 17 00:00:00 2001
From: Timo Tambet <ttambet@gmail.com>
Date: Sun, 26 Feb 2017 00:37:06 +0200
-Subject: [PATCH 3/4] Make network panel optional
+Subject: [PATCH 3/5] Make network panel optional
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
[Updated for 3.23.90]
@@ -11,7 +11,7 @@ Signed-off-by: Timo Tambet <ttambet@gmail.com>
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/configure.ac b/configure.ac
-index edbf657f4..248db379e 100644
+index b47dbc8..4af24d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -275,24 +275,31 @@ linux_usb_error_or_warn()
@@ -65,5 +65,5 @@ index edbf657f4..248db379e 100644
# Check for power panel
if test x${have_networkmanager} = xyes; then
--
-2.11.1
+2.10.2
diff --git a/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch b/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch
new file mode 100644
index 00000000000..21d4a45b8f1
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional-wayland.patch
@@ -0,0 +1,46 @@
+From e18ff93353a432867e373e549206928d3ced04cc Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <tranquility@gentoo.org>
+Date: Sat, 25 Apr 2015 22:22:09 +0200
+Subject: [PATCH 2/5] Make wayland support optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+Signed-off-by: Mart Raudsepp <leio@gentoo.org>
+---
+ configure.ac | 21 +++++++++++++++------
+ 1 file changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9566fb7..b47dbc8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -227,12 +227,21 @@ if test "x$have_udev" = xyes ; then
+ fi
+ AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"])
+
+-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no)
+-if test "x$have_wayland" = xyes ; then
+- if test "x$have_udev" != xyes ; then
+- AC_MSG_ERROR([udev is required for Wayland support])
+- fi
+-fi
++AC_ARG_ENABLE(
++ [wayland],
++ AS_HELP_STRING([--disable-wayland], [disable wayland support]),
++ [],
++ enable_wayland=auto
++)
++
++AS_IF([test "$enable_wayland" != "no"],
++ [
++ AS_IF([test "x$have_udev" = xno],
++ [AC_MSG_ERROR([udev is required for Wayland support])],
++ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])])
++
++ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0)
++])
+
+ # Panels that must be built on Linux systems
+ linux_error_or_warn()
+--
+2.10.2
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch b/gnome-base/gnome-control-center/files/3.24.2-optional.patch
similarity index 97%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch
rename to gnome-base/gnome-control-center/files/3.24.2-optional.patch
index f4bd22245d9..54e3f65f568 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch
+++ b/gnome-base/gnome-control-center/files/3.24.2-optional.patch
@@ -1,13 +1,13 @@
-From 5ad997775501a1172846bccdf56aad6c9c4bcb1f Mon Sep 17 00:00:00 2001
+From c3b0d1123cae5a895452d2a8d75e663e76cbf5bd Mon Sep 17 00:00:00 2001
From: Timo Tambet <ttambet@gmail.com>
Date: Sat, 25 Feb 2017 23:29:10 +0200
-Subject: [PATCH 1/4] Make bluetooth/colord/goa/kerberos/wacom optional
+Subject: [PATCH 1/5] Make bluetooth/colord/goa/kerberos/wacom optional
Upstream is not interested in any part of this patch:
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
-https://bugzilla.gnome.org/show_bug.cgi?id=697478
-https://bugzilla.gnome.org/show_bug.cgi?id=700145
+https://bugzilla.gnome.org/686840
+https://bugzilla.gnome.org/697478
+https://bugzilla.gnome.org/700145
Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
@@ -24,7 +24,7 @@ Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
8 files changed, 188 insertions(+), 50 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 12a8adee6..022635d34 100644
+index 11fc9fc..9566fb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,10 +120,6 @@ LIBGD_INIT([_view-common static])
@@ -243,7 +243,7 @@ index 12a8adee6..022635d34 100644
AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
else
diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 507cd2f54..2806c4555 100644
+index 507cd2f..2806c45 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
@@ -2,11 +2,9 @@ SUBDIRS= \
@@ -279,7 +279,7 @@ index 507cd2f54..2806c4555 100644
+
-include $(top_srcdir)/git.mk
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
-index ccb80172f..bde4cdf43 100644
+index ccb8017..bde4cdf 100644
--- a/panels/background/Makefile.am
+++ b/panels/background/Makefile.am
@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
@@ -305,7 +305,7 @@ index ccb80172f..bde4cdf43 100644
libbackground_la_SOURCES = \
diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
-index a33cee7f3..408359cba 100644
+index a33cee7..408359c 100644
--- a/panels/background/bg-pictures-source.c
+++ b/panels/background/bg-pictures-source.c
@@ -23,13 +23,17 @@
@@ -413,7 +413,7 @@ index a33cee7f3..408359cba 100644
priv->thumb_factory =
gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
-index db4e69a26..7677b58c4 100644
+index db4e69a..7677b58 100644
--- a/panels/power/cc-power-panel.c
+++ b/panels/power/cc-power-panel.c
@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self)
@@ -426,7 +426,7 @@ index db4e69a26..7677b58c4 100644
G_DBUS_PROXY_FLAGS_NONE,
NULL,
diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 26391486f..977dab1d6 100644
+index 2639148..977dab1 100644
--- a/panels/user-accounts/um-realm-manager.c
+++ b/panels/user-accounts/um-realm-manager.c
@@ -22,7 +22,9 @@
@@ -474,7 +474,7 @@ index 26391486f..977dab1d6 100644
void
diff --git a/shell/Makefile.am b/shell/Makefile.am
-index 6af3199d8..f3e49c7d9 100644
+index 6af3199..f3e49c7 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \
@@ -508,7 +508,7 @@ index 6af3199d8..f3e49c7d9 100644
$(gnome_control_center_LDADD) \
alt/libshell_alt.la
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 20ebb85d5..9104b45ba 100644
+index 20ebb85..9104b45 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
@@ -552,5 +552,5 @@ index 20ebb85d5..9104b45ba 100644
PANEL_TYPE("printers", cc_printers_panel_get_type ),
PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
--
-2.11.1
+2.10.2
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
similarity index 88%
rename from gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
index 8435c4ea60c..ac0ba455299 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.24.2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
-IUSE="+bluetooth +colord debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland"
+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
@@ -24,7 +24,7 @@ QA_CONFIGURE_OPTIONS=".*"
# udev could be made optional, only conditions gsd-device-panel
# (mouse, keyboards, touchscreen, etc)
# display panel requires colord
-# printer panel is not optional and not yet patched
+# 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
@@ -57,10 +57,10 @@ COMMON_DEPEND="
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34:0=
>=x11-libs/colord-gtk-0.1.24 )
-
- >=net-print/cups-1.4[dbus]
- >=net-fs/samba-4.0.0[client]
-
+ cups? (
+ >=net-print/cups-1.4[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:= )
@@ -92,6 +92,9 @@ RDEPEND="${COMMON_DEPEND}
|| ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
x11-themes/adwaita-icon-theme
colord? ( >=gnome-extra/gnome-color-manager-3 )
+ cups? (
+ app-admin/system-config-printer
+ net-print/cups-pk-helper )
input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
>=gnome-base/libgnomekbd-3
wayland? ( dev-libs/libinput )
@@ -129,11 +132,12 @@ DEPEND="${COMMON_DEPEND}
PATCHES=(
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- "${FILESDIR}"/${P}-optional.patch
- "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch
- "${FILESDIR}"/${P}-make-networkmanager-optional.patch
+ "${FILESDIR}"/${PV}-optional.patch
+ "${FILESDIR}"/${PV}-optional-wayland.patch
+ "${FILESDIR}"/${PV}-optional-networkmanager.patch
+ "${FILESDIR}"/${PV}-optional-cups.patch
# Fix some absolute paths to be appropriate for Gentoo
- "${FILESDIR}"/${P}-gentoo-paths.patch
+ "${FILESDIR}"/${PV}-gentoo-paths.patch
)
src_configure() {
@@ -143,6 +147,7 @@ src_configure() {
--enable-documentation \
$(use_enable bluetooth) \
$(use_enable colord color) \
+ $(use_enable cups) \
$(usex debug --enable-debug=yes ' ') \
$(use_enable gnome-online-accounts goa) \
$(use_enable ibus) \
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2017-03-08 12:11 Mart Raudsepp
0 siblings, 0 replies; 12+ messages in thread
From: Mart Raudsepp @ 2017-03-08 12:11 UTC (permalink / raw
To: gentoo-commits
commit: bb44e2b116d7e9e72759664e28fbed14ceb17a68
Author: Timo Tambet <ttambet <AT> gmail <DOT> com>
AuthorDate: Sun Feb 26 00:33:21 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Mar 8 12:11:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb44e2b1
gnome-base/gnome-control-center: bump to 3.23.91
Package-Manager: Portage-2.3.3, Repoman-2.3.1
gnome-base/gnome-control-center/Manifest | 1 +
...gnome-control-center-3.23.91-gentoo-paths.patch | 107 ++++
...nter-3.23.91-make-networkmanager-optional.patch | 69 +++
.../gnome-control-center-3.23.91-optional.patch | 556 +++++++++++++++++++++
.../gnome-control-center-3.23.91.ebuild | 158 ++++++
5 files changed, 891 insertions(+)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index d517a636010..d898426541d 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,3 @@
DIST gnome-control-center-3.20.2.tar.xz 7103716 SHA256 ae380d9cb7a2c6f7f336718606274cd87021cbbcdf828ec67b1a420a2605776e SHA512 d68bccf16e5e854db4cd8dbb7abb64c40ad1b7370a8c71ff5e8790ef6f2eeb19cd6b2d41f5506bb4b8d956f1d65f54afb26f5d2c4c87adde6561079f1477ff41 WHIRLPOOL ccb4a35211d2fa3adca34b2897a09687bfc854f5d89a512f80d43f46d822b15f586424983df5e746771e12df36115c5b9b7eee220582c4b7042d68e48c4ccf17
DIST gnome-control-center-3.22.1.tar.xz 7206136 SHA256 5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a SHA512 7c1bc17844f1b9ef2ca2b94fb36c3a64cbe88561cc2388e5fa26405dff73f3033dea49bf1aab8a85ee9d9680a8816913a0339855a5b09a8033cdaef5ebbb5c63 WHIRLPOOL 5f4cc4a6c75956a5bf05000d76a0b040b4fd9d6e0b416eaa2e12522f2dcde3506501022432ca8436e3435782ee537e560a30642d330ab66175f4ea44100f287b
+DIST gnome-control-center-3.23.91.tar.xz 7300216 SHA256 d8e0cfcfa43223b429aa22c7bbc47475f4763c312407a2e8256db81714c946ac SHA512 b795536afafbf87d2ecdde028651018e2c8129a89cd91077dd0a4cbeb96c2608ff7f401a2dfdf68f7b7fff4a7dfe0b95f2ebb4c6e3039d434d14850c0a76a8a0 WHIRLPOOL 1da42a542f34f6d6df626b9b1762871db5bc2679bdc9fc350ea6171f30e153a95e3c077164769a0bda2bd912af50bc695ebb25f717c127d1827316c69414d52f
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch
new file mode 100644
index 00000000000..8bd0169df46
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-gentoo-paths.patch
@@ -0,0 +1,107 @@
+From d646361528717fb0a9134394c62cc2d729b69d39 Mon Sep 17 00:00:00 2001
+From: Timo Tambet <ttambet@gmail.com>
+Date: Sun, 26 Feb 2017 01:04:05 +0200
+Subject: [PATCH 4/4] Fix some absolute paths to be appropriate for Gentoo
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
+[Updated for 3.23.90; printer panel /usr/share path went away with print testpage button]
+Signed-off-by: Timo Tambet <ttambet@gmail.com>
+---
+ panels/datetime/Makefile.am | 1 +
+ panels/datetime/test-endianess.c | 4 ++--
+ panels/datetime/test-timezone.c | 2 +-
+ panels/datetime/tz.h | 4 ++--
+ panels/printers/Makefile.am | 3 +++
+ panels/printers/pp-host.c | 2 +-
+ 6 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index a003f0bce..c43062e98 100644
+--- a/panels/datetime/Makefile.am
++++ b/panels/datetime/Makefile.am
+@@ -23,6 +23,7 @@ AM_CPPFLAGS = \
+ $(DATETIME_PANEL_CFLAGS) \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
+ $(NULL)
+
+ # test-timezone is still too noisy
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c
+index 06b26131b..eb52bb637 100644
+--- a/panels/datetime/test-endianess.c
++++ b/panels/datetime/test-endianess.c
+@@ -26,11 +26,11 @@ test_endianess (void)
+ GDir *dir;
+ const char *name;
+
+- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
+ if (dir == NULL) {
+ /* Try with /usr/share/locale/
+ * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+- dir = g_dir_open ("/usr/share/locale/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
+ if (dir == NULL) {
+ g_assert_not_reached ();
+ }
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c
+index db5c0307e..7ef5cef37 100644
+--- a/panels/datetime/test-timezone.c
++++ b/panels/datetime/test-timezone.c
+@@ -2,7 +2,7 @@
+ #include <gtk/gtk.h>
+ #include "cc-timezone-map.h"
+
+-#define TZ_DIR "/usr/share/zoneinfo/"
++#define TZ_DIR REALDATADIR "/zoneinfo/"
+
+ static GList *
+ get_timezone_list (GList *tzs,
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
+index 93905b3ab..1ba918c74 100644
+--- a/panels/datetime/tz.h
++++ b/panels/datetime/tz.h
+@@ -28,9 +28,9 @@
+ #include <glib.h>
+
+ #ifndef __sun
+-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
+ #else
+-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
++# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
+ #endif
+
+ typedef struct _TzDB TzDB;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 575cda38c..d5da0bf68 100644
+--- a/panels/printers/Makefile.am
++++ b/panels/printers/Makefile.am
+@@ -9,6 +9,9 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)/shell/ \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DTEST_SRCDIR=\""$(srcdir)/"\" \
++ -DREALDATADIR="\"$(datadir)\"" \
++ -DPREFIX="\"$(prefix)\"" \
++ -DLIBEXECDIR="\"$(libexecdir)\"" \
+ $(NULL)
+
+ noinst_LTLIBRARIES = libprinters.la
+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
+index 8af77e9a9..bb6df7880 100644
+--- a/panels/printers/pp-host.c
++++ b/panels/printers/pp-host.c
+@@ -267,7 +267,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
+ data->devices->devices = NULL;
+
+ argv = g_new0 (gchar *, 3);
+- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
++ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
+ argv[1] = g_strdup (priv->hostname);
+
+ /* Use SNMP to get printer's informations */
+--
+2.11.1
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch
new file mode 100644
index 00000000000..a871e4628cf
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-make-networkmanager-optional.patch
@@ -0,0 +1,69 @@
+From ef596aeb01aac8d85fd5861cff360b93cc16ef16 Mon Sep 17 00:00:00 2001
+From: Timo Tambet <ttambet@gmail.com>
+Date: Sun, 26 Feb 2017 00:37:06 +0200
+Subject: [PATCH 3/4] Make network panel optional
+
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+[Updated for 3.23.90]
+Signed-off-by: Timo Tambet <ttambet@gmail.com>
+---
+ configure.ac | 43 +++++++++++++++++++++++++------------------
+ 1 file changed, 25 insertions(+), 18 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index edbf657f4..248db379e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -275,24 +275,31 @@ linux_usb_error_or_warn()
+ esac
+ }
+
+-PKG_CHECK_MODULES(NETWORK_MANAGER,
+- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
+- libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
+- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
+- [have_networkmanager=yes], have_networkmanager=no)
+-if test "x$have_networkmanager" = xno ; then
+- linux_error_or_warn "*** Network panel will not be built (NetworkManager or ModemManager not found) ***"
+-else
+- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
+-fi
+-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
+-if test x${have_networkmanager} = xyes; then
+- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
+- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
+- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
+- AC_SUBST(NM_VPN_CONFIG_DIR)
+- AC_SUBST(NM_VPN_MODULE_DIR)
+-fi
++AC_ARG_ENABLE([networkmanager],
++ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]),
++ [],
++ [enable_networkmanager=auto])
++AS_IF([test "$enable_networkmanager" != "no"],
++ [
++ PKG_CHECK_MODULES(NETWORK_MANAGER,
++ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION
++ libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION
++ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION,
++ [have_networkmanager=yes], [have_networkmanager=no])
++
++ AS_IF([test "$have_networkmanager" = "no"],
++ [
++ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***])
++ ], [
++ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel])
++ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available])
++ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN
++ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager`
++ AC_SUBST([NM_VPN_CONFIG_DIR])
++ AC_SUBST([NM_VPN_MODULE_DIR])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"])
+
+ # Check for power panel
+ if test x${have_networkmanager} = xyes; then
+--
+2.11.1
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch
new file mode 100644
index 00000000000..f4bd22245d9
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.23.91-optional.patch
@@ -0,0 +1,556 @@
+From 5ad997775501a1172846bccdf56aad6c9c4bcb1f Mon Sep 17 00:00:00 2001
+From: Timo Tambet <ttambet@gmail.com>
+Date: Sat, 25 Feb 2017 23:29:10 +0200
+Subject: [PATCH 1/4] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Signed-off-by: Ole Reifschneider <tranquility@gentoo.org>
+Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>
+Signed-off-by: Alexandre Rostovtsev <tetromino@gentoo.org>
+---
+ configure.ac | 171 ++++++++++++++++++++++++--------
+ panels/Makefile.am | 10 +-
+ panels/background/Makefile.am | 8 +-
+ panels/background/bg-pictures-source.c | 20 ++++
+ panels/power/cc-power-panel.c | 2 +-
+ panels/user-accounts/um-realm-manager.c | 9 ++
+ shell/Makefile.am | 10 +-
+ shell/cc-panel-loader.c | 8 ++
+ 8 files changed, 188 insertions(+), 50 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 12a8adee6..022635d34 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -120,10 +120,6 @@ LIBGD_INIT([_view-common static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+- goa-1.0 >= $GOA_REQUIRED_VERSION
+- grilo-0.3 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -141,12 +137,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+- colord >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- libsoup-2.4
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_online_accounts=no
++background_online_accounts=
++AC_ARG_ENABLE([goa],
++ AS_HELP_STRING([--disable-goa],
++ [disable online accounts management panel]),
++ [],
++ [enable_goa=auto])
++
++AS_IF([test "$enable_goa" != "no"],
++ [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL],
++ [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION],
++ [
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++ build_online_accounts=yes
++ background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION"
++ ], [
++ AS_IF([test "$enable_goa" = "yes"],
++ [AC_MSG_ERROR([gnome-online-accounts support requested but not found])])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes")
++
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++ $background_goa_dependencies)
++
++build_color=no
++AC_ARG_ENABLE([color],
++ AS_HELP_STRING([--disable-color],
++ [disable color management panel]),
++ [],
++ [enable_color=auto])
++
++AS_IF([test "$enable_color" != "no"],
++ [PKG_CHECK_MODULES([COLOR_PANEL],
++ [
++ $COMMON_MODULES
++ colord >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++ ], [
++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++ build_color=yes
++ ], [
++ AS_IF([test "$enable_color" = "yes"],
++ [AC_MSG_ERROR([colord support requested but not found])])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes")
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+ smbclient)
+@@ -254,17 +296,27 @@ else
+ fi
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
+- [have_bluetooth=yes], have_bluetooth=no)
+-if test "x$have_bluetooth" = xyes ; then
+- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+-else
+- linux_usb_error_or_warn "*** Bluetooth panel will not be built"
+-fi
+-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
+-if test x${have_bluetooth} = xyes; then
+- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
+-fi
++have_bluetooth=no
++AC_ARG_ENABLE([bluetooth],
++ AS_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [],
++ [enable_bluetooth=auto])
++
++AS_IF([test "$enable_bluetooth" = "yes"],
++ [PKG_CHECK_MODULES([BLUETOOTH],
++ [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2],
++ [
++ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
++ have_bluetooth=yes
++ ],
++ [
++ have_bluetooth=no
++ AS_IF([test "$enable_bluetooth" = "yes"],
++ [AC_MSG_ERROR([bluetooth support requested but not found])])
++ ])
++ ])
++AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"])
+
+ # Check for CUPS 1.4 or newer
+ AC_PROG_SED
+@@ -319,32 +371,52 @@ fi
+ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
+
+ # Wacom
+-PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+- clutter-gtk-1.0
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION,
+- [have_wacom=yes], [have_wacom=no])
++AC_ARG_ENABLE([wacom],
++ AS_HELP_STRING([--disable-wacom],
++ [disable wacom management panel]),
++ [],
++ [enable_wacom=yes])
++AS_IF([test "x$enable_wacom" = "xyes"],
++ [PKG_CHECK_MODULES([WACOM_PANEL],
++ [
++ $COMMON_MODULES
++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++ clutter-gtk-1.0
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION
++ ], [
++ have_wacom=yes
++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ ], [
++ have_wacom=no
++ AC_MSG_ERROR([wacom support requested but not found])
++ ])
++ ])
+
+-if test "x$have_wacom" = xyes ; then
+- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
+-else
+- linux_usb_error_or_warn "*** Wacom panel will not be built"
+-fi
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos],
++ [disable kerberos support (default: enabled)]),
++ [],
++ [enable_kerberos=yes])
++
++AS_IF([test "$enable_kerberos" != "no"],
++ [
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++
++ AS_IF([test "$KRB5_CONFIG" = "no"],
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]))
++
++ AC_MSG_CHECKING([for krb5 libraries and flags])
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++ ])
+
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+@@ -576,11 +648,24 @@ if test "x$have_bluetooth" = "xyes"; then
+ else
+ AC_MSG_NOTICE([ Bluetooth panel disabled])
+ fi
++
++if test "x$build_color" = "xyes"; then
++ AC_MSG_NOTICE([** colord (Color panel)])
++else
++ AC_MSG_NOTICE([ Color panel disabled])
++fi
++
++
+ if test "x$have_cheese" = "xyes"; then
+ AC_MSG_NOTICE([** Cheese (Users panel webcam support)])
+ else
+ AC_MSG_NOTICE([ Users panel webcam support disabled])
+ fi
++if test "x$build_online_accounts" = "xyes"; then
++ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
++else
++ AC_MSG_NOTICE([ Online Accounts panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 507cd2f54..2806c4555 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+- online-accounts \
+ region \
+ info \
+ sound \
+@@ -19,6 +17,10 @@ SUBDIRS= \
+ sharing \
+ printers
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -31,4 +33,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb80172f..bde4cdf43 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ cc-background-chooser-dialog.c \
+ cc-background-chooser-dialog.h \
+- cc-background-grilo-miner.c \
+- cc-background-grilo-miner.h \
+ cc-background-item.c \
+ cc-background-item.h \
+ cc-background-xml.c \
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
+ bg-colors-source.c \
+ bg-colors-source.h
+
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES += \
++ cc-background-grilo-miner.c \
++ cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
+ libbackground_la_SOURCES = \
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index a33cee7f3..408359cba 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+
+ #include "bg-pictures-source.h"
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+ GCancellable *cancellable;
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ CcBackgroundGriloMiner *grl_miner;
++#endif
+
+ GnomeDesktopThumbnailFactory *thumb_factory;
+
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+ g_clear_object (&priv->cancellable);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ g_clear_object (&priv->grl_miner);
++#endif
+ g_clear_object (&priv->thumb_factory);
+
+ G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
+ gboolean needs_download;
+ gboolean retval = FALSE;
+ GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+ GrlMedia *media;
++#else
++ gpointer media = NULL;
++#endif
+
+ /* find png and jpeg files */
+ if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
+
+ read_file:
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+ if (media == NULL)
+ {
+ g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
+ return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+ GFile *file,
+@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+
+ return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ gboolean
+ bg_pictures_source_add (BgPicturesSource *bg_source,
+@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self,
+ return monitor;
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+ add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+ priv->cache_dir_monitor = monitor_path (self, cache_path);
+ g_free (cache_path);
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ priv->grl_miner = cc_background_grilo_miner_new ();
+ g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+ cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ priv->thumb_factory =
+ gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index db4e69a26..7677b58c4 100644
+--- a/panels/power/cc-power-panel.c
++++ b/panels/power/cc-power-panel.c
+@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self)
+ G_CALLBACK (wifi_switch_changed), self);
+ #endif
+
+-#ifdef HAVE_BLUETOOTH
++#ifdef BUILD_BLUETOOTH
+ priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 26391486f..977dab1d6 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -698,6 +700,7 @@ login_closure_free (gpointer data)
+ g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+ const gchar *realm,
+@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5,
+
+ return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+ GObject *object,
+ GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+ krb5_context k5 = NULL;
+ krb5_error_code code;
+@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+ if (k5)
+ krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++ _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index 6af3199d8..f3e49c7d9 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/common/libdevice.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+ $(top_builddir)/panels/keyboard/libkeyboard.la \
+ $(top_builddir)/panels/mouse/libmouse-properties.la \
+ $(top_builddir)/panels/notifications/libnotifications.la \
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
+ $(top_builddir)/panels/power/libpower.la \
+ $(top_builddir)/panels/privacy/libprivacy.la \
+ $(top_builddir)/panels/region/libregion.la \
+@@ -108,6 +106,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ gnome_control_center_alt_LDADD = \
+ $(gnome_control_center_LDADD) \
+ alt/libshell_alt.la
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 20ebb85d5..9104b45ba 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ extern GType cc_printers_panel_get_type (void);
+ extern GType cc_privacy_panel_get_type (void);
+@@ -75,7 +79,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+@@ -85,7 +91,9 @@ static struct {
+ PANEL_TYPE("network", cc_network_panel_get_type ),
+ #endif
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
++#endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
+ PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
+--
+2.11.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
new file mode 100644
index 00000000000..c7cd92d87db
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.23.91.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit autotools 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/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord debug +gnome-online-accounts +i18n 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
+# printer panel is not optional and not yet patched
+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.19.1[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 )
+
+ >=net-print/cups-1.4[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:= )
+ i18n? ( >=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 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+#
+# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474
+# Also we need newer driver versions to allow wacom and libinput drivers to
+# not collide
+RDEPEND="${COMMON_DEPEND}
+ || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
+ x11-themes/adwaita-icon-theme
+ colord? ( >=gnome-extra/gnome-color-manager-3 )
+ input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+ i18n? ( >=gnome-base/libgnomekbd-3 )
+ wayland? ( dev-libs/libinput )
+ !wayland? (
+ >=x11-drivers/xf86-input-libinput-0.19.0
+ input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) )
+
+ !<gnome-base/gdm-2.91.94
+ !<gnome-extra/gnome-color-manager-3.1.2
+ !gnome-extra/gnome-media[pulseaudio]
+ !<gnome-extra/gnome-media-2.32.0-r300
+ !<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+ x11-proto/xf86miscproto
+ x11-proto/kbproto
+
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+
+ gnome-base/gnome-common
+ sys-devel/autoconf-archive
+"
+# Needed for autoreconf
+# gnome-base/gnome-common
+# sys-devel/autoconf-archive
+
+src_prepare() {
+ # Make some panels and dependencies optional; requires eautoreconf
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ eapply "${FILESDIR}"/${P}-optional.patch
+ eapply "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch
+ eapply "${FILESDIR}"/${P}-make-networkmanager-optional.patch
+
+ # Fix some absolute paths to be appropriate for Gentoo
+ eapply "${FILESDIR}"/${P}-gentoo-paths.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-static \
+ --enable-documentation \
+ $(use_enable bluetooth) \
+ $(use_enable colord color) \
+ $(usex debug --enable-debug=yes ' ') \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable i18n ibus) \
+ $(use_enable kerberos) \
+ $(use_enable networkmanager) \
+ $(use_with v4l cheese) \
+ $(use_enable input_devices_wacom wacom) \
+ $(use_enable wayland)
+}
+
+src_install() {
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2016-11-01 11:18 Gilles Dartiguelongue
0 siblings, 0 replies; 12+ messages in thread
From: Gilles Dartiguelongue @ 2016-11-01 11:18 UTC (permalink / raw
To: gentoo-commits
commit: 18beb0f3f63430489428b9a400da801ba6af43b9
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 12:18:12 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Nov 1 11:18:16 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18beb0f3
gnome-base/gnome-control-center: cleanup old revisions
Package-Manager: portage-2.3.2
gnome-base/gnome-control-center/Manifest | 1 -
.../gnome-control-center-3.18.0-optional.patch | 537 ---------------------
.../gnome-control-center-3.18.2.ebuild | 155 ------
.../gnome-control-center-3.20.1.ebuild | 152 ------
4 files changed, 845 deletions(-)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 4507d9b..a2120d7 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,4 +1,3 @@
-DIST gnome-control-center-3.18.2.tar.xz 7113676 SHA256 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad SHA512 fc1f1075bfd9e86bf2cd38483050895cdbeec1574aa0313245692b2c33fed2db9b92bce634a298e7309f8fc5bf230a122768be9da04f81d0ab1f1feaeaad7754 WHIRLPOOL 00a433686b4d0cb83bcf1e2b63a795bb086241d80441a997c7164476b063e07f006ef0329c7c9a57f0344cf46bb8fb69916984169143d7c455df6927a650a1ce
DIST gnome-control-center-3.20.1.tar.xz 7160304 SHA256 ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed SHA512 f730c5edc1b3995765929efce3aa59602398003949ab97d215bd261c7705eb9277762aec2296af54d1762c62df2b383838645c6b82dd233f046af7dad06ba420 WHIRLPOOL 76562946f839c1850cbc2082e467e7527f7a4b28d78dd91ad201c7f40a44a87d421ad54054ed5d6b2edc1ce3c46799a17073e4fe410bae1e42e52b409aafb05d
DIST gnome-control-center-3.20.2.tar.xz 7103716 SHA256 ae380d9cb7a2c6f7f336718606274cd87021cbbcdf828ec67b1a420a2605776e SHA512 d68bccf16e5e854db4cd8dbb7abb64c40ad1b7370a8c71ff5e8790ef6f2eeb19cd6b2d41f5506bb4b8d956f1d65f54afb26f5d2c4c87adde6561079f1477ff41 WHIRLPOOL ccb4a35211d2fa3adca34b2897a09687bfc854f5d89a512f80d43f46d822b15f586424983df5e746771e12df36115c5b9b7eee220582c4b7042d68e48c4ccf17
DIST gnome-control-center-3.22.1.tar.xz 7206136 SHA256 5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a SHA512 7c1bc17844f1b9ef2ca2b94fb36c3a64cbe88561cc2388e5fa26405dff73f3033dea49bf1aab8a85ee9d9680a8816913a0339855a5b09a8033cdaef5ebbb5c63 WHIRLPOOL 5f4cc4a6c75956a5bf05000d76a0b040b4fd9d6e0b416eaa2e12522f2dcde3506501022432ca8436e3435782ee537e560a30642d330ab66175f4ea44100f287b
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
deleted file mode 100644
index 96b58f6..00000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
+++ /dev/null
@@ -1,537 +0,0 @@
-From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 25 Apr 2014 22:17:24 +0200
-Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
-
-Upstream is not interested in any part of this patch:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
-https://bugzilla.gnome.org/show_bug.cgi?id=697478
-https://bugzilla.gnome.org/show_bug.cgi?id=700145
-
-Dropped mm from this revision of the patch since it appears more
-complicated than ever to split it from the network panel.
-
-Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
----
- configure.ac | 157 ++++++++++++++++++++++++++------
- panels/Makefile.am | 10 +-
- panels/background/Makefile.am | 8 +-
- panels/background/bg-pictures-source.c | 20 ++++
- panels/user-accounts/um-realm-manager.c | 9 ++
- shell/Makefile.am | 10 +-
- shell/cc-panel-loader.c | 8 ++
- 7 files changed, 186 insertions(+), 36 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fe723d5..f882e23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-- goa-1.0 >= $GOA_REQUIRED_VERSION
-- grilo-0.2 >= $GRILO_REQUIRED_VERSION)
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+
-+build_online_accounts=false
-+background_online_accounts=
-+AC_ARG_ENABLE(goa,
-+ AC_HELP_STRING([--disable-goa],
-+ [disable online accounts management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_ONLINE_ACCOUNTS=yes ;;
-+ no) WANT_ONLINE_ACCOUNTS=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
-+ esac],
-+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
-+
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then
-+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
-+ build_online_accounts=true
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
-+fi
-+if test "x$build_online_accounts" = xtrue ; then
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
-+fi
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
-+
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
-+ $background_online_accounts)
-+
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-- colord >= $COLORD_REQUIRED_VERSION
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-- libsoup-2.4
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+
-+build_color=false
-+AC_ARG_ENABLE(color,
-+ AC_HELP_STRING([--disable-color],
-+ [disable color management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_COLOR=yes ;;
-+ no) WANT_COLOR=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
-+ esac],
-+ [WANT_COLOR=yes]) dnl Default value
-+
-+if test x$WANT_COLOR = xyes; then
-+
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-+ colord >= $COLORD_REQUIRED_VERSION
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+ libsoup-2.4
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+ build_color=true
-+fi
-+if test "x$build_color" = xtrue ; then
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
-+fi
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
-+AC_SUBST(COLOR_PANEL_CFLAGS)
-+AC_SUBST(COLOR_PANEL_LIBS)
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -206,8 +253,25 @@ fi
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
-
- # Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
-- [have_bluetooth=yes], have_bluetooth=no)
-+have_bluetooth=no
-+AC_ARG_ENABLE(bluetooth,
-+ AC_HELP_STRING([--disable-bluetooth],
-+ [disable bluetooth management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_BLUETOOTH=yes ;;
-+ no) WANT_BLUETOOTH=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
-+ esac],
-+ [WANT_BLUETOOTH=yes]) dnl Default value
-+
-+if test x$WANT_BLUETOOTH = xyes; then
-+ # Check for gnome-bluetooth
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
-+ [have_bluetooth=yes], have_bluetooth=no)
-+ have_bluetooth=yes
-+fi
-+
-+
- if test "x$have_bluetooth" = xyes ; then
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
- fi
-@@ -292,15 +356,27 @@ case $host_os in
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
- have_wacom=no
- else
-- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-- clutter-gtk-1.0
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
-- have_wacom=yes
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-+ AC_ARG_ENABLE(wacom,
-+ AC_HELP_STRING([--disable-wacom],
-+ [disable wacom management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_WACOM=yes ;;
-+ no) WANT_WACOM=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
-+ esac],
-+ [WANT_WACOM=yes]) dnl Default value
-+
-+ if test x$WANT_WACOM = xyes; then
-+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
-+ clutter-gtk-1.0
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
-+ have_wacom=yes
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-+ fi
- fi
- ;;
- *)
-@@ -310,16 +386,22 @@ esac
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
-
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
--
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
-+ [enable_kerberos=yes])
-+
-+if test x"$enable_kerberos" != x"no" ; then
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+ if test "$KRB5_CONFIG" = "no"; then
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-+ fi
-
-+ AC_MSG_CHECKING(for krb5 libraries and flags)
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
-+fi
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
-
-@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then
- else
- AC_MSG_NOTICE([ Bluetooth panel disabled])
- fi
-+if test "x$build_color" = "xtrue"; then
-+ AC_MSG_NOTICE([** colord (Color panel)])
-+else
-+ AC_MSG_NOTICE([ Color panel disabled])
-+fi
- if test "x$enable_cups" = "xyes"; then
- AC_MSG_NOTICE([** CUPS (Printers panel)])
- else
-@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then
- else
- AC_MSG_NOTICE([ Users panel webcam support disabled])
- fi
-+if test "x$build_online_accounts" = "xtrue"; then
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
-+else
-+ AC_MSG_NOTICE([ Online Accounts panel disabled])
-+fi
-+if test "x$build_wacom" = "xtrue"; then
-+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
-+else
-+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
-+fi
- if test "x$have_wacom" = "xyes"; then
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 9961c25..0c54622 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -2,11 +2,9 @@ SUBDIRS= \
- common \
- background \
- power \
-- color \
- display \
- mouse \
- notifications \
-- online-accounts \
- region \
- info \
- sound \
-@@ -18,6 +16,10 @@ SUBDIRS= \
- privacy \
- sharing
-
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
- SUBDIRS += bluetooth
- endif
-
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
-index ccb8017..bde4cdf 100644
---- a/panels/background/Makefile.am
-+++ b/panels/background/Makefile.am
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
- $(BUILT_SOURCES) \
- cc-background-chooser-dialog.c \
- cc-background-chooser-dialog.h \
-- cc-background-grilo-miner.c \
-- cc-background-grilo-miner.h \
- cc-background-item.c \
- cc-background-item.h \
- cc-background-xml.c \
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
- bg-colors-source.c \
- bg-colors-source.h
-
-+if BUILD_ONLINE_ACCOUNTS
-+libbackground_chooser_la_SOURCES += \
-+ cc-background-grilo-miner.c \
-+ cc-background-grilo-miner.h
-+endif
-+
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
-
- libbackground_la_SOURCES = \
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
-index c165fa3..78ef4a5 100644
---- a/panels/background/bg-pictures-source.c
-+++ b/panels/background/bg-pictures-source.c
-@@ -23,13 +23,17 @@
-
- #include "bg-pictures-source.h"
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include "cc-background-grilo-miner.h"
-+#endif
- #include "cc-background-item.h"
-
- #include <string.h>
- #include <cairo-gobject.h>
- #include <gio/gio.h>
-+#ifdef BUILD_ONLINE_ACCOUNTS
- #include <grilo.h>
-+#endif
- #include <libgnome-desktop/gnome-desktop-thumbnail.h>
- #include <gdesktop-enums.h>
-
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
- {
- GCancellable *cancellable;
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- CcBackgroundGriloMiner *grl_miner;
-+#endif
-
- GnomeDesktopThumbnailFactory *thumb_factory;
-
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
- g_clear_object (&priv->cancellable);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- g_clear_object (&priv->grl_miner);
-+#endif
- g_clear_object (&priv->thumb_factory);
-
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
- gboolean needs_download;
- gboolean retval = FALSE;
- GFile *pictures_dir, *cache_dir;
-+#ifdef BUILD_ONLINE_ACCOUNTS
- GrlMedia *media;
-+#else
-+ gpointer media = NULL;
-+#endif
-
- /* find png and jpeg files */
- if (!content_type)
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
-
- read_file:
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- media = g_object_get_data (G_OBJECT (file), "grl-media");
-+#endif
- if (media == NULL)
- {
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static gboolean
- add_single_file_from_media (BgPicturesSource *bg_source,
- GFile *file,
-@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
-
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- gboolean
- bg_pictures_source_add (BgPicturesSource *bg_source,
-@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor,
- }
- }
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- static void
- media_found_cb (BgPicturesSource *self, GrlMedia *media)
- {
-@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
- add_single_file_from_media (self, file, media);
- }
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- static void
- bg_pictures_source_init (BgPicturesSource *self)
-@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self)
-
- g_object_unref (dir);
-
-+#ifdef BUILD_ONLINE_ACCOUNTS
- priv->grl_miner = cc_background_grilo_miner_new ();
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
- cc_background_grilo_miner_start (priv->grl_miner);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
-
- priv->thumb_factory =
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 0849160..58d50a6 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -22,7 +22,9 @@
-
- #include "um-realm-manager.h"
-
-+#ifdef HAVE_KERBEROS
- #include <krb5/krb5.h>
-+#endif
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -696,6 +698,7 @@ login_closure_free (gpointer data)
- g_slice_free (LoginClosure, login);
- }
-
-+#ifdef HAVE_KERBEROS
- static krb5_error_code
- login_perform_kinit (krb5_context k5,
- const gchar *realm,
-@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5,
-
- return code;
- }
-+#endif /* HAVE_KERBEROS */
-
- static void
- kinit_thread_func (GSimpleAsyncResult *async,
- GObject *object,
- GCancellable *cancellable)
- {
-+#ifdef HAVE_KERBEROS
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
- krb5_context k5 = NULL;
- krb5_error_code code;
-@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
-
- if (k5)
- krb5_free_context (k5);
-+#else /* HAVE_KERBEROS */
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
-+ _("gnome-control-center was built without kerberos support"));
-+#endif
- }
-
- void
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index c0cb91a..0b820fd 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \
- $(top_builddir)/libgd/libgd.la \
- $(top_builddir)/panels/common/liblanguage.la \
- $(top_builddir)/panels/background/libbackground.la \
-- $(top_builddir)/panels/color/libcolor.la \
- $(top_builddir)/panels/datetime/libdate_time.la \
- $(top_builddir)/panels/display/libdisplay.la \
- $(top_builddir)/panels/info/libinfo.la \
- $(top_builddir)/panels/keyboard/libkeyboard.la \
- $(top_builddir)/panels/mouse/libmouse-properties.la \
- $(top_builddir)/panels/notifications/libnotifications.la \
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
- $(top_builddir)/panels/power/libpower.la \
- $(top_builddir)/panels/privacy/libprivacy.la \
- $(top_builddir)/panels/region/libregion.la \
-@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
- endif
-
-+if BUILD_COLOR
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
-+endif
-+
-+if BUILD_ONLINE_ACCOUNTS
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
-+endif
-+
- # Dbus service file
- servicefiledir = $(datadir)/dbus-1/services
- servicefile_in_files = org.gnome.ControlCenter.service.in
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 26576dc..8a92f95 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
- #ifdef BUILD_BLUETOOTH
- extern GType cc_bluetooth_panel_get_type (void);
- #endif /* BUILD_BLUETOOTH */
-+#ifdef BUILD_COLOR
- extern GType cc_color_panel_get_type (void);
-+#endif /* BUILD_COLOR */
- extern GType cc_date_time_panel_get_type (void);
- extern GType cc_display_panel_get_type (void);
- extern GType cc_info_panel_get_type (void);
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
- extern GType cc_network_panel_get_type (void);
- #endif /* BUILD_NETWORK */
- extern GType cc_notifications_panel_get_type (void);
-+#ifdef BUILD_ONLINE_ACCOUNTS
- extern GType cc_goa_panel_get_type (void);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
- extern GType cc_power_panel_get_type (void);
- #ifdef BUILD_PRINTERS
- extern GType cc_printers_panel_get_type (void);
-@@ -77,7 +81,9 @@ static struct {
- #ifdef BUILD_BLUETOOTH
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
- #endif
-+#ifdef BUILD_COLOR
- PANEL_TYPE("color", cc_color_panel_get_type ),
-+#endif
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
- PANEL_TYPE("display", cc_display_panel_get_type ),
- PANEL_TYPE("info", cc_info_panel_get_type ),
-@@ -87,7 +93,9 @@ static struct {
- PANEL_TYPE("network", cc_network_panel_get_type ),
- #endif
- PANEL_TYPE("notifications", cc_notifications_panel_get_type),
-+#ifdef BUILD_ONLINE_ACCOUNTS
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
-+#endif
- PANEL_TYPE("power", cc_power_panel_get_type ),
- #ifdef BUILD_PRINTERS
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
---
-2.1.2
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
deleted file mode 100644
index 8af818f..00000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 eutils gnome2
-
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~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)
-COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2[dbus]
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.15:3[X,wayland?]
- >=gnome-base/gsettings-desktop-schemas-3.15.4
- >=gnome-base/gnome-desktop-3.17.4:3=
- >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
-
- >=dev-libs/libpwquality-1.2.2
- dev-libs/libxml2:2
- gnome-base/libgtop:2=
- media-libs/fontconfig
-
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.97
- >=sys-power/upower-0.99:=
- >=x11-libs/libnotify-0.7.3:0=
-
- virtual/libgudev
- virtual/opengl
- x11-apps/xmodmap
- x11-libs/cairo
- x11-libs/libX11
- x11-libs/libXxf86misc
- >=x11-libs/libXi-1.2
-
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
- 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.4[dbus]
- || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
- gnome-online-accounts? (
- >=media-libs/grilo-0.2.12:0.2
- >=net-libs/gnome-online-accounts-3.15.1 )
- i18n? ( >=app-i18n/ibus-1.5.2 )
- kerberos? ( app-crypt/mit-krb5 )
- networkmanager? (
- >=gnome-extra/nm-applet-0.9.7.995
- >=net-misc/networkmanager-0.9.8[modemmanager]
- >=net-misc/modemmanager-0.7.990 )
- v4l? (
- media-libs/gstreamer:1.0
- 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 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- >=sys-apps/accountsservice-0.6.39
- x11-themes/gnome-icon-theme-symbolic
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
- i18n? ( >=gnome-base/libgnomekbd-3 )
-
- !<gnome-base/gdm-2.91.94
- !<gnome-extra/gnome-color-manager-3.1.2
- !gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # Make some panels and dependencies optional; requires eautoreconf
- # https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
- epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
- epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
- epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
- # Fix some absolute paths to be appropriate for Gentoo
- epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
- epatch_user
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable bluetooth) \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable i18n ibus) \
- $(use_enable kerberos) \
- $(use_enable networkmanager) \
- $(use_with v4l cheese) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_install() {
- gnome2_src_install completiondir="$(get_bashcompdir)"
-}
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild
deleted file mode 100644
index 970bb54..00000000
--- a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools 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/"
-
-LICENSE="GPL-2+"
-SLOT="2"
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~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)
-COMMON_DEPEND="
- >=dev-libs/glib-2.44.0:2[dbus]
- >=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.20.3:3[X,wayland?]
- >=gnome-base/gsettings-desktop-schemas-3.19.3
- >=gnome-base/gnome-desktop-3.19.93:3=
- >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
-
- >=dev-libs/libpwquality-1.2.2
- dev-libs/libxml2:2
- gnome-base/libgtop:2=
- media-libs/fontconfig
-
- >=media-libs/libcanberra-0.13[gtk3]
- >=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.97
- >=sys-power/upower-0.99:=
- >=x11-libs/libnotify-0.7.3:0=
-
- virtual/libgudev
- virtual/opengl
- 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.4[dbus]
- || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
- gnome-online-accounts? (
- >=media-libs/grilo-0.3.0:0.3=
- >=net-libs/gnome-online-accounts-3.15.1:= )
- i18n? ( >=app-i18n/ibus-1.5.2 )
- kerberos? ( app-crypt/mit-krb5 )
- networkmanager? (
- >=gnome-extra/nm-applet-0.9.7.995
- >=net-misc/networkmanager-0.9.8:=[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 )
-"
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
-# libgnomekbd needed only for gkbd-keyboard-display tool
-RDEPEND="${COMMON_DEPEND}
- || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) )
- >=sys-apps/accountsservice-0.6.39
- x11-themes/adwaita-icon-theme
- colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? (
- app-admin/system-config-printer
- net-print/cups-pk-helper )
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
- i18n? ( >=gnome-base/libgnomekbd-3 )
-
- !<gnome-base/gdm-2.91.94
- !<gnome-extra/gnome-color-manager-3.1.2
- !gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<net-wireless/gnome-bluetooth-3.3.2
-"
-# PDEPEND to avoid circular dependency
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
-
-DEPEND="${COMMON_DEPEND}
- x11-proto/xproto
- x11-proto/xf86miscproto
- x11-proto/kbproto
-
- dev-libs/libxml2:2
- dev-libs/libxslt
- >=dev-util/intltool-0.40.1
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- gnome-base/gnome-common
-"
-# Needed for autoreconf
-# gnome-base/gnome-common
-
-src_prepare() {
- # Make some panels and dependencies optional; requires eautoreconf
- # https://bugzilla.gnome.org/686840, 697478, 700145
- eapply "${FILESDIR}"/${PN}-3.20.0-optional.patch
- eapply "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
- eapply "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
- eapply "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
-
- # Fix some absolute paths to be appropriate for Gentoo
- eapply "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
-
- eautoreconf
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --disable-update-mimedb \
- --disable-static \
- --enable-documentation \
- $(use_enable bluetooth) \
- $(use_enable colord color) \
- $(use_enable cups) \
- $(usex debug --enable-debug=yes ' ') \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable i18n ibus) \
- $(use_enable kerberos) \
- $(use_enable networkmanager) \
- $(use_with v4l cheese) \
- $(use_enable input_devices_wacom wacom) \
- $(use_enable wayland)
-}
-
-src_install() {
- gnome2_src_install completiondir="$(get_bashcompdir)"
-}
^ permalink raw reply related [flat|nested] 12+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/
@ 2015-11-14 13:48 Pacho Ramos
0 siblings, 0 replies; 12+ messages in thread
From: Pacho Ramos @ 2015-11-14 13:48 UTC (permalink / raw
To: gentoo-commits
commit: b3c8ffbcaebc502b997908d2eba3ec9ace6cc642
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 14 12:29:39 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Nov 14 13:46:24 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3c8ffbc
gnome-base/gnome-control-center: Version bump
Package-Manager: portage-2.2.24
gnome-base/gnome-control-center/Manifest | 1 +
...ontrol-center-3.18.0-keep-panels-optional.patch | 39 ++
.../gnome-control-center-3.18.0-optional.patch | 537 +++++++++++++++++++++
.../gnome-control-center-3.18.2.ebuild | 155 ++++++
4 files changed, 732 insertions(+)
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index adb7ab6..82b8b25 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -2,3 +2,4 @@ DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 66ffaf4b1eb0a745a2928035b
DIST gnome-control-center-3.16.2-pyongyang.tar.xz 22808 SHA256 bc240beacc4f1e425d470ba21bdf19cd2cd547f232fa7d2a72299f75a7fb94d5 SHA512 04649782c34e72aa7169a62f2572d500533904ccd22782b660ec318996daa84d7d6c613c858080f94024d38778291cb1d03bd19497ab8a5724885730519c7c79 WHIRLPOOL 3518b9208da2763b084e0d294f00f8e8876f5d6bf38d3fa04af6766865a6e9d8ca8906a4da4d87344d238e6ea4e29c941a9f3a42b4c3e05cb58192839d134d9e
DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09 WHIRLPOOL e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60
DIST gnome-control-center-3.16.3.tar.xz 7045744 SHA256 ff9fe9c703be1d0e3afdef7b9ea331e436846ccd4d35090d501ba9510ee5a0c5 SHA512 cf6751ef237a1479b7973fa7481e68498949d58236d6c3a93375b91a96ea166e76da818b1beec50750e659f4dee803de06c76e8fa218aa2c87370aab4d478e79 WHIRLPOOL 79899c8d5c09130c86311835d9a549ea0e72f5fa89767b66d829db9ade9a729bc3c1b75b4b33bf3e076bb90c7bd34179d07592dd1acb4088ef46e1efac91a187
+DIST gnome-control-center-3.18.2.tar.xz 7113676 SHA256 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad SHA512 fc1f1075bfd9e86bf2cd38483050895cdbeec1574aa0313245692b2c33fed2db9b92bce634a298e7309f8fc5bf230a122768be9da04f81d0ab1f1feaeaad7754 WHIRLPOOL 00a433686b4d0cb83bcf1e2b63a795bb086241d80441a997c7164476b063e07f006ef0329c7c9a57f0344cf46bb8fb69916984169143d7c455df6927a650a1ce
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
new file mode 100644
index 0000000..23141e4
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
@@ -0,0 +1,39 @@
+From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 11 May 2015 23:59:03 +0200
+Subject: [PATCH 1/3] Optional gotta be optional
+
+---
+ configure.ac | 16 ----------------
+ 1 file changed, 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9713256..bc239de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -508,22 +508,6 @@ else
+ AC_MSG_RESULT(no)
+ fi
+
+-case $host_os in
+- linux*)
+- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+- # Nothing
+- echo "USB-related panels disabled on S390"
+- else
+- if test "x$have_networkmanager" != "xyes" -o \
+- "x$have_bluetooth" != "xyes" -o \
+- "x$enable_cups" != "xyes" -o \
+- "x$have_wacom" != "xyes"; then
+- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems])
+- fi
+- fi
+- ;;
+-esac
+-
+ AC_CONFIG_FILES([
+ Makefile
+ panels/Makefile
+--
+2.3.6
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
new file mode 100644
index 0000000..96b58f6
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
@@ -0,0 +1,537 @@
+From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 157 ++++++++++++++++++++++++++------
+ panels/Makefile.am | 10 +-
+ panels/background/Makefile.am | 8 +-
+ panels/background/bg-pictures-source.c | 20 ++++
+ panels/user-accounts/um-realm-manager.c | 9 ++
+ shell/Makefile.am | 10 +-
+ shell/cc-panel-loader.c | 8 ++
+ 7 files changed, 186 insertions(+), 36 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe723d5..f882e23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+- goa-1.0 >= $GOA_REQUIRED_VERSION
+- grilo-0.2 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++
++build_online_accounts=false
++background_online_accounts=
++AC_ARG_ENABLE(goa,
++ AC_HELP_STRING([--disable-goa],
++ [disable online accounts management panel]),
++ [case "${enableval}" in
++ yes) WANT_ONLINE_ACCOUNTS=yes ;;
++ no) WANT_ONLINE_ACCOUNTS=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
++ esac],
++ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
++
++if test x$WANT_ONLINE_ACCOUNTS = xyes; then
++ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++ build_online_accounts=true
++ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
++fi
++if test "x$build_online_accounts" = xtrue ; then
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++fi
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
++AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
++
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++ $background_online_accounts)
++
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+- colord >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- libsoup-2.4
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++build_color=false
++AC_ARG_ENABLE(color,
++ AC_HELP_STRING([--disable-color],
++ [disable color management panel]),
++ [case "${enableval}" in
++ yes) WANT_COLOR=yes ;;
++ no) WANT_COLOR=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++ esac],
++ [WANT_COLOR=yes]) dnl Default value
++
++if test x$WANT_COLOR = xyes; then
++
++ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
++ colord >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++ build_color=true
++fi
++if test "x$build_color" = xtrue ; then
++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
++fi
++AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
++AC_SUBST(COLOR_PANEL_CFLAGS)
++AC_SUBST(COLOR_PANEL_LIBS)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -206,8 +253,25 @@ fi
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
+- [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++ AC_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [case "${enableval}" in
++ yes) WANT_BLUETOOTH=yes ;;
++ no) WANT_BLUETOOTH=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++ esac],
++ [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++ # Check for gnome-bluetooth
++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
++ [have_bluetooth=yes], have_bluetooth=no)
++ have_bluetooth=yes
++fi
++
++
+ if test "x$have_bluetooth" = xyes ; then
+ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -292,15 +356,27 @@ case $host_os in
+ if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
+ have_wacom=no
+ else
+- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
+- gnome-settings-daemon >= $GSD_REQUIRED_VERSION
+- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+- clutter-gtk-1.0
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+- have_wacom=yes
+- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ AC_ARG_ENABLE(wacom,
++ AC_HELP_STRING([--disable-wacom],
++ [disable wacom management panel]),
++ [case "${enableval}" in
++ yes) WANT_WACOM=yes ;;
++ no) WANT_WACOM=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++ esac],
++ [WANT_WACOM=yes]) dnl Default value
++
++ if test x$WANT_WACOM = xyes; then
++ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION
++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
++ clutter-gtk-1.0
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
++ have_wacom=yes
++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ fi
+ fi
+ ;;
+ *)
+@@ -310,16 +386,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++ [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++ if test "$KRB5_CONFIG" = "no"; then
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++ fi
+
++ AC_MSG_CHECKING(for krb5 libraries and flags)
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+
+@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ else
+ AC_MSG_NOTICE([ Bluetooth panel disabled])
+ fi
++if test "x$build_color" = "xtrue"; then
++ AC_MSG_NOTICE([** colord (Color panel)])
++else
++ AC_MSG_NOTICE([ Color panel disabled])
++fi
+ if test "x$enable_cups" = "xyes"; then
+ AC_MSG_NOTICE([** CUPS (Printers panel)])
+ else
+@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then
+ else
+ AC_MSG_NOTICE([ Users panel webcam support disabled])
+ fi
++if test "x$build_online_accounts" = "xtrue"; then
++ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
++else
++ AC_MSG_NOTICE([ Online Accounts panel disabled])
++fi
++if test "x$build_wacom" = "xtrue"; then
++ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
++else
++ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+- online-accounts \
+ region \
+ info \
+ sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ privacy \
+ sharing
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb8017..bde4cdf 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ cc-background-chooser-dialog.c \
+ cc-background-chooser-dialog.h \
+- cc-background-grilo-miner.c \
+- cc-background-grilo-miner.h \
+ cc-background-item.c \
+ cc-background-item.h \
+ cc-background-xml.c \
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
+ bg-colors-source.c \
+ bg-colors-source.h
+
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES += \
++ cc-background-grilo-miner.c \
++ cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
+ libbackground_la_SOURCES = \
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index c165fa3..78ef4a5 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+
+ #include "bg-pictures-source.h"
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+ GCancellable *cancellable;
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ CcBackgroundGriloMiner *grl_miner;
++#endif
+
+ GnomeDesktopThumbnailFactory *thumb_factory;
+
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+ g_clear_object (&priv->cancellable);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ g_clear_object (&priv->grl_miner);
++#endif
+ g_clear_object (&priv->thumb_factory);
+
+ G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
+ gboolean needs_download;
+ gboolean retval = FALSE;
+ GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+ GrlMedia *media;
++#else
++ gpointer media = NULL;
++#endif
+
+ /* find png and jpeg files */
+ if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
+
+ read_file:
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+ if (media == NULL)
+ {
+ g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
+ return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+ GFile *file,
+@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+
+ return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ gboolean
+ bg_pictures_source_add (BgPicturesSource *bg_source,
+@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor,
+ }
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+ add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+
+ g_object_unref (dir);
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ priv->grl_miner = cc_background_grilo_miner_new ();
+ g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+ cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ priv->thumb_factory =
+ gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 0849160..58d50a6 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -696,6 +698,7 @@ login_closure_free (gpointer data)
+ g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+ const gchar *realm,
+@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5,
+
+ return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+ GObject *object,
+ GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+ krb5_context k5 = NULL;
+ krb5_error_code code;
+@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+ if (k5)
+ krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++ _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index c0cb91a..0b820fd 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/libgd/libgd.la \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+ $(top_builddir)/panels/keyboard/libkeyboard.la \
+ $(top_builddir)/panels/mouse/libmouse-properties.la \
+ $(top_builddir)/panels/notifications/libnotifications.la \
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
+ $(top_builddir)/panels/power/libpower.la \
+ $(top_builddir)/panels/privacy/libprivacy.la \
+ $(top_builddir)/panels/region/libregion.la \
+@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ # Dbus service file
+ servicefiledir = $(datadir)/dbus-1/services
+ servicefile_in_files = org.gnome.ControlCenter.service.in
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 26576dc..8a92f95 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+@@ -87,7 +93,9 @@ static struct {
+ PANEL_TYPE("network", cc_network_panel_get_type ),
+ #endif
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
++#endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
+ #ifdef BUILD_PRINTERS
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
+--
+2.1.2
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
new file mode 100644
index 0000000..c708358
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~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)
+COMMON_DEPEND="
+ >=dev-libs/glib-2.39.91:2[dbus]
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.15:3[X,wayland?]
+ >=gnome-base/gsettings-desktop-schemas-3.15.4
+ >=gnome-base/gnome-desktop-3.17.4:3=
+ >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+
+ >=dev-libs/libpwquality-1.2.2
+ dev-libs/libxml2:2
+ gnome-base/libgtop:2=
+ media-libs/fontconfig
+
+ >=media-libs/libcanberra-0.13[gtk3]
+ >=media-sound/pulseaudio-2[glib]
+ >=sys-auth/polkit-0.97
+ >=sys-power/upower-0.99:=
+ >=x11-libs/libnotify-0.7.3:0=
+
+ virtual/libgudev
+ virtual/opengl
+ x11-apps/xmodmap
+ x11-libs/cairo
+ x11-libs/libX11
+ x11-libs/libXxf86misc
+ >=x11-libs/libXi-1.2
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
+ 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.4[dbus]
+ || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+ gnome-online-accounts? (
+ >=media-libs/grilo-0.2.12:0.2
+ >=net-libs/gnome-online-accounts-3.15.1 )
+ i18n? ( >=app-i18n/ibus-1.5.2 )
+ kerberos? ( app-crypt/mit-krb5 )
+ networkmanager? (
+ >=gnome-extra/nm-applet-0.9.7.995
+ >=net-misc/networkmanager-0.9.8[modemmanager]
+ >=net-misc/modemmanager-0.7.990 )
+ v4l? (
+ media-libs/gstreamer:1.0
+ 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 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+# libgnomekbd needed only for gkbd-keyboard-display tool
+RDEPEND="${COMMON_DEPEND}
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+ >=sys-apps/accountsservice-0.6.39
+ x11-themes/gnome-icon-theme-symbolic
+ colord? ( >=gnome-extra/gnome-color-manager-3 )
+ cups? (
+ app-admin/system-config-printer
+ net-print/cups-pk-helper )
+ input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+ i18n? ( >=gnome-base/libgnomekbd-3 )
+
+ !<gnome-base/gdm-2.91.94
+ !<gnome-extra/gnome-color-manager-3.1.2
+ !gnome-extra/gnome-media[pulseaudio]
+ !<gnome-extra/gnome-media-2.32.0-r300
+ !<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+ x11-proto/xf86miscproto
+ x11-proto/kbproto
+
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+
+ gnome-base/gnome-common
+"
+# Needed for autoreconf
+# gnome-base/gnome-common
+
+src_prepare() {
+ # Make some panels and dependencies optional; requires eautoreconf
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
+
+ # Fix some absolute paths to be appropriate for Gentoo
+ epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-static \
+ --enable-documentation \
+ $(use_enable bluetooth) \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable i18n ibus) \
+ $(use_enable kerberos) \
+ $(use_enable networkmanager) \
+ $(use_with v4l cheese) \
+ $(use_enable input_devices_wacom wacom) \
+ $(use_enable wayland)
+}
+
+src_install() {
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+}
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-04-28 20:44 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-02 23:39 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/files/, gnome-base/gnome-control-center/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2024-04-28 20:44 Mart Raudsepp
2022-04-08 18:04 Matt Turner
2019-03-30 21:56 Mart Raudsepp
2019-03-14 21:52 Mart Raudsepp
2019-02-28 20:29 Mart Raudsepp
2019-02-24 9:51 Mart Raudsepp
2017-12-08 19:05 Michał Górny
2017-07-14 2:46 Mart Raudsepp
2017-03-08 12:11 Mart Raudsepp
2016-11-01 11:18 Gilles Dartiguelongue
2015-11-14 13:48 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox