eva 15/06/09 15:41:36
Added:
gnome-control-center-3.16.0-make-wayland-optional.patch
gnome-control-center-3.16.0-keep-panels-optional.patch
gnome-control-center-3.16.0-networkmanager.patch
Log:
Version bump for Gnome 3.16. Clean up old revision.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
C6085806)
Revision Changes Path
1.1
gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch?rev=1.1&content-type=text/plain
Index: gnome-control-center-3.16.0-make-wayland-optional.patch
===================================================================
>From 95420469407223898564425b7622ac66e7ed70d5 Mon Sep 17 00:00:00 2001
From: Ole Reifschneider <tranquil...@gentoo.org>
Date: Sat, 25 Apr 2015 22:22:09 +0200
Subject: [PATCH] Make wayland support optional
---
configure.ac | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9713256..6b34962 100644
--- a/configure.ac
+++ b/configure.ac
@@ -231,12 +231,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, NetworkManager >=
$NETWORK_MANAGER_REQUIRED_VERSION
libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION
--
2.0.5
1.1
gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch?rev=1.1&content-type=text/plain
Index: gnome-control-center-3.16.0-keep-panels-optional.patch
===================================================================
>From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <e...@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
1.1
gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch?rev=1.1&content-type=text/plain
Index: gnome-control-center-3.16.0-networkmanager.patch
===================================================================
>From 763cc368b529c879050ffb98340779148e152b29 Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <e...@gentoo.org>
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
