From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 299E7138010 for ; Mon, 10 Sep 2012 05:09:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24C89E065A; Mon, 10 Sep 2012 05:08:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C75EBE065A for ; Mon, 10 Sep 2012 05:08:54 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D49A333C5D7 for ; Mon, 10 Sep 2012 05:08:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D97FBE543C for ; Mon, 10 Sep 2012 05:08:51 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <1347253667.1e28630272d23d1a4304883f5f3e127e13dc804b.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild gnome-base/gnome-control-center/gnome-control-center-9999.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 1e28630272d23d1a4304883f5f3e127e13dc804b X-VCS-Branch: master Date: Mon, 10 Sep 2012 05:08:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 46ab0e7b-9bcf-4270-b9fe-05fb1ab95db9 X-Archives-Hash: 13cb0c698094282088bd949d5d697a97 commit: 1e28630272d23d1a4304883f5f3e127e13dc804b Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Sep 9 10:03:12 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Sep 10 05:07:47 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1e286302 Add gnome-base/gnome-control-center-3.5.91 --- ...rol-center-3.5.91-fix-printer-panel-build.patch | 29 ++++ ...gnome-control-center-3.5.91-gentoo-paths.patch} | 67 +++------- ...nter-3.5.91-optional-bt-colord-goa-wacom.patch} | 151 ++++++++----------- ...9.ebuild => gnome-control-center-3.5.91.ebuild} | 53 +++++--- .../gnome-control-center-9999.ebuild | 53 +++++--- 5 files changed, 179 insertions(+), 174 deletions(-) diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch new file mode 100644 index 0000000..8fd19ee --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch @@ -0,0 +1,29 @@ +From 49797e8ae2753bacc74b86cd28be250ff93a62cc Mon Sep 17 00:00:00 2001 +From: Stefano Facchini +Date: Wed, 05 Sep 2012 17:34:19 +0000 +Subject: printers: Add missing definition of HAVE_CUPS_1_6 + +Commit 1532d7ef forgot to actually define HAVE_CUPS_1_6 +when building against CUPS 1.6 + +https://bugzilla.gnome.org/show_bug.cgi?id=683441 +--- +(limited to 'panels/printers/pp-maintenance-command.c') + +diff --git a/panels/printers/pp-maintenance-command.c b/panels/printers/pp-maintenance-command.c +index e2a831b..0966945 100644 +--- a/panels/printers/pp-maintenance-command.c ++++ b/panels/printers/pp-maintenance-command.c +@@ -25,6 +25,10 @@ + + #include "pp-utils.h" + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ + #ifndef HAVE_CUPS_1_6 + #define ippGetCount(attr) attr->num_values + #define ippGetValueTag(attr) attr->value_tag +-- +cgit v0.9.0.2 diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch similarity index 54% rename from gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch rename to gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch index 377312e..64b992d 100644 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch @@ -1,25 +1,10 @@ -From 44cd56e05a59fbdfcd3dc5b12c0c7ff178b230f1 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Wed, 18 Jul 2012 22:12:04 -0400 -Subject: [PATCH] Use Gentoo-appropriate absolute paths +Use Gentoo-appropriate absolute paths +Original author: Alexandre Rostovtsev --- - panels/common/Makefile.am | 2 +- - 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-new-printer-dialog.c | 2 +- - panels/user-accounts/Makefile.am | 2 +- - 9 files changed, 14 insertions(+), 10 deletions(-) - -diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am -index 6ed8e6c..2d7b1cc 100644 --- a/panels/common/Makefile.am +++ b/panels/common/Makefile.am -@@ -9,7 +9,7 @@ AM_CPPFLAGS = \ +@@ -9,7 +9,7 @@ $(LIBLANGUAGE_CFLAGS) \ -DDATADIR=\""$(datadir)"\" \ -DUIDIR=\""$(pkgdatadir)/ui"\" \ @@ -28,11 +13,9 @@ index 6ed8e6c..2d7b1cc 100644 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" -diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am -index 65ee027..9a97d24 100644 --- a/panels/datetime/Makefile.am +++ b/panels/datetime/Makefile.am -@@ -72,6 +72,7 @@ AM_CPPFLAGS = \ +@@ -72,6 +72,7 @@ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DDATADIR="\"$(uidir)\"" \ @@ -40,11 +23,9 @@ index 65ee027..9a97d24 100644 $(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) +@@ -38,11 +38,11 @@ return 0; } @@ -58,8 +39,6 @@ index 490df17..b43fc87 100644 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 @@ @@ -71,8 +50,6 @@ index 5667657..8483b87 100644 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 @@ @@ -87,11 +64,9 @@ index 71c1c23..ca4b3c4 100644 #endif typedef struct _TzDB TzDB; -diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am -index 0dade8c..3e5d7a8 100644 --- a/panels/printers/Makefile.am +++ b/panels/printers/Makefile.am -@@ -12,6 +12,9 @@ INCLUDES = \ +@@ -12,6 +12,9 @@ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DDATADIR="\"$(uidir)\"" \ @@ -101,11 +76,9 @@ index 0dade8c..3e5d7a8 100644 $(NULL) ccpanelsdir = $(PANELS_DIR) -diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c -index f5cf0d9..09f3e56 100644 --- a/panels/printers/cc-printers-panel.c +++ b/panels/printers/cc-printers-panel.c -@@ -2199,8 +2199,8 @@ test_page_cb (GtkButton *button, +@@ -2199,8 +2199,8 @@ if (printer_name) { @@ -116,24 +89,20 @@ index f5cf0d9..09f3e56 100644 NULL }; const gchar *testprint[] = { "%s/data/testprint", "%s/data/testprint.ps", -diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c -index eb134b5..d435a61 100644 ---- a/panels/printers/pp-new-printer-dialog.c -+++ b/panels/printers/pp-new-printer-dialog.c -@@ -1058,7 +1058,7 @@ search_address_cb (GtkToggleButton *togglebutton, - } +--- a/panels/printers/pp-host.c ++++ b/panels/printers/pp-host.c +@@ -251,7 +251,7 @@ + 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 */ -- command = g_strdup_printf ("/usr/lib/cups/backend/snmp %s", host); -+ command = g_strdup_printf (LIBEXECDIR "/cups/backend/snmp %s", host); - if (g_spawn_command_line_sync (command, &standard_output, NULL, &exit_status, &error)) - { - if (exit_status == 0 && standard_output) -diff --git a/panels/user-accounts/Makefile.am b/panels/user-accounts/Makefile.am -index 2907f01..4da4fee 100644 + /* Use SNMP to get printer's informations */ --- a/panels/user-accounts/Makefile.am +++ b/panels/user-accounts/Makefile.am -@@ -10,7 +10,7 @@ ccpanels_LTLIBRARIES = libuser-accounts.la +@@ -10,7 +10,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \ diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch similarity index 56% rename from gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch rename to gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch index 31facc7..aab50aa 100644 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-optional-bt-colord-goa-wacom.patch +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch @@ -1,23 +1,14 @@ -From 93d009037aa3321e2eea86ef2e70cde959c5a250 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 13 May 2012 19:53:13 -0400 -Subject: [PATCH] Make bluetooth, colord, gnome-online-accounts, wacom - optional +Make wacom, colord, goa optional ---- - configure.ac | 101 ++++++++++++++++++++++++++++++++++++++++++++++------ - panels/Makefile.am | 17 +++++++-- - 2 files changed, 103 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d496365..2d2d15e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -106,10 +106,44 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) +Original author: Alexandre Rostovtsev +--- configure.ac ++++ configure.ac +@@ -137,10 +137,48 @@ 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) +-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) ++ +build_online_accounts=false +AC_ARG_ENABLE(goa, + AC_HELP_STRING([--disable-goa], @@ -30,15 +21,17 @@ index d496365..2d2d15e 100644 + [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) ++ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) + 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) ++ +build_color=false +AC_ARG_ENABLE(color, + AC_HELP_STRING([--disable-color], @@ -57,49 +50,19 @@ index d496365..2d2d15e 100644 +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") +AC_SUBST(COLOR_PANEL_CFLAGS) +AC_SUBST(COLOR_PANEL_LIBS) ++ 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 +161,26 @@ PKG_CHECK_MODULES(USER_ACCOUNTS_PANEL, $COMMON_MODULES - gnome-desktop-3.0 - gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION - $SYSTEMD) --PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -- gnome-settings-daemon >= $GSD_REQUIRED_VERSION -- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ -+build_wacom=false -+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 -+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION -+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ build_wacom=true -+fi -+AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") - - GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas` - AC_SUBST(GDESKTOP_PREFIX) -@@ -146,10 +196,24 @@ if test "x$have_networkmanager" = xno ; then + PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES +@@ -174,10 +212,24 @@ fi AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) -# Check for gnome-bluetooth --PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.3.4, +-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5, - [have_bluetooth=yes], have_bluetooth=no) -AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes]) -+build_bluetooth=false ++have_bluetooth=false +AC_ARG_ENABLE(bluetooth, + AC_HELP_STRING([--disable-bluetooth], + [disable bluetooth management panel]), @@ -112,21 +75,44 @@ index d496365..2d2d15e 100644 + +if test x$WANT_BLUETOOTH = xyes; then + # Check for gnome-bluetooth -+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.3.4) -+ build_bluetooth=true ++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5) ++ have_bluetooth=true +fi + -+AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$build_bluetooth = xtrue]) ++AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue]) # 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)]) +@@ -237,11 +289,23 @@ + if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then + have_wacom=no + else +- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES +- gnome-settings-daemon >= $GSD_REQUIRED_VERSION +- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION +- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) +- have_wacom=yes ++ 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 ++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION ++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION ++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) ++ have_wacom=yes ++ fi + fi + ;; + *) +@@ -509,6 +573,11 @@ else AC_MSG_NOTICE([ Bluetooth panel disabled]) fi @@ -138,7 +124,7 @@ index d496365..2d2d15e 100644 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 +@@ -519,6 +588,11 @@ else AC_MSG_NOTICE([ Users panel webcam support disabled]) fi @@ -150,7 +136,7 @@ index d496365..2d2d15e 100644 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 +@@ -529,6 +603,11 @@ else AC_MSG_NOTICE([ Using ConsoleKit for session tracking]) fi @@ -159,12 +145,12 @@ index d496365..2d2d15e 100644 +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..134b0c8 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -3,18 +3,19 @@ SUBDIRS= \ + if test "x$have_wacom" = "xyes"; then + AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) + else +--- panels/Makefile.am ++++ panels/Makefile.am +@@ -3,10 +3,8 @@ background \ screen \ power \ @@ -175,20 +161,18 @@ index 172dd06..134b0c8 100644 region \ info \ sound \ - keyboard \ - universal-access \ +@@ -15,6 +13,10 @@ user-accounts \ -- datetime \ -- wacom -+ datetime -+ + datetime + +if BUILD_COLOR +SUBDIRS += color +endif - - if BUILD_PRINTERS - SUBDIRS += printers -@@ -28,4 +29,12 @@ if BUILD_BLUETOOTH ++ + if BUILD_WACOM + SUBDIRS += wacom + endif +@@ -31,4 +33,8 @@ SUBDIRS += bluetooth endif @@ -196,11 +180,4 @@ index 172dd06..134b0c8 100644 +SUBDIRS += online-accounts +endif + -+if BUILD_WACOM -+SUBDIRS += wacom -+endif -+ -include $(top_srcdir)/git.mk --- -1.7.8.6 - diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild similarity index 68% copy from gnome-base/gnome-control-center/gnome-control-center-9999.ebuild copy to gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild index f1f3e61..5a3fc80 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild @@ -16,37 +16,36 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="2" -IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom" +# +kerberos because USE=-kerberos fails to compile; see pkg_setup() +IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n +kerberos +networkmanager +socialweb systemd wacom" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" fi -# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released # # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb -# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325) # g-s-d[policykit] needed for bug #403527 COMMON_DEPEND=" >=dev-libs/glib-2.31.0:2 >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.3.5:3 - >=gnome-base/gsettings-desktop-schemas-3.3.0 - >=gnome-base/gnome-desktop-3.1.91:3 - >=gnome-base/gnome-settings-daemon-3.3.92[colord?,policykit] + >=x11-libs/gtk+-3.5.13:3 + >=gnome-base/gsettings-desktop-schemas-3.5.91 + >=gnome-base/gnome-desktop-3.5.91:3 + >=gnome-base/gnome-settings-daemon-3.5.2[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes + dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-0.9.16[glib] + >=media-sound/pulseaudio-2.0[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 @@ -54,23 +53,25 @@ COMMON_DEPEND=" x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc - >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 - bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 ) cheese? ( media-libs/gstreamer:0.10 + media-libs/clutter-gtk:1.0 >=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 ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) + i18n? ( >=app-i18n/ibus-1.4.99 ) + kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) - wacom? ( >=dev-libs/libwacom-0.3 - x11-libs/libXi )" + wacom? ( >=dev-libs/libwacom-0.5 + >=x11-libs/libXi-1.2 )" # =sys-devel/gettext-0.17 >=dev-util/intltool-0.40.1 virtual/pkgconfig - - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.10.1 + dev-libs/libxml2:2 cups? ( sys-apps/sed ) @@ -114,22 +113,38 @@ pkg_setup() { G2CONF="${G2CONF} --disable-update-mimedb --disable-static + --enable-documentation $(use_enable bluetooth) $(use_with cheese) $(use_enable colord color) $(use_enable cups) $(use_enable gnome-online-accounts goa) + $(use_enable i18n ibus) $(use_with socialweb libsocialweb) $(use_enable systemd) $(use_enable wacom)" + # Kerberos also has a dependency on realmd + # https://bugzilla.gnome.org/show_bug.cgi?id=677548 + # + # FIXME: Kerberos is a hard-dependency right now, and it's not + # straightforward to make it optional. + if ! use kerberos; then + G2CONF+=" KRB5_CONFIG=$(type -P true)" + fi DOCS="AUTHORS ChangeLog NEWS README TODO" } src_prepare() { + # Temporary fix for https://bugzilla.gnome.org/show_bug.cgi?id=683696 + sed -e "s/\(typedef.*UserResponseCallback.*\)/#ifndef URC\n#define URC\n\1\n\#endif/" \ + -i "${S}"/panels/printers/pp-{ppd-selection,options,jobs}-dialog.h || die + # Make some panels optional; requires eautoreconf - epatch "${FILESDIR}/${PN}-3.4.2-optional-bt-colord-goa-wacom.patch" + epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch" # Fix some absolute paths to be appropriate for Gentoo - epatch "${FILESDIR}/${PN}-3.4.2-gentoo-paths.patch" + epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch" + # This will be in the next release + epatch "${FILESDIR}/${P}-fix-printer-panel-build.patch" [[ ${PV} != 9999 ]] && eautoreconf gnome2_src_prepare 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 f1f3e61..5a3fc80 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild +++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild @@ -16,37 +16,36 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2" SLOT="2" -IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +networkmanager +socialweb systemd wacom" +# +kerberos because USE=-kerberos fails to compile; see pkg_setup() +IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n +kerberos +networkmanager +socialweb systemd wacom" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" fi -# XXX: gnome-desktop-2.91.5 is needed for upstream commit c67f7efb # XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released # # gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login -# Latest gsettings-desktop-schemas is neededfor commit 73f9bffb -# gnome-settings-daemon-3.1.4 is needed for power panel (commit 4f08a325) # g-s-d[policykit] needed for bug #403527 COMMON_DEPEND=" >=dev-libs/glib-2.31.0:2 >=x11-libs/gdk-pixbuf-2.23.0:2 - >=x11-libs/gtk+-3.3.5:3 - >=gnome-base/gsettings-desktop-schemas-3.3.0 - >=gnome-base/gnome-desktop-3.1.91:3 - >=gnome-base/gnome-settings-daemon-3.3.92[colord?,policykit] + >=x11-libs/gtk+-3.5.13:3 + >=gnome-base/gsettings-desktop-schemas-3.5.91 + >=gnome-base/gnome-desktop-3.5.91:3 + >=gnome-base/gnome-settings-daemon-3.5.2[colord?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes + dev-libs/libpwquality dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig >=media-libs/libcanberra-0.13[gtk3] - >=media-sound/pulseaudio-0.9.16[glib] + >=media-sound/pulseaudio-2.0[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 @@ -54,23 +53,25 @@ COMMON_DEPEND=" x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc - >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 - bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 ) + bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 ) cheese? ( media-libs/gstreamer:0.10 + media-libs/clutter-gtk:1.0 >=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 ) + gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 ) + i18n? ( >=app-i18n/ibus-1.4.99 ) + kerberos? ( virtual/krb5 ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) systemd? ( >=sys-apps/systemd-31 ) - wacom? ( >=dev-libs/libwacom-0.3 - x11-libs/libXi )" + wacom? ( >=dev-libs/libwacom-0.5 + >=x11-libs/libXi-1.2 )" # =sys-devel/gettext-0.17 >=dev-util/intltool-0.40.1 virtual/pkgconfig - - app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.10.1 + dev-libs/libxml2:2 cups? ( sys-apps/sed ) @@ -114,22 +113,38 @@ pkg_setup() { G2CONF="${G2CONF} --disable-update-mimedb --disable-static + --enable-documentation $(use_enable bluetooth) $(use_with cheese) $(use_enable colord color) $(use_enable cups) $(use_enable gnome-online-accounts goa) + $(use_enable i18n ibus) $(use_with socialweb libsocialweb) $(use_enable systemd) $(use_enable wacom)" + # Kerberos also has a dependency on realmd + # https://bugzilla.gnome.org/show_bug.cgi?id=677548 + # + # FIXME: Kerberos is a hard-dependency right now, and it's not + # straightforward to make it optional. + if ! use kerberos; then + G2CONF+=" KRB5_CONFIG=$(type -P true)" + fi DOCS="AUTHORS ChangeLog NEWS README TODO" } src_prepare() { + # Temporary fix for https://bugzilla.gnome.org/show_bug.cgi?id=683696 + sed -e "s/\(typedef.*UserResponseCallback.*\)/#ifndef URC\n#define URC\n\1\n\#endif/" \ + -i "${S}"/panels/printers/pp-{ppd-selection,options,jobs}-dialog.h || die + # Make some panels optional; requires eautoreconf - epatch "${FILESDIR}/${PN}-3.4.2-optional-bt-colord-goa-wacom.patch" + epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch" # Fix some absolute paths to be appropriate for Gentoo - epatch "${FILESDIR}/${PN}-3.4.2-gentoo-paths.patch" + epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch" + # This will be in the next release + epatch "${FILESDIR}/${P}-fix-printer-panel-build.patch" [[ ${PV} != 9999 ]] && eautoreconf gnome2_src_prepare