From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
Date: Fri, 25 May 2012 08:22:10 +0000 (UTC) [thread overview]
Message-ID: <1337934070.9e4d2938457c35df893db2f499a7f8dc8c4e8c6b.tetromino@gentoo> (raw)
commit: 9e4d2938457c35df893db2f499a7f8dc8c4e8c6b
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri May 25 08:21:10 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri May 25 08:21:10 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9e4d2938
gnome-base/gnome-control-center: sync with gx86
Make gnone-online-accounts optional, requested by Matt Turner.
---
...enter-3.4.2-optional-bt-colord-goa-wacom.patch} | 110 ++++++++++++++++----
.../gnome-control-center-9999.ebuild | 11 +-
2 files changed, 95 insertions(+), 26 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch
similarity index 51%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch
rename to gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch
index 03248f7..31facc7 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.1-optional-bluetooth-colord-wacom.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch
@@ -1,19 +1,41 @@
-From f9d277788e7ac4338955a272eee043f6774421d9 Mon Sep 17 00:00:00 2001
+From 93d009037aa3321e2eea86ef2e70cde959c5a250 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 13 May 2012 19:53:13 -0400
-Subject: [PATCH] Make bluetooth, colord, wacom optional
+Subject: [PATCH] Make bluetooth, colord, gnome-online-accounts, wacom
+ optional
---
- configure.ac | 65 ++++++++++++++++++++++++++++++++++++++++++++-------
- panels/Makefile.am | 12 +++++++--
- 2 files changed, 65 insertions(+), 12 deletions(-)
+ configure.ac | 101 ++++++++++++++++++++++++++++++++++++++++++++++------
+ panels/Makefile.am | 17 +++++++--
+ 2 files changed, 103 insertions(+), 15 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 1046870..a40b792 100644
+index d496365..2d2d15e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -109,7 +109,24 @@ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
- PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
+@@ -106,10 +106,44 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES)
+ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
++build_online_accounts=false
++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)
++ build_online_accounts=true
++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(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
@@ -23,8 +45,8 @@ index 1046870..a40b792 100644
+ [disable color management panel]),
+ [case "${enableval}" in
+ yes) WANT_COLOR=yes ;;
-+ no) WANT_COLOR=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
++ no) WANT_COLOR=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
+ esac],
+ [WANT_COLOR=yes]) dnl Default value
+
@@ -38,7 +60,7 @@ index 1046870..a40b792 100644
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
-@@ -127,10 +144,26 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
+@@ -127,10 +161,26 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES
gnome-desktop-3.0
gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
$SYSTEMD)
@@ -53,8 +75,8 @@ index 1046870..a40b792 100644
+ [disable wacom management panel]),
+ [case "${enableval}" in
+ yes) WANT_WACOM=yes ;;
-+ no) WANT_WACOM=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
++ no) WANT_WACOM=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
+ esac],
+ [WANT_WACOM=yes]) dnl Default value
+
@@ -69,7 +91,7 @@ index 1046870..a40b792 100644
GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
AC_SUBST(GDESKTOP_PREFIX)
-@@ -146,10 +179,24 @@ if test "x$have_networkmanager" = xno ; then
+@@ -146,10 +196,24 @@ if test "x$have_networkmanager" = xno ; then
fi
AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
@@ -83,8 +105,8 @@ index 1046870..a40b792 100644
+ [disable bluetooth management panel]),
+ [case "${enableval}" in
+ yes) WANT_BLUETOOTH=yes ;;
-+ no) WANT_BLUETOOTH=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++ no) WANT_BLUETOOTH=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
+ esac],
+ [WANT_BLUETOOTH=yes]) dnl Default value
+
@@ -98,19 +120,61 @@ index 1046870..a40b792 100644
# Check for CUPS 1.4 or newer
AC_ARG_ENABLE([cups],
+@@ -423,11 +487,16 @@ if test "x$have_networkmanager" = "xyes"; then
+ else
+ AC_MSG_NOTICE([ Network panel disabled])
+ fi
+-if test "x$have_bluetooth" = "xyes"; then
++if test "x$build_bluetooth" = "xtrue"; then
+ AC_MSG_NOTICE([** gnome-bluetooth (Bluetooth panel)])
+ 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
+@@ -438,6 +507,11 @@ 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$with_libsocialweb" = "xyes"; then
+ AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
+ else
+@@ -448,4 +522,9 @@ if test "x$with_systemd" = "xyes"; then
+ else
+ AC_MSG_NOTICE([ Using ConsoleKit for session tracking])
+ 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
+ AC_MSG_NOTICE([End options])
diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 172dd06..09e7b00 100644
+index 172dd06..134b0c8 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
-@@ -3,7 +3,6 @@ SUBDIRS= \
+@@ -3,18 +3,19 @@ SUBDIRS= \
background \
screen \
power \
- color \
display \
mouse \
- online-accounts \
-@@ -13,8 +12,11 @@ SUBDIRS= \
+- online-accounts \
+ region \
+ info \
+ sound \
keyboard \
universal-access \
user-accounts \
@@ -124,10 +188,14 @@ index 172dd06..09e7b00 100644
if BUILD_PRINTERS
SUBDIRS += printers
-@@ -28,4 +30,8 @@ if BUILD_BLUETOOTH
+@@ -28,4 +29,12 @@ if BUILD_BLUETOOTH
SUBDIRS += bluetooth
endif
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+if BUILD_WACOM
+SUBDIRS += wacom
+endif
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 3b5cc19..cba9f00 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-3.2.2-r1.ebuild,v 1.2 2012/02/16 07:26:52 tetromino Exp $
+# $Header: $
EAPI="4"
GCONF_DEBUG="yes"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -44,7 +44,6 @@ COMMON_DEPEND="
gnome-base/gnome-menus:3
gnome-base/libgtop:2
media-libs/fontconfig
- net-libs/gnome-online-accounts
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-0.9.16[glib]
@@ -64,6 +63,7 @@ COMMON_DEPEND="
>=media-video/cheese-3.3.5 )
colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
+ gnome-online-accounts? ( net-libs/gnome-online-accounts )
networkmanager? (
>=gnome-extra/nm-applet-0.9.1.90
>=net-misc/networkmanager-0.8.997 )
@@ -114,6 +114,7 @@ pkg_setup() {
$(use_with cheese)
$(use_enable colord color)
$(use_enable cups)
+ $(use_enable gnome-online-accounts goa)
$(use_with socialweb libsocialweb)
$(use_enable systemd)
$(use_enable wacom)"
@@ -121,8 +122,8 @@ pkg_setup() {
}
src_prepare() {
- # Make colord plugin optional; requires eautoreconf
- epatch "${FILESDIR}/${PN}-3.4.1-optional-bluetooth-colord-wacom.patch"
+ # Make some panels optional; requires eautoreconf
+ epatch "${FILESDIR}/${PN}-3.4.2-optional-bt-colord-goa-wacom.patch"
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
next reply other threads:[~2012-05-25 8:22 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-25 8:22 Alexandre Restovtsev [this message]
-- strict thread matches above, loose matches on Subject: below --
2016-03-25 0:56 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ Ole Reifschneider
2015-10-02 12:50 Ole Reifschneider
2015-05-10 17:20 Gilles Dartiguelongue
2014-10-12 23:19 Gilles Dartiguelongue
2014-04-25 21:07 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2014-04-20 18:17 Gilles Dartiguelongue
2013-12-09 23:06 Gilles Dartiguelongue
2012-12-07 20:02 Arun Raghavan
2012-10-27 8:43 Priit Laes
2012-09-21 0:27 Nirbheek Chauhan
2012-09-10 16:13 Priit Laes
2012-09-10 5:08 Nirbheek Chauhan
2012-07-19 2:47 Alexandre Restovtsev
2012-03-26 8:20 Nirbheek Chauhan
2011-10-28 5:28 Alexandre Restovtsev
2011-07-12 0:28 Alexandre Restovtsev
2011-06-24 17:35 Alexandre Restovtsev
2011-03-29 8:35 Nirbheek Chauhan
2011-03-26 0:37 Nirbheek Chauhan
2011-02-28 7:48 Nirbheek Chauhan
2011-02-18 6:31 Nirbheek Chauhan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1337934070.9e4d2938457c35df893db2f499a7f8dc8c4e8c6b.tetromino@gentoo \
--to=tetromino@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox