commit: 6e21b1e9ce69ff9ffafb40c44316aa5fb4dec328 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Mon May 11 22:46:04 2015 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Mon May 11 22:46:04 2015 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6e21b1e9
gnome-base/gnome-control-center: update ebuild * Fix dependency problem with wayland not requiring appropriate gtk+ backend * Make sure configure does not fail when disabling some panels * Allow disabling network panel (meaning networkmanager + modemmanager). .../gnome-control-center-3.10.2-gentoo-paths.patch | 119 --------------------- ...ontrol-center-3.16.0-keep-panels-optional.patch | 39 +++++++ ...nome-control-center-3.16.0-networkmanager.patch | 83 ++++++++++++++ .../gnome-control-center-3.16.1.ebuild | 26 ++--- .../gnome-control-center-9999.ebuild | 26 ++--- 5 files changed, 150 insertions(+), 143 deletions(-) diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch deleted file mode 100644 index 8ef4033..0000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <[email protected]> -Date: Sun, 8 Dec 2013 23:44:56 +0100 -Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo - ---- - 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 fc85592..133845f 100644 ---- a/panels/datetime/Makefile.am -+++ b/panels/datetime/Makefile.am -@@ -24,6 +24,7 @@ AM_CPPFLAGS = \ - $(DATETIME_PANEL_CFLAGS) \ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ - -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -+ -DREALDATADIR="\"$(datadir)\"" \ - $(NULL) - - noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone -diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c -index 490df17..b43fc87 100644 ---- a/panels/datetime/test-endianess.c -+++ b/panels/datetime/test-endianess.c -@@ -38,11 +38,11 @@ int main (int argc, char **argv) - return 0; - } - -- 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) { - return 1; - } -diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c -index 5667657..8483b87 100644 ---- a/panels/datetime/test-timezone.c -+++ b/panels/datetime/test-timezone.c -@@ -1,7 +1,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 71c1c23..ca4b3c4 100644 ---- a/panels/datetime/tz.h -+++ b/panels/datetime/tz.h -@@ -29,9 +29,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 63a33b4..12e2e45 100644 ---- a/panels/printers/Makefile.am -+++ b/panels/printers/Makefile.am -@@ -7,6 +7,9 @@ INCLUDES = \ - $(SMBCLIENT_CFLAGS) \ - -I$(top_srcdir)/shell/ \ - -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -+ -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 29b8173..24bcdf8 100644 ---- a/panels/printers/cc-printers-panel.c -+++ b/panels/printers/cc-printers-panel.c -@@ -2428,8 +2428,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 *testprint[] = { "%s/data/testprint", - "%s/data/testprint.ps", -diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c -index a994a61..51efe50 100644 ---- a/panels/printers/pp-host.c -+++ b/panels/printers/pp-host.c -@@ -251,7 +251,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 */ --- -1.8.3.2 - diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch new file mode 100644 index 0000000..c991dc6 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch @@ -0,0 +1,39 @@ +From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +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.16.0-networkmanager.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch new file mode 100644 index 0000000..8f704ac --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch @@ -0,0 +1,83 @@ +From 763cc368b529c879050ffb98340779148e152b29 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <[email protected]> +Date: Tue, 12 May 2015 00:32:11 +0200 +Subject: [PATCH 3/3] Make network panel optional + +--- + configure.ac | 60 ++++++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 34 insertions(+), 26 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7816942..13e8f45 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -247,32 +247,40 @@ AS_IF([test "$enable_wayland" != "no"], + PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) + ]) + +-PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION +- libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION +- libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION +- libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION +- libnm-gtk >= $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 +- +-# Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769 +-PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, libnm-util >= 0.9.9.0, nm_unstable=yes, nm_unstable=no) +-if test x$nm_unstable = xyes; then +- AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available]) +-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, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION ++ libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION ++ libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION ++ libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION ++ libnm-gtk >= $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]) ++ ]) ++ ++ # Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769 ++ PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, [libnm-util >= 0.9.9.0], ++ [ ++ nm_unstable=yes ++ AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available]) ++ ], ++ [nm_unstable=no]) ++ ]) ++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"]) + AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) + + # Check for gnome-bluetooth +-- +2.3.6 + diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild index 2ea4abf..d3792a2 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild @@ -13,7 +13,7 @@ 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 v4l" +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 @@ -24,13 +24,13 @@ QA_CONFIGURE_OPTIONS=".*" # kerberos unfortunately means mit-krb5; build fails with heimdal -# FIXME: modemmanager is not optional -# networkmanager is not optional +# 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 + >=x11-libs/gtk+-3.15:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/gnome-desktop-3.11.3:3= >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] @@ -46,10 +46,6 @@ COMMON_DEPEND=" >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= - >=gnome-extra/nm-applet-0.9.7.995 - >=net-misc/networkmanager-0.9.8[modemmanager] - >=net-misc/modemmanager-0.7.990 - virtual/libgudev virtual/opengl x11-apps/xmodmap @@ -68,9 +64,13 @@ COMMON_DEPEND=" || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.2.6:0.2 - >=net-libs/gnome-online-accounts-3.9.90 ) + >=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 @@ -123,9 +123,9 @@ src_prepare() { # Make some panels and dependencies optional; requires eautoreconf # https://bugzilla.gnome.org/686840, 697478, 700145 epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch - - # Make wayland support optional epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch + epatch "${FILESDIR}"/${PN}-3.16.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 @@ -147,8 +147,10 @@ src_configure() { $(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 input_devices_wacom wacom) \ + $(use_enable wayland) } src_install() { diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild index d3950c4..a6f387f 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild @@ -16,7 +16,7 @@ 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 v4l" +IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else @@ -31,13 +31,13 @@ QA_CONFIGURE_OPTIONS=".*" # kerberos unfortunately means mit-krb5; build fails with heimdal -# FIXME: modemmanager is not optional -# networkmanager is not optional +# 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 + >=x11-libs/gtk+-3.15:3[X,wayland?] >=gnome-base/gsettings-desktop-schemas-3.15.4 >=gnome-base/gnome-desktop-3.11.3:3= >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] @@ -53,10 +53,6 @@ COMMON_DEPEND=" >=sys-power/upower-0.99:= >=x11-libs/libnotify-0.7.3:0= - >=gnome-extra/nm-applet-0.9.7.995 - >=net-misc/networkmanager-0.9.8[modemmanager] - >=net-misc/modemmanager-0.7.990 - virtual/libgudev virtual/opengl x11-apps/xmodmap @@ -75,9 +71,13 @@ COMMON_DEPEND=" || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) gnome-online-accounts? ( >=media-libs/grilo-0.2.6:0.2 - >=net-libs/gnome-online-accounts-3.9.90 ) + >=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 @@ -130,9 +130,9 @@ src_prepare() { # Make some panels and dependencies optional; requires eautoreconf # https://bugzilla.gnome.org/686840, 697478, 700145 epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch - - # Make wayland support optional epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch + epatch "${FILESDIR}"/${PN}-3.16.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 @@ -154,8 +154,10 @@ src_configure() { $(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 input_devices_wacom wacom) \ + $(use_enable wayland) } src_install() {
