| 1 |
tetromino 11/10/29 06:53:44 |
| 2 |
|
| 3 |
Added: gnome-control-center-3.2.1-optional-colord.patch |
| 4 |
Log: |
| 5 |
Bump to 3.2.1 from the gnome overlay. Drop arm keyword (needs app-admin/apg and net-libs/gnome-online-accounts keyworded). Keywording bug will be opened once all of gnome-3.2 is in portage. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha71/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gnome-control-center-3.2.1-optional-colord.patch |
| 16 |
=================================================================== |
| 17 |
From b56f9e04f8822db34b030bea86d39c1d444a3cbb Mon Sep 17 00:00:00 2001 |
| 18 |
From: Alexandre Rostovtsev <tetromino@g.o> |
| 19 |
Date: Thu, 27 Oct 2011 23:55:23 -0400 |
| 20 |
Subject: [PATCH] Make colord optional. |
| 21 |
|
| 22 |
--- |
| 23 |
configure.ac | 19 ++++++++++++++++++- |
| 24 |
panels/Makefile.am | 5 ++++- |
| 25 |
2 files changed, 22 insertions(+), 2 deletions(-) |
| 26 |
|
| 27 |
diff --git a/configure.ac b/configure.ac |
| 28 |
index d552ac8..fd9062e 100644 |
| 29 |
--- a/configure.ac |
| 30 |
+++ b/configure.ac |
| 31 |
@@ -106,7 +106,24 @@ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) |
| 32 |
PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0) |
| 33 |
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 |
| 34 |
gnome-settings-daemon >= $GSD_REQUIRED_VERSION) |
| 35 |
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) |
| 36 |
+build_color=false |
| 37 |
+AC_ARG_ENABLE(color, |
| 38 |
+ AC_HELP_STRING([--disable-color], |
| 39 |
+ [disable color management panel]), |
| 40 |
+ [case "${enableval}" in |
| 41 |
+ yes) WANT_COLOR=yes ;; |
| 42 |
+ no) WANT_COLOR=no ;; |
| 43 |
+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; |
| 44 |
+ esac], |
| 45 |
+ [WANT_COLOR=yes]) dnl Default value |
| 46 |
+ |
| 47 |
+if test x$WANT_COLOR = xyes; then |
| 48 |
+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) |
| 49 |
+ build_color=true |
| 50 |
+fi |
| 51 |
+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") |
| 52 |
+AC_SUBST(COLOR_PANEL_CFLAGS) |
| 53 |
+AC_SUBST(COLOR_PANEL_LIBS) |
| 54 |
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES dbus-glib-1 |
| 55 |
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
| 56 |
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 |
| 57 |
diff --git a/panels/Makefile.am b/panels/Makefile.am |
| 58 |
index 566a2f8..a375e2f 100644 |
| 59 |
--- a/panels/Makefile.am |
| 60 |
+++ b/panels/Makefile.am |
| 61 |
@@ -3,7 +3,6 @@ SUBDIRS= \ |
| 62 |
background \ |
| 63 |
screen \ |
| 64 |
power \ |
| 65 |
- color \ |
| 66 |
display \ |
| 67 |
media \ |
| 68 |
mouse \ |
| 69 |
@@ -17,6 +16,10 @@ SUBDIRS= \ |
| 70 |
datetime \ |
| 71 |
wacom |
| 72 |
|
| 73 |
+if BUILD_COLOR |
| 74 |
+SUBDIRS += color |
| 75 |
+endif |
| 76 |
+ |
| 77 |
if BUILD_PRINTERS |
| 78 |
SUBDIRS += printers |
| 79 |
endif |
| 80 |
-- |
| 81 |
1.7.7.1 |
Archives