tetromino 14/05/08 02:55:25
Added: cinnamon-control-center-2.2.5-nm-applet.patch
cinnamon-control-center-2.2.5-optional.patch
Log:
Cinnamon-2.x has its own control center
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
CF0ADD61)
Revision Changes Path
1.1
gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-nm-applet.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-nm-applet.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-nm-applet.patch?rev=1.1&content-type=text/plain
Index: cinnamon-control-center-2.2.5-nm-applet.patch
===================================================================
>From 17ebeb557335c297d4925e04a2f5b02a2410e48c Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <[email protected]>
Date: Wed, 7 May 2014 22:23:25 -0400
Subject: [PATCH] network: the new libnm-gtk wifi API was introduced in
0.9.8.0, not 0.9.9.0
See
https://git.gnome.org/browse/network-manager-applet/commit/?id=3a18b5a92f774680336758834f0b7f71968f469e
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index b900c53..d0271af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ CANBERRA_REQUIRED_VERSION=0.13
GDKPIXBUF_REQUIRED_VERSION=2.23.0
POLKIT_REQUIRED_VERSION=0.103
NETWORK_MANAGER_REQUIRED_VERSION=0.8.992
-LIBNM_GTK_REQUIRED_VERSION=0.9.9.0
+LIBNM_GTK_REQUIRED_VERSION=0.9.8.0
LIBNOTIFY_REQUIRED_VERSION=0.7.3
CINNAMON_DESKTOP_REQUIRED_VERSION=1.0.0
CLUTTER_REQUIRED_VERSION=1.11.3
@@ -139,7 +139,7 @@ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >=
$NETWORK_MANAGER_REQUIRED_V
libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION
libnm-gtk >= $NETWORK_MANAGER_REQUIRED_VERSION)
-# Check for libnm-gtk + 0.9.9.0
+# Check for libnm-gtk + 0.9.8.0
PKG_CHECK_MODULES(LIBNM_GTK_COMPAT, libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION
libnm-gtk >= $LIBNM_GTK_REQUIRED_VERSION,
[have_libnmgtk=yes], have_libnmgtk=no)
--
1.9.2
1.1
gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/cinnamon-control-center/files/cinnamon-control-center-2.2.5-optional.patch?rev=1.1&content-type=text/plain
Index: cinnamon-control-center-2.2.5-optional.patch
===================================================================
diff --git a/configure.ac b/configure.ac
index b900c53..0656e18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,6 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION)
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
libxklavier >= 5.1 libgnomekbdui >= 2.91.91)
@@ -182,15 +181,51 @@ if test x"$enable_cups" != x"no" ; then
AC_SUBST(CUPS_LIBS)
fi
+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 >= 0.1.8)
+ 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)
+
build_wacom=false
-PKG_CHECK_MODULES(WACOM_PANEL, [$COMMON_MODULES
+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
cinnamon-settings-daemon >= $CSD_REQUIRED_VERSION
xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
cinnamon-desktop
- gtk+-3.0 >= 3.8.0],
- [build_wacom="true" AC_DEFINE(HAVE_WACOM, 1, [Define if
wacom is being build])], [build_wacom="false"])
-
+ gtk+-3.0 >= 3.8.0])
+ build_wacom="true"
+ AC_DEFINE(HAVE_WACOM, 1, [Define if wacom is being build])]
+fi
AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue")
+AC_SUBST(WACOM_PANEL_CFLAGS)
+AC_SUBST(WACOM_PANEL_LIBS)
# This is a hard-dependency for the region and user-accounts panels
PKG_CHECK_MODULES(ISOCODES, iso-codes)
diff --git a/panels/Makefile.am b/panels/Makefile.am
index ff8ea98..4a7fba7 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
@@ -3,7 +3,6 @@ NULL =
enabled_panels = \
common \
screen \
- color \
display \
region \
universal-access \
@@ -15,6 +14,12 @@ enabled_panels = \
disabled_panels = $(NULL)
+if BUILD_COLOR
+enabled_panels += color
+else
+disabled_panels += color
+endif
+
if BUILD_WACOM
enabled_panels += wacom
else
