* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-02-18 6:31 Nirbheek Chauhan
0 siblings, 0 replies; 23+ messages in thread
From: Nirbheek Chauhan @ 2011-02-18 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 72e71c02acade703dcfa3561f091aa23407bd7ae
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 18 06:21:19 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb 18 06:23:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=72e71c02
gnome-base/gnome-control-center: fix bug 353684, remove old patch
---
...-center-2.91.5-fix-keyboard-infinite-loop.patch | 43 ------------
...ol-center-2.91.6-port-to-gtkstyle-context.patch | 68 ++++++++++++++++++++
...build => gnome-control-center-2.91.6-r1.ebuild} | 7 ++-
3 files changed, 73 insertions(+), 45 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.5-fix-keyboard-infinite-loop.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.5-fix-keyboard-infinite-loop.patch
deleted file mode 100644
index 5faf099..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.5-fix-keyboard-infinite-loop.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1423f9c7bd1d8dc65fd6e78c939d1489d27fc015 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Wed, 19 Jan 2011 14:51:34 +0000
-Subject: [PATCH] region: Fix infinite loop when selecting Xkb options
-
-Spotted by Arun Raghavan <arun.raghavan@collabora.co.uk>
-
-https://bugzilla.gnome.org/show_bug.cgi?id=639951
----
- panels/region/gnome-region-panel-xkbot.c | 18 ++++++++++--------
- 1 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/panels/region/gnome-region-panel-xkbot.c b/panels/region/gnome-region-panel-xkbot.c
-index 333aa18..f43be42 100644
---- a/panels/region/gnome-region-panel-xkbot.c
-+++ b/panels/region/gnome-region-panel-xkbot.c
-@@ -111,14 +111,16 @@ static void
- xkb_options_select (gchar * optionname)
- {
- gboolean already_selected = FALSE;
-- gchar **options_list = xkb_options_get_selected_list ();
-- if (options_list != NULL) {
-- gchar **option = options_list;
-- while (*option != NULL)
-- if (!strcmp (*option, optionname)) {
-- already_selected = TRUE;
-- break;
-- }
-+ gchar **options_list;
-+ guint i;
-+
-+ options_list = xkb_options_get_selected_list ();
-+ for (i = 0; options_list != NULL && options_list[i] != NULL; i++) {
-+ gchar *option = options_list[i];
-+ if (!strcmp (option, optionname)) {
-+ already_selected = TRUE;
-+ break;
-+ }
- }
-
- if (!already_selected) {
---
-1.7.3.2
\ No newline at end of file
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.6-port-to-gtkstyle-context.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.6-port-to-gtkstyle-context.patch
new file mode 100644
index 0000000..86509e2
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.6-port-to-gtkstyle-context.patch
@@ -0,0 +1,68 @@
+From 7da8390241cca72035f81f1809226ea4eee6060b Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Fri, 04 Feb 2011 20:50:29 +0000
+Subject: um-editable-entry: port to GtkStyleContext
+
+---
+diff --git a/panels/user-accounts/um-editable-entry.c b/panels/user-accounts/um-editable-entry.c
+index 2a18323..ca956e1 100644
+--- a/panels/user-accounts/um-editable-entry.c
++++ b/panels/user-accounts/um-editable-entry.c
+@@ -116,12 +116,11 @@ um_editable_entry_get_editable (UmEditableEntry *e)
+
+ static void
+ update_entry_font (GtkWidget *widget,
+- GtkStyle *previous_style,
+ UmEditableEntry *e)
+ {
+ UmEditableEntryPrivate *priv = e->priv;
+ PangoFontDescription *desc;
+- GtkStyle *style;
++ GtkStyleContext *style;
+ gint size;
+
+ if (!priv->weight_set && !priv->scale_set)
+@@ -129,17 +128,19 @@ update_entry_font (GtkWidget *widget,
+
+ g_signal_handlers_block_by_func (widget, update_entry_font, e);
+
+- gtk_widget_modify_font (widget, NULL);
++ gtk_widget_override_font (widget, NULL);
++
++ style = gtk_widget_get_style_context (widget);
++ desc = pango_font_description_copy
++ (gtk_style_context_get_font (style, gtk_widget_get_state_flags (widget)));
+
+- style = gtk_widget_get_style (widget);
+- desc = pango_font_description_copy (style->font_desc);
+ if (priv->weight_set)
+ pango_font_description_set_weight (desc, priv->weight);
+ if (priv->scale_set) {
+ size = pango_font_description_get_size (desc);
+ pango_font_description_set_size (desc, priv->scale * size);
+ }
+- gtk_widget_modify_font (widget, desc);
++ gtk_widget_override_font (widget, desc);
+
+ pango_font_description_free (desc);
+
+@@ -172,7 +173,7 @@ update_fonts (UmEditableEntry *e)
+
+ pango_attr_list_unref (attrs);
+
+- update_entry_font ((GtkWidget *)priv->entry, NULL, e);
++ update_entry_font ((GtkWidget *)priv->entry, e);
+ }
+
+ void
+@@ -469,7 +470,7 @@ um_editable_entry_init (UmEditableEntry *e)
+ g_signal_connect (priv->entry, "activate", G_CALLBACK (entry_activated), e);
+ g_signal_connect (priv->entry, "focus-out-event", G_CALLBACK (entry_focus_out), e);
+ g_signal_connect (priv->entry, "key-press-event", G_CALLBACK (entry_key_press), e);
+- g_signal_connect (priv->entry, "style-set", G_CALLBACK (update_entry_font), e);
++ g_signal_connect (priv->entry, "style-updated", G_CALLBACK (update_entry_font), e);
+ g_signal_connect (gtk_bin_get_child (GTK_BIN (priv->button)), "size-allocate", G_CALLBACK (update_button_padding), e);
+
+ gtk_container_add (GTK_CONTAINER (e), (GtkWidget*)priv->notebook);
+--
+cgit v0.8.3.4
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild
similarity index 93%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild
index 82fd020..fd38fac 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit gnome2
+inherit eutils gnome2
DESCRIPTION="The gnome2 Desktop configuration tool"
HOMEPAGE="http://www.gnome.org/"
@@ -78,11 +78,14 @@ DEPEND="${COMMON_DEPEND}
# Needed for autoreconf
# gnome-base/gnome-common
-pkg_setup() {
+src_prepare() {
# TODO: libsocialweb
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
--disable-schemas-install"
DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+ # Taken from upstream, remove for next release, bug 353684
+ epatch "${FILESDIR}/${P}-port-to-gtkstyle-context.patch"
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-02-28 7:48 Nirbheek Chauhan
0 siblings, 0 replies; 23+ messages in thread
From: Nirbheek Chauhan @ 2011-02-28 7:48 UTC (permalink / raw
To: gentoo-commits
commit: 9ab32e0c1e4a93ad6a4a5644c014028a48605d85
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 07:27:16 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 07:34:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9ab32e0c
gnome-base/gnome-control-center: fix bug 356729 and bug 356715
* Reported by Alexandre Rostovtsev
---
...ome-control-center-fix-networkmanager-api.patch | 285 ++++++++++++++++++++
.../gnome-control-center-2.91.90.ebuild | 5 +
.../gnome-control-center-9999.ebuild | 5 +
3 files changed, 295 insertions(+), 0 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-fix-networkmanager-api.patch b/gnome-base/gnome-control-center/files/gnome-control-center-fix-networkmanager-api.patch
new file mode 100644
index 0000000..e73b16d
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-fix-networkmanager-api.patch
@@ -0,0 +1,285 @@
+From ab15c3ce94424c25f4afdb13a8c0acd4dc6351ea Mon Sep 17 00:00:00 2001
+From: Daniel Trebbien <dtrebbien@gmail.com>
+Date: Sun, 27 Feb 2011 11:10:10 -0500
+Subject: [PATCH 1/1] Use the NetworkManager modem capabilities API.
+
+A recent change to the NetworkManager API combined the
+NM_DEVICE_TYPE_GSM and NM_DEVICE_TYPE_CDMA types as
+NM_DEVICE_TYPE_MODEM and provided an alternative API for accessing the
+modem device's capabilities (including GSM_UMTS and CDMA_EVDO).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=643390
+---
+ panels/network/cc-network-panel.c | 76 ++++++++++++++++++++-----------------
+ panels/network/panel-common.c | 51 ++++++++++++++++---------
+ panels/network/panel-common.h | 7 ++-
+ 3 files changed, 78 insertions(+), 56 deletions(-)
+
+diff --git a/panels/network/cc-network-panel.c b/panels/network/cc-network-panel.c
+index 9148df7..ba37581 100644
+--- a/panels/network/cc-network-panel.c
++++ b/panels/network/cc-network-panel.c
+@@ -28,6 +28,7 @@
+ #include "nm-client.h"
+ #include "nm-device.h"
+ #include "nm-device-ethernet.h"
++#include "nm-device-modem.h"
+ #include "nm-device-wifi.h"
+ #include "nm-utils.h"
+ #include "nm-active-connection.h"
+@@ -376,8 +377,7 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
+
+ /* do we have to get additonal data from ModemManager */
+ type = nm_device_get_device_type (device);
+- if (type == NM_DEVICE_TYPE_GSM ||
+- type == NM_DEVICE_TYPE_CDMA) {
++ if (type == NM_DEVICE_TYPE_MODEM) {
+ g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM,
+ G_DBUS_PROXY_FLAGS_NONE,
+ NULL,
+@@ -400,15 +400,15 @@ panel_add_device (CcNetworkPanel *panel, NMDevice *device)
+
+ /* make title a bit bigger */
+ title = g_strdup_printf ("<span size=\"large\">%s</span>",
+- panel_device_type_to_localized_string (nm_device_get_device_type (device)));
++ panel_device_to_localized_string (device));
+
+ liststore_devices = GTK_LIST_STORE (gtk_builder_get_object (priv->builder,
+ "liststore_devices"));
+ gtk_list_store_append (liststore_devices, &iter);
+ gtk_list_store_set (liststore_devices,
+ &iter,
+- PANEL_DEVICES_COLUMN_ICON, panel_device_type_to_icon_name (nm_device_get_device_type (device)),
+- PANEL_DEVICES_COLUMN_SORT, panel_device_type_to_sortable_string (nm_device_get_device_type (device)),
++ PANEL_DEVICES_COLUMN_ICON, panel_device_to_icon_name (device),
++ PANEL_DEVICES_COLUMN_SORT, panel_device_to_sortable_string (device),
+ PANEL_DEVICES_COLUMN_TITLE, title,
+ PANEL_DEVICES_COLUMN_ID, nm_device_get_udi (device),
+ PANEL_DEVICES_COLUMN_TOOLTIP, NULL,
+@@ -729,14 +729,14 @@ nm_device_refresh_item_ui (CcNetworkPanel *panel, NMDevice *device)
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+ "image_device"));
+ gtk_image_set_from_icon_name (GTK_IMAGE (widget),
+- panel_device_type_to_icon_name (type),
++ panel_device_to_icon_name (device),
+ GTK_ICON_SIZE_DIALOG);
+
+ /* set device kind */
+ widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
+ "label_device"));
+ gtk_label_set_label (GTK_LABEL (widget),
+- panel_device_type_to_localized_string (type));
++ panel_device_to_localized_string (device));
+
+
+ /* set device state */
+@@ -754,10 +754,13 @@ nm_device_refresh_item_ui (CcNetworkPanel *panel, NMDevice *device)
+ } else if (type == NM_DEVICE_TYPE_WIFI) {
+ gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 1);
+ sub_pane = "wireless";
+- } else if (type == NM_DEVICE_TYPE_GSM ||
+- type == NM_DEVICE_TYPE_CDMA) {
+- gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 4);
+- sub_pane = "mobilebb";
++ } else if (type == NM_DEVICE_TYPE_MODEM) {
++ NMDeviceModemCapabilities caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
++ if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) ||
++ (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
++ gtk_notebook_set_current_page (GTK_NOTEBOOK (widget), 4);
++ sub_pane = "mobilebb";
++ }
+ }
+ if (sub_pane == NULL)
+ goto out;
+@@ -824,30 +827,33 @@ nm_device_refresh_item_ui (CcNetworkPanel *panel, NMDevice *device)
+ active_ap);
+ }
+
+- } else if (type == NM_DEVICE_TYPE_GSM ||
+- type == NM_DEVICE_TYPE_CDMA) {
++ } else if (type == NM_DEVICE_TYPE_MODEM) {
++ NMDeviceModemCapabilities caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
+
+- /* IMEI */
+- str = g_object_get_data (G_OBJECT (device),
+- "ControlCenter::EquipmentIdentifier");
+- panel_set_widget_data (panel,
+- sub_pane,
+- "imei",
+- str);
++ if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) ||
++ (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
++ /* IMEI */
++ str = g_object_get_data (G_OBJECT (device),
++ "ControlCenter::EquipmentIdentifier");
++ panel_set_widget_data (panel,
++ sub_pane,
++ "imei",
++ str);
+
+- /* operator name */
+- str = g_object_get_data (G_OBJECT (device),
+- "ControlCenter::OperatorName");
+- panel_set_widget_data (panel,
+- sub_pane,
+- "provider",
+- str);
++ /* operator name */
++ str = g_object_get_data (G_OBJECT (device),
++ "ControlCenter::OperatorName");
++ panel_set_widget_data (panel,
++ sub_pane,
++ "provider",
++ str);
+
+- /* device speed */
+- panel_set_widget_data (panel,
+- sub_pane,
+- "speed",
+- NULL);
++ /* device speed */
++ panel_set_widget_data (panel,
++ sub_pane,
++ "speed",
++ NULL);
++ }
+ }
+
+ /* get IP4 parameters */
+diff --git a/panels/network/panel-common.c b/panels/network/panel-common.c
+index 928b0c4..b07189b 100644
+--- a/panels/network/panel-common.c
++++ b/panels/network/panel-common.c
+@@ -26,25 +26,32 @@
+ #include <gtk/gtk.h>
+
+ #include "panel-common.h"
++#include "nm-device-modem.h"
+
+ /**
+- * panel_device_type_to_icon_name:
++ * panel_device_to_icon_name:
+ **/
+ const gchar *
+-panel_device_type_to_icon_name (NMDeviceType type)
++panel_device_to_icon_name (NMDevice *device)
+ {
+ const gchar *value = NULL;
+- switch (type) {
++ NMDeviceModemCapabilities caps;
++ switch (nm_device_get_device_type (device)) {
+ case NM_DEVICE_TYPE_ETHERNET:
+ value = "network-wired";
+ break;
+ case NM_DEVICE_TYPE_WIFI:
+- case NM_DEVICE_TYPE_GSM:
+- case NM_DEVICE_TYPE_CDMA:
+ case NM_DEVICE_TYPE_BT:
+ case NM_DEVICE_TYPE_OLPC_MESH:
+ value = "network-wireless";
+ break;
++ case NM_DEVICE_TYPE_MODEM:
++ caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
++ if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) ||
++ (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
++ value = "network-wireless";
++ }
++ break;
+ default:
+ break;
+ }
+@@ -52,13 +59,14 @@ panel_device_type_to_icon_name (NMDeviceType type)
+ }
+
+ /**
+- * panel_device_type_to_localized_string:
++ * panel_device_to_localized_string:
+ **/
+ const gchar *
+-panel_device_type_to_localized_string (NMDeviceType type)
++panel_device_to_localized_string (NMDevice *device)
+ {
+ const gchar *value = NULL;
+- switch (type) {
++ NMDeviceModemCapabilities caps;
++ switch (nm_device_get_device_type (device)) {
+ case NM_DEVICE_TYPE_UNKNOWN:
+ /* TRANSLATORS: device type */
+ value = _("Unknown");
+@@ -71,10 +79,13 @@ panel_device_type_to_localized_string (NMDeviceType type)
+ /* TRANSLATORS: device type */
+ value = _("Wireless");
+ break;
+- case NM_DEVICE_TYPE_GSM:
+- case NM_DEVICE_TYPE_CDMA:
+- /* TRANSLATORS: device type */
+- value = _("Mobile broadband");
++ case NM_DEVICE_TYPE_MODEM:
++ caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
++ if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) ||
++ (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
++ /* TRANSLATORS: device type */
++ value = _("Mobile broadband");
++ }
+ break;
+ case NM_DEVICE_TYPE_BT:
+ /* TRANSLATORS: device type */
+@@ -91,24 +102,28 @@ panel_device_type_to_localized_string (NMDeviceType type)
+ }
+
+ /**
+- * panel_device_type_to_sortable_string:
++ * panel_device_to_sortable_string:
+ *
+ * Try to return order of approximate connection speed.
+ **/
+ const gchar *
+-panel_device_type_to_sortable_string (NMDeviceType type)
++panel_device_to_sortable_string (NMDevice *device)
+ {
+ const gchar *value = NULL;
+- switch (type) {
++ NMDeviceModemCapabilities caps;
++ switch (nm_device_get_device_type (device)) {
+ case NM_DEVICE_TYPE_ETHERNET:
+ value = "1";
+ break;
+ case NM_DEVICE_TYPE_WIFI:
+ value = "2";
+ break;
+- case NM_DEVICE_TYPE_GSM:
+- case NM_DEVICE_TYPE_CDMA:
+- value = "3";
++ case NM_DEVICE_TYPE_MODEM:
++ caps = nm_device_modem_get_current_capabilities (NM_DEVICE_MODEM (device));
++ if ((caps & NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS) ||
++ (caps & NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO)) {
++ value = "3";
++ }
+ break;
+ case NM_DEVICE_TYPE_BT:
+ value = "4";
+diff --git a/panels/network/panel-common.h b/panels/network/panel-common.h
+index c50f6b3..dd0eb08 100644
+--- a/panels/network/panel-common.h
++++ b/panels/network/panel-common.h
+@@ -24,12 +24,13 @@
+
+ #include <glib-object.h>
+ #include <NetworkManager.h>
++#include <nm-device.h>
+
+ G_BEGIN_DECLS
+
+-const gchar *panel_device_type_to_icon_name (NMDeviceType type);
+-const gchar *panel_device_type_to_localized_string (NMDeviceType type);
+-const gchar *panel_device_type_to_sortable_string (NMDeviceType type);
++const gchar *panel_device_to_icon_name (NMDevice *device);
++const gchar *panel_device_to_localized_string (NMDevice *device);
++const gchar *panel_device_to_sortable_string (NMDevice *device);
+ const gchar *panel_ap_mode_to_localized_string (NM80211Mode mode);
+ const gchar *panel_device_state_to_localized_string (NMDeviceState type);
+
+--
+1.7.2.3
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
index d1101b0..9cb2b1b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.90.ebuild
@@ -89,4 +89,9 @@ src_prepare() {
--disable-schemas-install
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+ # bug 356729
+ epatch "${FILESDIR}/${PN}-fix-networkmanager-api.patch"
+
+ 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 d1101b0..9cb2b1b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -89,4 +89,9 @@ src_prepare() {
--disable-schemas-install
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+ # bug 356729
+ epatch "${FILESDIR}/${PN}-fix-networkmanager-api.patch"
+
+ gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-03-26 0:37 Nirbheek Chauhan
0 siblings, 0 replies; 23+ messages in thread
From: Nirbheek Chauhan @ 2011-03-26 0:37 UTC (permalink / raw
To: gentoo-commits
commit: e1ba1983e56987616a4d083385f211b470d03cb3
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 23:17:04 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 23:17:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e1ba1983
gnome-base/gnome-control-center: proper fix for desktop file problems
---
...e-control-center-2.91.92-fix-desktop-file.patch | 24 +++++++++++++++++++
| 25 --------------------
...uild => gnome-control-center-2.91.92-r2.ebuild} | 2 +-
3 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch
new file mode 100644
index 0000000..9a051b6
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch
@@ -0,0 +1,24 @@
+From 0b25f5a45e53338646c6c87cc540df3db828c0f2 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Wed, 23 Mar 2011 15:43:13 +0000
+Subject: gnome-control-center.desktop: Ensure we're in the menu
+
+If we're not categorized, the shell won't pick us up, and that's
+a problem for application tracking. Per IRC discussion, go
+into System Settings for now.
+---
+diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
+index b4182f6..38be8ea 100644
+--- a/shell/gnome-control-center.desktop.in.in
++++ b/shell/gnome-control-center.desktop.in.in
+@@ -5,7 +5,7 @@ Exec=gnome-control-center --overview
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;
++Categories=GNOME;GTK;System;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+--
+cgit v0.9
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-fix-gnomecc-menu.patch b/gnome-base/gnome-control-center/files/gnome-control-center-fix-gnomecc-menu.patch
deleted file mode 100644
index 850e3e8..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-fix-gnomecc-menu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e9bd833af23596529f5007409c75b79227118d8a Mon Sep 17 00:00:00 2001
-From: Nirbheek Chauhan <nirbheek@gentoo.org>
-Date: Wed, 23 Mar 2011 12:25:55 +0530
-Subject: [PATCH] shell: fix shell launcher .desktop file name in gnomecc.menu
-
----
- shell/gnomecc.menu | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/shell/gnomecc.menu b/shell/gnomecc.menu
-index edf829a..8f1c34d 100644
---- a/shell/gnomecc.menu
-+++ b/shell/gnomecc.menu
-@@ -39,7 +39,7 @@
-
- <!-- Avoid the shell having a launcher for itself -->
- <Exclude>
-- <Filename>gnome-control-center.desktop</Filename>
-+ <Filename>gnome-shell.desktop</Filename>
- </Exclude>
-
- <!-- Personal category -->
---
-1.7.3.4
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
similarity index 98%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.92-r1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
index 4d4d1fd..84027a5 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
@@ -96,7 +96,7 @@ src_prepare() {
DOCS="AUTHORS ChangeLog NEWS README TODO"
# https://bugs.gentoo.org/show_bug.cgi?id=360057
- epatch "${FILESDIR}/${PN}-fix-gnomecc-menu.patch"
+ epatch "${FILESDIR}/${PN}-fix-desktop-file.patch"
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-03-29 8:35 Nirbheek Chauhan
0 siblings, 0 replies; 23+ messages in thread
From: Nirbheek Chauhan @ 2011-03-29 8:35 UTC (permalink / raw
To: gentoo-commits
commit: fa74807f873431b5c3067b1e0a4ff0660ff503c1
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 07:57:01 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fa74807f
gnome-base/gnome-control-center: 2.91.92-r2 → 2.91.93
---
...e-control-center-2.91.92-fix-desktop-file.patch | 24 --------------------
....ebuild => gnome-control-center-2.91.93.ebuild} | 3 --
.../gnome-control-center-9999.ebuild | 3 --
3 files changed, 0 insertions(+), 30 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch
deleted file mode 100644
index 9a051b6..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-2.91.92-fix-desktop-file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0b25f5a45e53338646c6c87cc540df3db828c0f2 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Wed, 23 Mar 2011 15:43:13 +0000
-Subject: gnome-control-center.desktop: Ensure we're in the menu
-
-If we're not categorized, the shell won't pick us up, and that's
-a problem for application tracking. Per IRC discussion, go
-into System Settings for now.
----
-diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
-index b4182f6..38be8ea 100644
---- a/shell/gnome-control-center.desktop.in.in
-+++ b/shell/gnome-control-center.desktop.in.in
-@@ -5,7 +5,7 @@ Exec=gnome-control-center --overview
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;GTK;Settings;
-+Categories=GNOME;GTK;System;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gnome-control-center
---
-cgit v0.9
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
similarity index 96%
rename from gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
index 734344a..b7ab781 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.93.ebuild
@@ -96,8 +96,5 @@ src_prepare() {
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
- # https://bugs.gentoo.org/show_bug.cgi?id=360057
- epatch "${FILESDIR}/${P}-fix-desktop-file.patch"
-
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 645537a..b7ab781 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -96,8 +96,5 @@ src_prepare() {
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
- # https://bugs.gentoo.org/show_bug.cgi?id=360057
- epatch "${FILESDIR}/${PN}-fix-gnomecc-menu.patch"
-
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-06-24 17:35 Alexandre Restovtsev
0 siblings, 0 replies; 23+ messages in thread
From: Alexandre Restovtsev @ 2011-06-24 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 48cb6a4457fc35a7d9a139925836b35b5cbe2a25
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jun 23 04:46:57 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jun 24 17:08:51 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=48cb6a44
gnome-base/gnome-control-center: cups-1.5 and https handler fixes
* Add a patch for cups-1.5 header changes from upstream git (will be in
next release).
* Add a patch to correctly set the https handler, as discussed via email
(upstream bug 653211).
* Disable maintainer mode.
---
.../gnome-control-center-3.0.2-cups-ppd.h.patch | 46 ++++++++++++++++++++
.../gnome-control-center-3.0.2-https-handler.patch | 28 ++++++++++++
...ebuild => gnome-control-center-3.0.2-r1.ebuild} | 7 +++
3 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
new file mode 100644
index 0000000..ce2a75d
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-cups-ppd.h.patch
@@ -0,0 +1,46 @@
+From 246dfbcca4906db9c2ef01990ad482270324309e Mon Sep 17 00:00:00 2001
+From: Marek Kasik <mkasik@redhat.com>
+Date: Mon, 20 Jun 2011 15:04:25 +0000
+Subject: Printers: Include cups/ppd.h explicitly
+
+cups/ppd.h is not included by cups/cups.h since CUPS 1.5.
+---
+diff --git a/configure.ac b/configure.ac
+index b26fb7c..b7e6259 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -145,7 +145,7 @@ if test x"$enable_cups" != x"no" ; then
+ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
+ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
+
+- AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h],,
++ AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
+ AC_MSG_ERROR([CUPS headers not found but CUPS support requested]))
+
+ if ! test $CUPS_API_MAJOR -gt 1 -o \
+diff --git a/panels/printers/pp-new-printer-dialog.c b/panels/printers/pp-new-printer-dialog.c
+index 0b9ece9..69372c2 100644
+--- a/panels/printers/pp-new-printer-dialog.c
++++ b/panels/printers/pp-new-printer-dialog.c
+@@ -31,6 +31,7 @@
+ #include <gtk/gtk.h>
+
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+
+ #include "pp-new-printer-dialog.h"
+ #include "pp-utils.h"
+diff --git a/panels/printers/pp-utils.c b/panels/printers/pp-utils.c
+index 8dbe04f..cb7c29f 100644
+--- a/panels/printers/pp-utils.c
++++ b/panels/printers/pp-utils.c
+@@ -25,6 +25,7 @@
+ #include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <dbus/dbus-glib.h>
+
+ #include "pp-utils.h"
+--
+cgit v0.9
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
new file mode 100644
index 0000000..45e3e50
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-https-handler.patch
@@ -0,0 +1,28 @@
+From 6a6a8583803464d4b56870c7faf4db035b97e12d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Thu, 23 Jun 2011 00:05:34 -0400
+Subject: [PATCH] Fix https scheme handler app setting (bug #653211)
+
+default_app_changed() contains a typo: we need to set the https
+handler app when the user changes the http app chooser, not the
+(non-existent) https app chooser.
+---
+ panels/info/cc-info-panel.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
+index 2283896..f4dba1b 100644
+--- a/panels/info/cc-info-panel.c
++++ b/panels/info/cc-info-panel.c
+@@ -922,7 +922,7 @@ default_app_changed (GtkAppChooserButton *button,
+ }
+
+ /* Set https support for the browser as well */
+- if (g_str_equal (content_type, "x-scheme-handler/https"))
++ if (g_str_equal (content_type, "x-scheme-handler/http"))
+ {
+ if (g_app_info_set_as_default_for_type (info, "x-scheme-handler/https", &error) == FALSE)
+ {
+--
+1.7.5.3
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
similarity index 92%
rename from gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
index 5b26187..69e422b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
@@ -91,6 +91,7 @@ pkg_setup() {
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
+ --disable-maintainer-mode
$(use_with cheese)
$(use_enable cups)
$(use_with socialweb libsocialweb)"
@@ -103,5 +104,11 @@ src_prepare() {
sed -e 's:no-undefined:-no-undefined:' \
-i libgnome-control-center/Makefile.* || die "sed failed"
+ # cups-1.5 compatibility; will be in next release
+ epatch "${FILESDIR}/${P}-cups-ppd.h.patch"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=653211
+ epatch "${FILESDIR}/${PN}-3.0.2-https-handler.patch"
+
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-07-12 0:28 Alexandre Restovtsev
0 siblings, 0 replies; 23+ messages in thread
From: Alexandre Restovtsev @ 2011-07-12 0:28 UTC (permalink / raw
To: gentoo-commits
commit: eb677ec98eb7aef873b5a911951aefcc52518f88
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 12 00:25:45 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 12 00:25:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eb677ec9
gnome-base/gnome-control-center: 3.0.2-r1 → 3.0.2-r2
Add upstream patch allowing users to be deleted on 32-bit systems.
---
...-control-center-3.0.2-delete-users-32-bit.patch | 22 ++++++++++++++++++++
...ebuild => gnome-control-center-3.0.2-r2.ebuild} | 7 ++++-
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
new file mode 100644
index 0000000..d773408
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.0.2-delete-users-32-bit.patch
@@ -0,0 +1,22 @@
+From 6ee7b75e0f87bc39baa262b270c73f7de699c406 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sat, 11 Jun 2011 11:40:39 +0000
+Subject: user-accounts: Fix deleting users on 32-bit systems
+
+https://bugzilla.gnome.org/show_bug.cgi?id=652073
+---
+diff --git a/panels/user-accounts/um-user-manager.c b/panels/user-accounts/um-user-manager.c
+index 6bf8b42..442809a 100644
+--- a/panels/user-accounts/um-user-manager.c
++++ b/panels/user-accounts/um-user-manager.c
+@@ -577,7 +577,7 @@ um_user_manager_delete_user (UmUserManager *manager,
+ delete_user_done,
+ data,
+ async_user_op_data_free,
+- G_TYPE_INT64, um_user_get_uid (user),
++ G_TYPE_INT64, (gint64) um_user_get_uid (user),
+ G_TYPE_BOOLEAN, remove_files,
+ G_TYPE_INVALID);
+ }
+--
+cgit v0.9
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild
similarity index 92%
rename from gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild
index 69e422b..a54b227 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.0.2-r2.ebuild
@@ -107,8 +107,11 @@ src_prepare() {
# cups-1.5 compatibility; will be in next release
epatch "${FILESDIR}/${P}-cups-ppd.h.patch"
- # https://bugzilla.gnome.org/show_bug.cgi?id=653211
- epatch "${FILESDIR}/${PN}-3.0.2-https-handler.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=653211, will be in next release
+ epatch "${FILESDIR}/${P}-https-handler.patch"
+
+ # fix deleting users on 32-bit systems, will be in next release
+ epatch "${FILESDIR}/${P}-delete-users-32-bit.patch"
gnome2_src_prepare
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2011-10-28 5:28 Alexandre Restovtsev
0 siblings, 0 replies; 23+ messages in thread
From: Alexandre Restovtsev @ 2011-10-28 5:28 UTC (permalink / raw
To: gentoo-commits
commit: 5e2fe330de4dc94bcf5a32ebc69c308381c0fa41
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 04:02:52 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Oct 28 04:25:31 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5e2fe330
gnome-base/gnome-control-center: make colord optional
As discussed on IRC with Nirbheek. This will make gnome-3.2 easier to
unmask.
---
...nome-control-center-3.2.1-optional-colord.patch | 66 ++++++++++++++++++++
.../gnome-control-center-3.2.1.ebuild | 17 ++++-
2 files changed, 79 insertions(+), 4 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch
new file mode 100644
index 0000000..edbbf31
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch
@@ -0,0 +1,66 @@
+From b56f9e04f8822db34b030bea86d39c1d444a3cbb Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Thu, 27 Oct 2011 23:55:23 -0400
+Subject: [PATCH] Make colord optional.
+
+---
+ configure.ac | 19 ++++++++++++++++++-
+ panels/Makefile.am | 5 ++++-
+ 2 files changed, 22 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d552ac8..fd9062e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -106,7 +106,24 @@ 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(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],
++ [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
++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 dbus-glib-1
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 566a2f8..a375e2f 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -3,7 +3,6 @@ SUBDIRS= \
+ background \
+ screen \
+ power \
+- color \
+ display \
+ media \
+ mouse \
+@@ -17,6 +16,10 @@ SUBDIRS= \
+ datetime \
+ wacom
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_PRINTERS
+ SUBDIRS += printers
+ endif
+--
+1.7.7.1
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
index 92e8642..a094f13 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit gnome2
+inherit autotools gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="+cheese +cups +networkmanager +socialweb"
+IUSE="+cheese +colord +cups +networkmanager +socialweb"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -37,7 +37,7 @@ COMMON_DEPEND="
>=gnome-base/gconf-2.0:2
>=dev-libs/dbus-glib-0.73
>=gnome-base/gnome-desktop-3.1.0:3
- >=gnome-base/gnome-settings-daemon-3.1.4
+ >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?]
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
@@ -52,7 +52,6 @@ COMMON_DEPEND="
>=sys-auth/polkit-0.97
>=sys-power/upower-0.9.1
>=x11-libs/libnotify-0.7.3
- >=x11-misc/colord-0.1.8
x11-apps/xmodmap
x11-libs/libX11
@@ -63,6 +62,7 @@ COMMON_DEPEND="
cheese? (
media-libs/gstreamer:0.10
>=media-video/cheese-2.91.91.1 )
+ colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
networkmanager? (
>=gnome-extra/nm-applet-0.9.1.90
@@ -101,7 +101,16 @@ pkg_setup() {
--disable-update-mimedb
--disable-static
$(use_with cheese)
+ $(use_enable colord color)
$(use_enable cups)
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
+
+src_prepare() {
+ # Make colord plugin optional; requires eautoreconf
+ epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
+ eautoreconf
+
+ gnome2_src_prepare
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-03-26 8:20 Nirbheek Chauhan
0 siblings, 0 replies; 23+ messages in thread
From: Nirbheek Chauhan @ 2012-03-26 8:20 UTC (permalink / raw
To: gentoo-commits
commit: 074049b9995cc8c114b7061cc9618fe741534da0
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 25 12:13:21 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 26 08:19:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=074049b9
Add gnome-base/gnome-control-center-3.3.92
---
...nome-control-center-3.2.1-optional-colord.patch | 66 -----------
...er-3.3.92-optional-bluetooth-colord-wacom.patch | 124 ++++++++++++++++++++
...9.ebuild => gnome-control-center-3.3.92.ebuild} | 49 +++++---
.../gnome-control-center-9999.ebuild | 49 +++++---
4 files changed, 188 insertions(+), 100 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch
deleted file mode 100644
index edbbf31..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.2.1-optional-colord.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b56f9e04f8822db34b030bea86d39c1d444a3cbb Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 27 Oct 2011 23:55:23 -0400
-Subject: [PATCH] Make colord optional.
-
----
- configure.ac | 19 ++++++++++++++++++-
- panels/Makefile.am | 5 ++++-
- 2 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d552ac8..fd9062e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -106,7 +106,24 @@ 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(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],
-+ [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
-+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 dbus-glib-1
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 566a2f8..a375e2f 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -3,7 +3,6 @@ SUBDIRS= \
- background \
- screen \
- power \
-- color \
- display \
- media \
- mouse \
-@@ -17,6 +16,10 @@ SUBDIRS= \
- datetime \
- wacom
-
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_PRINTERS
- SUBDIRS += printers
- endif
---
-1.7.7.1
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch
new file mode 100644
index 0000000..fa2b1b6
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.3.92-optional-bluetooth-colord-wacom.patch
@@ -0,0 +1,124 @@
+diff -Naur gnome-control-center-3.3.92//configure.ac gnome-control-center-3.3.92.new//configure.ac
+--- gnome-control-center-3.3.92//configure.ac 2012-03-19 15:06:11.000000000 +0530
++++ gnome-control-center-3.3.92.new//configure.ac 2012-03-25 17:34:27.124395337 +0530
+@@ -109,7 +109,24 @@
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0)
+ 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],
++ [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
++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 +144,26 @@
+ 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 +179,25 @@
+ 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,
+- [have_bluetooth=yes], have_bluetooth=no)
+-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
++build_bluetooth=false
++AC_ARG_ENABLE(bluetooth,
++ AC_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [case "${enableval}" in
++ yes) WANT_BLUETOOTH=yes ;;
++ no) WANT_BLUETOOTH=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++ esac],
++ [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++ # Check for gnome-bluetooth
++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.3.4,
++ [have_bluetooth=yes], have_bluetooth=no)
++ build_bluetooth=true
++fi
++
++AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$build_bluetooth = xyes])
+
+ # Check for CUPS 1.4 or newer
+ AC_ARG_ENABLE([cups],
+diff -Naur gnome-control-center-3.3.92//panels/Makefile.am gnome-control-center-3.3.92.new//panels/Makefile.am
+--- gnome-control-center-3.3.92//panels/Makefile.am 2012-02-14 15:42:23.000000000 +0530
++++ gnome-control-center-3.3.92.new//panels/Makefile.am 2012-03-25 17:31:48.801387677 +0530
+@@ -3,7 +3,6 @@
+ background \
+ screen \
+ power \
+- color \
+ display \
+ mouse \
+ online-accounts \
+@@ -13,8 +12,11 @@
+ keyboard \
+ universal-access \
+ user-accounts \
+- datetime \
+- wacom
++ datetime
++
++if BUILD_COLOR
++SUBDIRS += color
++endif
+
+ if BUILD_PRINTERS
+ SUBDIRS += printers
+@@ -28,4 +30,8 @@
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_WACOM
++SUBDIRS += wacom
++endif
++
+ -include $(top_srcdir)/git.mk
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild
similarity index 67%
copy from gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
copy to gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild
index 92e8642..a825a04 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.3.92.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.32.1.ebuild,v 1.1 2010/12/04 00:46:57 pacho Exp $
+# $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 $
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit gnome2
+inherit autotools eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,11 +16,11 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="+cheese +cups +networkmanager +socialweb"
+IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+ 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
@@ -29,15 +29,14 @@ fi
# 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.29.14:2
+ >=dev-libs/glib-2.31.0:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.1.19:3
- >=gnome-base/gsettings-desktop-schemas-3.0.2
- >=gnome-base/gconf-2.0:2
- >=dev-libs/dbus-glib-0.73
- >=gnome-base/gnome-desktop-3.1.0:3
- >=gnome-base/gnome-settings-daemon-3.1.4
+ >=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]
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
@@ -52,7 +51,6 @@ COMMON_DEPEND="
>=sys-auth/polkit-0.97
>=sys-power/upower-0.9.1
>=x11-libs/libnotify-0.7.3
- >=x11-misc/colord-0.1.8
x11-apps/xmodmap
x11-libs/libX11
@@ -60,9 +58,11 @@ COMMON_DEPEND="
>=x11-libs/libxklavier-5.1
>=x11-libs/libXi-1.2
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 )
cheese? (
media-libs/gstreamer:0.10
- >=media-video/cheese-2.91.91.1 )
+ >=media-video/cheese-3.3.5 )
+ colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
networkmanager? (
>=gnome-extra/nm-applet-0.9.1.90
@@ -72,12 +72,13 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-admin/apg
sys-apps/accountsservice
+ x11-themes/gnome-icon-theme-symbolic
cups? ( net-print/cups-pk-helper )
+ !<gnome-base/gdm-2.91.94
!<gnome-extra/gnome-color-manager-3.1.2
!gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<gnome-base/gdm-2.91.94"
+ !<gnome-extra/gnome-media-2.32.0-r300"
# PDEPEND to avoid circular dependency
PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
DEPEND="${COMMON_DEPEND}
@@ -92,16 +93,30 @@ DEPEND="${COMMON_DEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.10.1
- cups? ( sys-apps/sed )"
+ cups? ( sys-apps/sed )
+
+ gnome-base/gnome-common"
# Needed for autoreconf
# gnome-base/gnome-common
pkg_setup() {
+ # TODO: libwacom is needed for wacom support
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
+ --disable-wacom
+ $(use_enable bluetooth)
$(use_with cheese)
+ $(use_enable colord color)
$(use_enable cups)
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
+
+src_prepare() {
+ # Make colord plugin optional; requires eautoreconf
+ epatch "${FILESDIR}/${PN}-3.3.92-optional-bluetooth-colord-wacom.patch"
+ 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 92e8642..a825a04 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-2.32.1.ebuild,v 1.1 2010/12/04 00:46:57 pacho Exp $
+# $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 $
EAPI="4"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit gnome2
+inherit autotools eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
@@ -16,11 +16,11 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="+cheese +cups +networkmanager +socialweb"
+IUSE="+bluetooth +cheese +colord +cups +networkmanager +socialweb"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+ 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
@@ -29,15 +29,14 @@ fi
# 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.29.14:2
+ >=dev-libs/glib-2.31.0:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.1.19:3
- >=gnome-base/gsettings-desktop-schemas-3.0.2
- >=gnome-base/gconf-2.0:2
- >=dev-libs/dbus-glib-0.73
- >=gnome-base/gnome-desktop-3.1.0:3
- >=gnome-base/gnome-settings-daemon-3.1.4
+ >=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]
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
@@ -52,7 +51,6 @@ COMMON_DEPEND="
>=sys-auth/polkit-0.97
>=sys-power/upower-0.9.1
>=x11-libs/libnotify-0.7.3
- >=x11-misc/colord-0.1.8
x11-apps/xmodmap
x11-libs/libX11
@@ -60,9 +58,11 @@ COMMON_DEPEND="
>=x11-libs/libxklavier-5.1
>=x11-libs/libXi-1.2
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.3.4 )
cheese? (
media-libs/gstreamer:0.10
- >=media-video/cheese-2.91.91.1 )
+ >=media-video/cheese-3.3.5 )
+ colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
networkmanager? (
>=gnome-extra/nm-applet-0.9.1.90
@@ -72,12 +72,13 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
app-admin/apg
sys-apps/accountsservice
+ x11-themes/gnome-icon-theme-symbolic
cups? ( net-print/cups-pk-helper )
+ !<gnome-base/gdm-2.91.94
!<gnome-extra/gnome-color-manager-3.1.2
!gnome-extra/gnome-media[pulseaudio]
- !<gnome-extra/gnome-media-2.32.0-r300
- !<gnome-base/gdm-2.91.94"
+ !<gnome-extra/gnome-media-2.32.0-r300"
# PDEPEND to avoid circular dependency
PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
DEPEND="${COMMON_DEPEND}
@@ -92,16 +93,30 @@ DEPEND="${COMMON_DEPEND}
app-text/scrollkeeper
>=app-text/gnome-doc-utils-0.10.1
- cups? ( sys-apps/sed )"
+ cups? ( sys-apps/sed )
+
+ gnome-base/gnome-common"
# Needed for autoreconf
# gnome-base/gnome-common
pkg_setup() {
+ # TODO: libwacom is needed for wacom support
G2CONF="${G2CONF}
--disable-update-mimedb
--disable-static
+ --disable-wacom
+ $(use_enable bluetooth)
$(use_with cheese)
+ $(use_enable colord color)
$(use_enable cups)
$(use_with socialweb libsocialweb)"
DOCS="AUTHORS ChangeLog NEWS README TODO"
}
+
+src_prepare() {
+ # Make colord plugin optional; requires eautoreconf
+ epatch "${FILESDIR}/${PN}-3.3.92-optional-bluetooth-colord-wacom.patch"
+ eautoreconf
+
+ gnome2_src_prepare
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-05-25 8:22 Alexandre Restovtsev
0 siblings, 0 replies; 23+ messages in thread
From: Alexandre Restovtsev @ 2012-05-25 8:22 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-07-19 2:47 Alexandre Restovtsev
0 siblings, 0 replies; 23+ messages in thread
From: Alexandre Restovtsev @ 2012-07-19 2:47 UTC (permalink / raw
To: gentoo-commits
commit: 4704a03caa42f9b02c9e4556158138155f7aa8a1
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 19 02:47:03 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 19 02:47:03 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4704a03c
gnome-base/gnome-control-center: sync with gx86
---
.../gnome-control-center-3.4.2-gentoo-paths.patch | 147 ++++++++++++++++++++
.../gnome-control-center-9999.ebuild | 6 +-
2 files changed, 152 insertions(+), 1 deletions(-)
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.4.2-gentoo-paths.patch
new file mode 100644
index 0000000..377312e
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.4.2-gentoo-paths.patch
@@ -0,0 +1,147 @@
+From 44cd56e05a59fbdfcd3dc5b12c0c7ff178b230f1 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 18 Jul 2012 22:12:04 -0400
+Subject: [PATCH] Use Gentoo-appropriate absolute paths
+
+---
+ 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 = \
+ $(LIBLANGUAGE_CFLAGS) \
+ -DDATADIR=\""$(datadir)"\" \
+ -DUIDIR=\""$(pkgdatadir)/ui"\" \
+- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
++ -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
+ -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 = \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+ -DDATADIR="\"$(uidir)\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
+ $(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)
+ return 0;
+ }
+
+- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
+ if (dir == NULL) {
+ /* Try with /usr/share/locale/
+ * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
+- dir = g_dir_open ("/usr/share/locale/", 0, NULL);
++ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
+ 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 @@
+ #include <gtk/gtk.h>
+ #include "cc-timezone-map.h"
+
+-#define TZ_DIR "/usr/share/zoneinfo/"
++#define TZ_DIR REALDATADIR "/zoneinfo/"
+
+ 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 @@
+ #include <glib.h>
+
+ #ifndef __sun
+-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
++# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
+ #else
+-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
++# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
+ #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 = \
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+ -DDATADIR="\"$(uidir)\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
++ -DPREFIX="\"$(prefix)\"" \
++ -DLIBEXECDIR="\"$(libexecdir)\"" \
+ $(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,
+
+ if (printer_name)
+ {
+- const gchar *const dirs[] = { "/usr/share/cups",
+- "/usr/local/share/cups",
++ const gchar *const dirs[] = { REALDATADIR "/cups",
++ PREFIX "/local/share/cups",
+ 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,
+ }
+
+ /* 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
+--- a/panels/user-accounts/Makefile.am
++++ b/panels/user-accounts/Makefile.am
+@@ -10,7 +10,7 @@ ccpanels_LTLIBRARIES = libuser-accounts.la
+ AM_CPPFLAGS = \
+ -DDATADIR=\""$(datadir)"\" \
+ -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
+- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
++ -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
+ -I$(srcdir)/../common/ \
+--
+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-9999.ebuild
index cba9f00..da57456 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -77,7 +77,9 @@ RDEPEND="${COMMON_DEPEND}
sys-apps/accountsservice
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
- cups? ( net-print/cups-pk-helper )
+ cups? (
+ >=app-admin/system-config-printer-gnome-1.3.5
+ net-print/cups-pk-helper )
!systemd? ( sys-auth/consolekit )
wacom? ( gnome-base/gnome-settings-daemon[wacom] )
@@ -124,6 +126,8 @@ pkg_setup() {
src_prepare() {
# Make some panels optional; requires eautoreconf
epatch "${FILESDIR}/${PN}-3.4.2-optional-bt-colord-goa-wacom.patch"
+ # Fix some absolute paths to be appropriate for Gentoo
+ epatch "${FILESDIR}/${PN}-3.4.2-gentoo-paths.patch"
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-09-10 5:08 Nirbheek Chauhan
0 siblings, 0 replies; 23+ messages in thread
From: Nirbheek Chauhan @ 2012-09-10 5:08 UTC (permalink / raw
To: gentoo-commits
commit: 1e28630272d23d1a4304883f5f3e127e13dc804b
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 10:03:12 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> 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 <stefano.facchini@gmail.com>
+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 <tetromino@gentoo.org>
-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 <tetromino@gentoo.org>
---
- 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 <tetromino@gentoo.org>
-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 <tetromino@gentoo.org>
+--- 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 )"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
RDEPEND="${COMMON_DEPEND}
app-admin/apg
@@ -100,9 +101,7 @@ DEPEND="${COMMON_DEPEND}
>=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 )"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
RDEPEND="${COMMON_DEPEND}
app-admin/apg
@@ -100,9 +101,7 @@ DEPEND="${COMMON_DEPEND}
>=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
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-09-10 16:13 Priit Laes
0 siblings, 0 replies; 23+ messages in thread
From: Priit Laes @ 2012-09-10 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 0e2bbb7d85bcc704455084b0fb4f04655e146399
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Sep 10 16:12:47 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Mon Sep 10 16:12:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0e2bbb7d
gnome-base/gnome-control-center: Allow disabling kerberos
---
...e-control-center-3.5.91-optional-kerberos.patch | 238 ++++++++++++++++++++
.../gnome-control-center-3.5.91.ebuild | 4 +-
2 files changed, 240 insertions(+), 2 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
new file mode 100644
index 0000000..4b3148a
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
@@ -0,0 +1,238 @@
+From 88e3f2146b0740161dc3b2095dcf05c538b67e36 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Mon, 10 Sep 2012 18:49:43 +0300
+Subject: [PATCH] Crappy patch to allow disabling kerberos requirement
+
+---
+ configure.ac | 22 ++++++++++++++--------
+ panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++----
+ panels/user-accounts/um-realm-manager.c | 2 ++
+ 3 files changed, 42 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fa4b12f..c1e188f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -321,16 +321,22 @@ AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes
+ ISO_CODES=iso-codes
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++ [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++ if test "$KRB5_CONFIG" = "no"; then
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++ fi
+
++ AC_MSG_CHECKING(for krb5 libraries and flags)
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+
+diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
+index 9dbda5c..6b82980 100644
+--- a/panels/user-accounts/um-account-dialog.c
++++ b/panels/user-accounts/um-account-dialog.c
+@@ -26,10 +26,13 @@
+ #include <gtk/gtk.h>
+
+ #include "um-account-dialog.h"
+-#include "um-realm-manager.h"
+ #include "um-user-manager.h"
+ #include "um-utils.h"
+
++#ifdef KERBEROS
++#include "um-realm-manager.h"
++#endif
++
+ typedef enum {
+ UM_LOCAL,
+ UM_ENTERPRISE,
+@@ -41,6 +44,7 @@ static void mode_change (UmAccountDialog *self,
+
+ static void dialog_validate (UmAccountDialog *self);
+
++#ifdef KERBEROS
+ static void on_join_login (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data);
+@@ -48,6 +52,7 @@ static void on_join_login (GObject *source,
+ static void on_realm_joined (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data);
++#endif
+
+ #define UM_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \
+ UmAccountDialogClass))
+@@ -83,6 +88,7 @@ struct _UmAccountDialog {
+ gboolean enterprise_domain_chosen;
+ GtkEntry *enterprise_login;
+ GtkEntry *enterprise_password;
++#ifdef KERBEROS
+ UmRealmManager *realm_manager;
+ UmRealmObject *selected_realm;
+
+@@ -92,6 +98,7 @@ struct _UmAccountDialog {
+ GtkEntry *join_name;
+ GtkEntry *join_password;
+ gboolean join_prompted;
++#endif
+ };
+
+ struct _UmAccountDialogClass {
+@@ -292,6 +299,7 @@ local_prepare (UmAccountDialog *self)
+ gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0);
+ }
+
++#ifdef KERBEROS
+ static gboolean
+ enterprise_validate (UmAccountDialog *self)
+ {
+@@ -461,7 +469,6 @@ on_join_response (GtkDialog *dialog,
+ on_join_login,
+ g_object_ref (self));
+ }
+-
+ static void
+ join_show_prompt (UmAccountDialog *self,
+ GError *error)
+@@ -839,6 +846,7 @@ enterprise_prepare (UmAccountDialog *self)
+ gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), "");
+ gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), "");
+ }
++#endif
+
+ static void
+ dialog_validate (UmAccountDialog *self)
+@@ -849,9 +857,11 @@ dialog_validate (UmAccountDialog *self)
+ case UM_LOCAL:
+ valid = local_validate (self);
+ break;
++#ifdef KERBEROS
+ case UM_ENTERPRISE:
+ valid = enterprise_validate (self);
+ break;
++#endif
+ default:
+ valid = FALSE;
+ break;
+@@ -937,12 +947,14 @@ on_local_toggle (GtkToggleButton *toggle,
+ mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL);
+ }
+
++#ifdef KERBEROS
+ static void
+ on_enterprise_toggle (GtkToggleButton *toggle,
+ gpointer user_data)
+ {
+ mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE);
+ }
++#endif
+
+ static void
+ mode_init (UmAccountDialog *self,
+@@ -954,15 +966,18 @@ mode_init (UmAccountDialog *self,
+
+ widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area");
+ self->mode_areas[UM_LOCAL] = widget;
++#ifdef KERBEROS
+ widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area");
+ self->mode_areas[UM_ENTERPRISE] = widget;
+-
++#endif
+ widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button");
+ g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self);
+ self->mode_buttons[UM_LOCAL] = widget;
++#ifdef KERBEROS
+ widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button");
+ g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self);
+ self->mode_buttons[UM_ENTERPRISE] = widget;
++#endif
+ }
+
+ static void
+@@ -1022,8 +1037,10 @@ um_account_dialog_init (UmAccountDialog *self)
+ self->container_widget = widget;
+
+ local_init (self, builder);
++#ifdef KERBEROS
+ enterprise_init (self, builder);
+ join_init (self, builder);
++#endif
+ mode_init (self, builder);
+
+ g_object_unref (builder);
+@@ -1041,9 +1058,11 @@ um_account_dialog_response (GtkDialog *dialog,
+ case UM_LOCAL:
+ local_create_user (self);
+ break;
++#ifdef KERBEROS
+ case UM_ENTERPRISE:
+ enterprise_add_user (self);
+ break;
++#endif
+ default:
+ g_assert_not_reached ();
+ }
+@@ -1064,6 +1083,7 @@ um_account_dialog_dispose (GObject *obj)
+ if (self->cancellable)
+ g_cancellable_cancel (self->cancellable);
+
++#ifdef KERBEROS
+ if (self->realmd_watch)
+ g_bus_unwatch_name (self->realmd_watch);
+ self->realmd_watch = 0;
+@@ -1075,7 +1095,7 @@ um_account_dialog_dispose (GObject *obj)
+ g_object_unref (self->realm_manager);
+ self->realm_manager = NULL;
+ }
+-
++#endif
+ G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj);
+ }
+
+@@ -1128,7 +1148,9 @@ um_account_dialog_show (UmAccountDialog *self,
+ self->cancellable = g_cancellable_new ();
+
+ local_prepare (self);
++#ifdef KERBEROS
+ enterprise_prepare (self);
++#endif
+ mode_change (self, UM_LOCAL);
+ dialog_validate (self);
+
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 301c905..25c055c 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,6 +22,7 @@
+
+ #include "config.h"
+
++#ifdef KERBEROS
+ #include "um-realm-manager.h"
+
+ #include <krb5/krb5.h>
+@@ -826,3 +827,4 @@ um_realm_login_finish (GAsyncResult *result,
+
+ return TRUE;
+ }
++#endif
+--
+1.7.12
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild
index 5a3fc80..395f6aa 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild
@@ -16,8 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-# +kerberos because USE=-kerberos fails to compile; see pkg_setup()
-IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n +kerberos +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd wacom"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -141,6 +140,7 @@ src_prepare() {
# Make some panels optional; requires eautoreconf
epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
+ epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
# This will be in the next release
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-09-21 0:27 Nirbheek Chauhan
0 siblings, 0 replies; 23+ messages in thread
From: Nirbheek Chauhan @ 2012-09-21 0:27 UTC (permalink / raw
To: gentoo-commits
commit: decb6469c9cfd7ba7305c4a7aee6a6e571c6af00
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 20 23:44:07 2012 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Sep 21 00:08:21 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=decb6469
gnome-base/gnome-control-center: 3.5.91 → 3.5.92
---
...rol-center-3.5.91-fix-printer-panel-build.patch | 29 --------------------
...1.ebuild => gnome-control-center-3.5.92.ebuild} | 18 ++++--------
.../gnome-control-center-9999.ebuild | 20 +++++---------
3 files changed, 13 insertions(+), 54 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
deleted file mode 100644
index 8fd19ee..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-fix-printer-panel-build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 49797e8ae2753bacc74b86cd28be250ff93a62cc Mon Sep 17 00:00:00 2001
-From: Stefano Facchini <stefano.facchini@gmail.com>
-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/gnome-control-center-3.5.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
similarity index 87%
rename from gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
index 395f6aa..53be9cb 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.5.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.5.92.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -33,7 +33,7 @@ COMMON_DEPEND="
>=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/gnome-settings-daemon-3.5.90[colord?,policykit]
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
@@ -55,10 +55,10 @@ COMMON_DEPEND="
>=x11-libs/libXi-1.2
bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
- cheese? (
- media-libs/gstreamer:0.10
+ v4l? (
+ media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
- >=media-video/cheese-3.3.5 )
+ >=media-video/cheese-3.5.91 )
colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
@@ -69,7 +69,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.8.997 )
socialweb? ( net-libs/libsocialweb )
systemd? ( >=sys-apps/systemd-31 )
- wacom? ( >=dev-libs/libwacom-0.5
+ wacom? ( >=dev-libs/libwacom-0.6
>=x11-libs/libXi-1.2 )"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
RDEPEND="${COMMON_DEPEND}
@@ -134,17 +134,11 @@ pkg_setup() {
}
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.5.91-optional-bt-colord-goa-wacom.patch"
epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
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 5a3fc80..53be9cb 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -16,8 +16,7 @@ HOMEPAGE="http://www.gnome.org/"
LICENSE="GPL-2"
SLOT="2"
-# +kerberos because USE=-kerberos fails to compile; see pkg_setup()
-IUSE="+bluetooth +cheese +colord +cups +gnome-online-accounts +i18n +kerberos +networkmanager +socialweb systemd wacom"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n kerberos +networkmanager +socialweb systemd v4l wacom"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -34,7 +33,7 @@ COMMON_DEPEND="
>=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/gnome-settings-daemon-3.5.90[colord?,policykit]
>=gnome-base/libgnomekbd-2.91.91
app-text/iso-codes
@@ -56,10 +55,10 @@ COMMON_DEPEND="
>=x11-libs/libXi-1.2
bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5 )
- cheese? (
- media-libs/gstreamer:0.10
+ v4l? (
+ media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
- >=media-video/cheese-3.3.5 )
+ >=media-video/cheese-3.5.91 )
colord? ( >=x11-misc/colord-0.1.8 )
cups? ( >=net-print/cups-1.4[dbus] )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
@@ -70,7 +69,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.8.997 )
socialweb? ( net-libs/libsocialweb )
systemd? ( >=sys-apps/systemd-31 )
- wacom? ( >=dev-libs/libwacom-0.5
+ wacom? ( >=dev-libs/libwacom-0.6
>=x11-libs/libXi-1.2 )"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
RDEPEND="${COMMON_DEPEND}
@@ -135,16 +134,11 @@ pkg_setup() {
}
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.5.91-optional-bt-colord-goa-wacom.patch"
+ epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
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
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-10-27 8:43 Priit Laes
0 siblings, 0 replies; 23+ messages in thread
From: Priit Laes @ 2012-10-27 8:43 UTC (permalink / raw
To: gentoo-commits
commit: a424e9c9ac25049fe0fb70b4a7693f7e58616815
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Oct 25 07:49:26 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sat Oct 27 08:42:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a424e9c9
gnome-base/gnome-control-center: Minor QA
---
...e-control-center-3.5.91-optional-kerberos.patch | 1 +
.../gnome-control-center-3.6.2.ebuild | 8 +++-----
.../gnome-control-center-9999.ebuild | 9 +++------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
index 4b3148a..aba7094 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
@@ -3,6 +3,7 @@ From: Priit Laes <plaes@plaes.org>
Date: Mon, 10 Sep 2012 18:49:43 +0300
Subject: [PATCH] Crappy patch to allow disabling kerberos requirement
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
---
configure.ac | 22 ++++++++++++++--------
panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++----
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild
index 49d5648..311c928 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.6.2.ebuild
@@ -120,12 +120,9 @@ pkg_setup() {
$(use_enable i18n ibus)
$(use_with socialweb libsocialweb)
$(use_enable systemd)
+ $(use_with v4l cheese)
$(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.
+ # XXX: $(use_with kerberos) # for 3.7.x
if ! use kerberos; then
G2CONF+=" KRB5_CONFIG=$(type -P true)"
fi
@@ -135,6 +132,7 @@ pkg_setup() {
src_prepare() {
# Make some panels optional; requires eautoreconf
epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=686840
epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
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 7e55ae0..311c928 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -114,19 +114,15 @@ pkg_setup() {
--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_with v4l cheese)
$(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.
+ # XXX: $(use_with kerberos) # for 3.7.x
if ! use kerberos; then
G2CONF+=" KRB5_CONFIG=$(type -P true)"
fi
@@ -136,6 +132,7 @@ pkg_setup() {
src_prepare() {
# Make some panels optional; requires eautoreconf
epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=686840
epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2012-12-07 20:02 Arun Raghavan
0 siblings, 0 replies; 23+ messages in thread
From: Arun Raghavan @ 2012-12-07 20:02 UTC (permalink / raw
To: gentoo-commits
commit: ab5dd28d687581b4d9ca163ce661ff87261712b4
Author: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 7 19:46:05 2012 +0000
Commit: Arun Raghavan <ford_prefect <AT> gentoo <DOT> org>
CommitDate: Fri Dec 7 19:57:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ab5dd28d
gnome-base/gnome-control-center: Add fix for PulseAudio > 2.1
Should be removed when 3.6.4 is released.
---
...ome-control-center-3.6.3-pulseaudio-3-fix.patch | 29 ++++++++++++++++++++
...ebuild => gnome-control-center-3.6.3-r1.ebuild} | 2 +
2 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch
new file mode 100644
index 0000000..80dc653
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch
@@ -0,0 +1,29 @@
+From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson@canonical.com>
+Date: Fri, 7 Dec 2012 16:22:09 +0530
+Subject: [PATCH] sound: Fix port handling for the unknown availability case
+
+The current code assumes that port availability transitions will be
+between YES and NO, and doesn't account for the fact that it may also be
+UNKNOWN. This causes spurious entries if the port availability
+transitions between YES and UNKNOWN.
+---
+ panels/sound/gvc-mixer-control.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
+index 34ddc0c..2f6cf34 100644
+--- a/panels/sound/gvc-mixer-control.c
++++ b/panels/sound/gvc-mixer-control.c
+@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control,
+ else {
+ for (i = 0; i < info->n_ports; i++) {
+ if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
+- if (card_port->available != info->ports[i]->available) {
++ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
+ card_port->available = info->ports[i]->available;
+ g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
+ gvc_mixer_card_get_index (card),
+--
+1.8.0
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.6.3.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
similarity index 97%
rename from gnome-base/gnome-control-center/gnome-control-center-3.6.3.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
index 311c928..95baa04 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.6.3.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.6.3-r1.ebuild
@@ -136,6 +136,8 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
+ # Needed for g-c-c 3.6.3 and PulseAudio >2.1. Remove in 3.6.4.
+ epatch "${FILESDIR}/${P}-pulseaudio-3-fix.patch"
[[ ${PV} != 9999 ]] && eautoreconf
gnome2_src_prepare
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2013-12-09 23:06 Gilles Dartiguelongue
0 siblings, 0 replies; 23+ messages in thread
From: Gilles Dartiguelongue @ 2013-12-09 23:06 UTC (permalink / raw
To: gentoo-commits
commit: 82be6afa59e3ea4b5ee41f5f1fd2b006b8a7bf6e
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 23:44:53 2013 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Dec 9 23:03:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=82be6afa
gnome-base/gnome-control-center: 3.8.6 → 3.10.2
---
...gnome-control-center-3.10.2-gentoo-paths.patch} | 79 +++--
.../gnome-control-center-3.10.2-optional.patch | 384 +++++++++++++++++++++
...enter-3.5.91-optional-bt-colord-goa-wacom.patch | 183 ----------
...e-control-center-3.5.91-optional-kerberos.patch | 239 -------------
...ome-control-center-3.6.3-pulseaudio-3-fix.patch | 29 --
.../gnome-control-center-3.10.2.ebuild | 175 ++++++++++
.../gnome-control-center-9999.ebuild | 159 +++++----
7 files changed, 693 insertions(+), 555 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
similarity index 55%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch
rename to gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
index 64b992d..8ef4033 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch
@@ -1,31 +1,35 @@
-Use Gentoo-appropriate absolute paths
+From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 8 Dec 2013 23:44:56 +0100
+Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo
-Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
---
---- a/panels/common/Makefile.am
-+++ b/panels/common/Makefile.am
-@@ -9,7 +9,7 @@
- $(LIBLANGUAGE_CFLAGS) \
- -DDATADIR=\""$(datadir)"\" \
- -DUIDIR=\""$(pkgdatadir)/ui"\" \
-- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+ -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
-
+ 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-host.c | 2 +-
+ 7 files changed, 12 insertions(+), 8 deletions(-)
+
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am
+index fc85592..133845f 100644
--- a/panels/datetime/Makefile.am
+++ b/panels/datetime/Makefile.am
-@@ -72,6 +72,7 @@
+@@ -24,6 +24,7 @@ AM_CPPFLAGS = \
+ $(DATETIME_PANEL_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DDATADIR="\"$(uidir)\"" \
-+ -DREALDATADIR="\"$(datadir)\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
$(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 @@
+@@ -38,11 +38,11 @@ int main (int argc, char **argv)
return 0;
}
@@ -39,6 +43,8 @@ Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
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 @@
@@ -50,6 +56,8 @@ Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
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 @@
@@ -64,21 +72,25 @@ Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
#endif
typedef struct _TzDB TzDB;
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am
+index 63a33b4..12e2e45 100644
--- a/panels/printers/Makefile.am
+++ b/panels/printers/Makefile.am
-@@ -12,6 +12,9 @@
+@@ -7,6 +7,9 @@ INCLUDES = \
+ $(SMBCLIENT_CFLAGS) \
+ -I$(top_srcdir)/shell/ \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DDATADIR="\"$(uidir)\"" \
-+ -DREALDATADIR="\"$(datadir)\"" \
-+ -DPREFIX="\"$(prefix)\"" \
-+ -DLIBEXECDIR="\"$(libexecdir)\"" \
++ -DREALDATADIR="\"$(datadir)\"" \
++ -DPREFIX="\"$(prefix)\"" \
++ -DLIBEXECDIR="\"$(libexecdir)\"" \
$(NULL)
- ccpanelsdir = $(PANELS_DIR)
+ noinst_LTLIBRARIES = libprinters.la
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c
+index 29b8173..24bcdf8 100644
--- a/panels/printers/cc-printers-panel.c
+++ b/panels/printers/cc-printers-panel.c
-@@ -2199,8 +2199,8 @@
+@@ -2428,8 +2428,8 @@ test_page_cb (GtkButton *button,
if (printer_name)
{
@@ -89,9 +101,11 @@ Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
NULL };
const gchar *testprint[] = { "%s/data/testprint",
"%s/data/testprint.ps",
+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
+index a994a61..51efe50 100644
--- a/panels/printers/pp-host.c
+++ b/panels/printers/pp-host.c
-@@ -251,7 +251,7 @@
+@@ -251,7 +251,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res,
data->devices->devices = NULL;
argv = g_new0 (gchar *, 3);
@@ -100,17 +114,6 @@ Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
argv[1] = g_strdup (priv->hostname);
/* Use SNMP to get printer's informations */
---- a/panels/user-accounts/Makefile.am
-+++ b/panels/user-accounts/Makefile.am
-@@ -10,7 +10,7 @@
- AM_CPPFLAGS = \
- -DDATADIR=\""$(datadir)"\" \
- -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
-- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+ -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
- -I$(srcdir)/../common/ \
--
-1.7.8.6
+1.8.3.2
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
new file mode 100644
index 0000000..0c4d111
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
@@ -0,0 +1,384 @@
+From 079e6b87816d96d73adaa5eeb2f8a1b620a0ae70 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 9 Dec 2013 23:23:13 +0100
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 140 ++++++++++++++++++++++++++------
+ panels/Makefile.am | 10 ++-
+ panels/user-accounts/um-realm-manager.c | 9 ++
+ shell/Makefile.am | 10 ++-
+ shell/cc-panel-loader.c | 8 ++
+ 5 files changed, 149 insertions(+), 28 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 19bebaf..8b4177a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -136,14 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.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],
++ [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 >= $GOA_REQUIRED_VERSION)
++ build_online_accounts=true
++fi
++if test "x$build_online_accounts" = xtrue ; then
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++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 >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- libsoup-2.4
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++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 >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++ 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)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -196,8 +240,24 @@ if test x${have_networkmanager} = xyes; then
+ fi
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
+- [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++ AC_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [case "${enableval}" in
++ yes) WANT_BLUETOOTH=yes ;;
++ no) WANT_BLUETOOTH=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++ esac],
++ [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++ # Check for gnome-bluetooth
++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
++ [have_bluetooth=yes], have_bluetooth=no)
++ have_bluetooth=yes
++fi
++
+ if test "x$have_bluetooth" = xyes ; then
+ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -282,15 +342,26 @@ case $host_os in
+ 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
+- clutter-gtk-1.0
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, [have_wacom=yes], [have_wacom=no])
+- if test x${have_wacom} = xyes; then
++ 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
++ clutter-gtk-1.0
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ have_wacom=yes
+ fi
+ fi
+ ;;
+@@ -301,16 +372,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++ [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++ if test "$KRB5_CONFIG" = "no"; then
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++ fi
+
++ AC_MSG_CHECKING(for krb5 libraries and flags)
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+
+@@ -547,6 +624,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ 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
+@@ -557,11 +639,21 @@ 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
+ AC_MSG_NOTICE([ Background panel Flickr support disabled])
+ 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
+ if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+- online-accounts \
+ region \
+ info \
+ sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ privacy \
+ sharing
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 1fd41ad..ce0988e 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -23,7 +23,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -697,6 +699,7 @@ login_closure_free (gpointer data)
+ g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+ const gchar *realm,
+@@ -760,12 +763,14 @@ login_perform_kinit (krb5_context k5,
+
+ return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+ GObject *object,
+ GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+ krb5_context k5 = NULL;
+ krb5_error_code code;
+@@ -843,6 +848,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+ if (k5)
+ krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++ _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index ad7a68f..cc968ac 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/libgd/libgd.la \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+ $(top_builddir)/panels/keyboard/libkeyboard.la \
+ $(top_builddir)/panels/mouse/libmouse-properties.la \
+ $(top_builddir)/panels/notifications/libnotifications.la \
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
+ $(top_builddir)/panels/power/libpower.la \
+ $(top_builddir)/panels/privacy/libprivacy.la \
+ $(top_builddir)/panels/region/libregion.la \
+@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
+
+ # Dbus service file
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 26576dc..8a92f95 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+@@ -87,7 +93,9 @@ static struct {
+ PANEL_TYPE("network", cc_network_panel_get_type ),
+ #endif
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
++#endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
+ #ifdef BUILD_PRINTERS
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
+--
+1.8.3.2
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-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
deleted file mode 100644
index aab50aa..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-Make wacom, colord, goa optional
-
-Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
---- 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 >= $GOA_REQUIRED_VERSION)
-+
-+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 >= $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],
-+ [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
-+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
-@@ -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.5.5,
-- [have_bluetooth=yes], have_bluetooth=no)
--AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
-+have_bluetooth=false
-+AC_ARG_ENABLE(bluetooth,
-+ AC_HELP_STRING([--disable-bluetooth],
-+ [disable bluetooth management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_BLUETOOTH=yes ;;
-+ no) WANT_BLUETOOTH=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
-+ esac],
-+ [WANT_BLUETOOTH=yes]) dnl Default value
-+
-+if test x$WANT_BLUETOOTH = xyes; then
-+ # Check for gnome-bluetooth
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
-+ have_bluetooth=true
-+fi
-+
-+AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
-
- # Check for CUPS 1.4 or newer
- AC_ARG_ENABLE([cups],
-@@ -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
-+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
-@@ -519,6 +588,11 @@
- 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
-@@ -529,6 +603,11 @@
- 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
- 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 \
-- color \
- display \
- mouse \
-- online-accounts \
- region \
- info \
- sound \
-@@ -15,6 +13,10 @@
- user-accounts \
- datetime
-
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -31,4 +33,8 @@
- SUBDIRS += bluetooth
- endif
-
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
deleted file mode 100644
index aba7094..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 88e3f2146b0740161dc3b2095dcf05c538b67e36 Mon Sep 17 00:00:00 2001
-From: Priit Laes <plaes@plaes.org>
-Date: Mon, 10 Sep 2012 18:49:43 +0300
-Subject: [PATCH] Crappy patch to allow disabling kerberos requirement
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
----
- configure.ac | 22 ++++++++++++++--------
- panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++----
- panels/user-accounts/um-realm-manager.c | 2 ++
- 3 files changed, 42 insertions(+), 12 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fa4b12f..c1e188f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -321,16 +321,22 @@ AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes
- ISO_CODES=iso-codes
-
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
-
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
-+ [enable_kerberos=yes])
-+
-+if test x"$enable_kerberos" != x"no" ; then
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+ if test "$KRB5_CONFIG" = "no"; then
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-+ fi
-
-+ AC_MSG_CHECKING(for krb5 libraries and flags)
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+fi
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
-
-diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
-index 9dbda5c..6b82980 100644
---- a/panels/user-accounts/um-account-dialog.c
-+++ b/panels/user-accounts/um-account-dialog.c
-@@ -26,10 +26,13 @@
- #include <gtk/gtk.h>
-
- #include "um-account-dialog.h"
--#include "um-realm-manager.h"
- #include "um-user-manager.h"
- #include "um-utils.h"
-
-+#ifdef KERBEROS
-+#include "um-realm-manager.h"
-+#endif
-+
- typedef enum {
- UM_LOCAL,
- UM_ENTERPRISE,
-@@ -41,6 +44,7 @@ static void mode_change (UmAccountDialog *self,
-
- static void dialog_validate (UmAccountDialog *self);
-
-+#ifdef KERBEROS
- static void on_join_login (GObject *source,
- GAsyncResult *result,
- gpointer user_data);
-@@ -48,6 +52,7 @@ static void on_join_login (GObject *source,
- static void on_realm_joined (GObject *source,
- GAsyncResult *result,
- gpointer user_data);
-+#endif
-
- #define UM_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \
- UmAccountDialogClass))
-@@ -83,6 +88,7 @@ struct _UmAccountDialog {
- gboolean enterprise_domain_chosen;
- GtkEntry *enterprise_login;
- GtkEntry *enterprise_password;
-+#ifdef KERBEROS
- UmRealmManager *realm_manager;
- UmRealmObject *selected_realm;
-
-@@ -92,6 +98,7 @@ struct _UmAccountDialog {
- GtkEntry *join_name;
- GtkEntry *join_password;
- gboolean join_prompted;
-+#endif
- };
-
- struct _UmAccountDialogClass {
-@@ -292,6 +299,7 @@ local_prepare (UmAccountDialog *self)
- gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0);
- }
-
-+#ifdef KERBEROS
- static gboolean
- enterprise_validate (UmAccountDialog *self)
- {
-@@ -461,7 +469,6 @@ on_join_response (GtkDialog *dialog,
- on_join_login,
- g_object_ref (self));
- }
--
- static void
- join_show_prompt (UmAccountDialog *self,
- GError *error)
-@@ -839,6 +846,7 @@ enterprise_prepare (UmAccountDialog *self)
- gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), "");
- gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), "");
- }
-+#endif
-
- static void
- dialog_validate (UmAccountDialog *self)
-@@ -849,9 +857,11 @@ dialog_validate (UmAccountDialog *self)
- case UM_LOCAL:
- valid = local_validate (self);
- break;
-+#ifdef KERBEROS
- case UM_ENTERPRISE:
- valid = enterprise_validate (self);
- break;
-+#endif
- default:
- valid = FALSE;
- break;
-@@ -937,12 +947,14 @@ on_local_toggle (GtkToggleButton *toggle,
- mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL);
- }
-
-+#ifdef KERBEROS
- static void
- on_enterprise_toggle (GtkToggleButton *toggle,
- gpointer user_data)
- {
- mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE);
- }
-+#endif
-
- static void
- mode_init (UmAccountDialog *self,
-@@ -954,15 +966,18 @@ mode_init (UmAccountDialog *self,
-
- widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area");
- self->mode_areas[UM_LOCAL] = widget;
-+#ifdef KERBEROS
- widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area");
- self->mode_areas[UM_ENTERPRISE] = widget;
--
-+#endif
- widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button");
- g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self);
- self->mode_buttons[UM_LOCAL] = widget;
-+#ifdef KERBEROS
- widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button");
- g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self);
- self->mode_buttons[UM_ENTERPRISE] = widget;
-+#endif
- }
-
- static void
-@@ -1022,8 +1037,10 @@ um_account_dialog_init (UmAccountDialog *self)
- self->container_widget = widget;
-
- local_init (self, builder);
-+#ifdef KERBEROS
- enterprise_init (self, builder);
- join_init (self, builder);
-+#endif
- mode_init (self, builder);
-
- g_object_unref (builder);
-@@ -1041,9 +1058,11 @@ um_account_dialog_response (GtkDialog *dialog,
- case UM_LOCAL:
- local_create_user (self);
- break;
-+#ifdef KERBEROS
- case UM_ENTERPRISE:
- enterprise_add_user (self);
- break;
-+#endif
- default:
- g_assert_not_reached ();
- }
-@@ -1064,6 +1083,7 @@ um_account_dialog_dispose (GObject *obj)
- if (self->cancellable)
- g_cancellable_cancel (self->cancellable);
-
-+#ifdef KERBEROS
- if (self->realmd_watch)
- g_bus_unwatch_name (self->realmd_watch);
- self->realmd_watch = 0;
-@@ -1075,7 +1095,7 @@ um_account_dialog_dispose (GObject *obj)
- g_object_unref (self->realm_manager);
- self->realm_manager = NULL;
- }
--
-+#endif
- G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj);
- }
-
-@@ -1128,7 +1148,9 @@ um_account_dialog_show (UmAccountDialog *self,
- self->cancellable = g_cancellable_new ();
-
- local_prepare (self);
-+#ifdef KERBEROS
- enterprise_prepare (self);
-+#endif
- mode_change (self, UM_LOCAL);
- dialog_validate (self);
-
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 301c905..25c055c 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -22,6 +22,7 @@
-
- #include "config.h"
-
-+#ifdef KERBEROS
- #include "um-realm-manager.h"
-
- #include <krb5/krb5.h>
-@@ -826,3 +827,4 @@ um_realm_login_finish (GAsyncResult *result,
-
- return TRUE;
- }
-+#endif
---
-1.7.12
-
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch
deleted file mode 100644
index 80dc653..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Fri, 7 Dec 2012 16:22:09 +0530
-Subject: [PATCH] sound: Fix port handling for the unknown availability case
-
-The current code assumes that port availability transitions will be
-between YES and NO, and doesn't account for the fact that it may also be
-UNKNOWN. This causes spurious entries if the port availability
-transitions between YES and UNKNOWN.
----
- panels/sound/gvc-mixer-control.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
-index 34ddc0c..2f6cf34 100644
---- a/panels/sound/gvc-mixer-control.c
-+++ b/panels/sound/gvc-mixer-control.c
-@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control,
- else {
- for (i = 0; i < info->n_ports; i++) {
- if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
-- if (card_port->available != info->ports[i]->available) {
-+ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
- card_port->available = info->ports[i]->available;
- g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
- gvc_mixer_card_get_index (card),
---
-1.8.0
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
new file mode 100644
index 0000000..9f0a88f
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.10.2.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +socialweb v4l"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+#
+# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
+# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
+#
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# FIXME: modemmanager is not optional
+# networkmanager is not optional
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.2:2
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.9.12:3
+ >=gnome-base/gsettings-desktop-schemas-3.9.91
+ >=gnome-base/gnome-desktop-3.9.90:3=
+ >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+ >=gnome-base/libgnomekbd-2.91.91
+
+ >=dev-libs/libpwquality-1.2.2
+ 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-2[glib]
+ >=sys-auth/polkit-0.97
+ >=sys-power/upower-0.9.1
+ >=x11-libs/libnotify-0.7.3:0=
+
+ >=gnome-extra/nm-applet-0.9.7.995
+ >=net-misc/networkmanager-0.9.8[modemmanager]
+ >=net-misc/modemmanager-0.7.990
+
+ virtual/opengl
+ x11-apps/xmodmap
+ x11-libs/libX11
+ x11-libs/libXxf86misc
+ >=x11-libs/libXi-1.2
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:= )
+ colord? (
+ net-libs/libsoup:2.4
+ >=x11-misc/colord-0.1.34 )
+ cups? (
+ >=net-print/cups-1.4[dbus]
+ >=net-fs/samba-3.6.14-r1[smbclient] )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
+ i18n? ( >=app-i18n/ibus-1.5.2 )
+ kerberos? ( app-crypt/mit-krb5 )
+ socialweb? ( net-libs/libsocialweb )
+ v4l? (
+ media-libs/gstreamer:1.0
+ media-libs/clutter-gtk:1.0
+ >=media-video/cheese-3.5.91 )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=media-libs/clutter-1.11.3:1.0
+ media-libs/clutter-gtk:1.0
+ >=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+RDEPEND="${COMMON_DEPEND}
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+ >=sys-apps/accountsservice-0.6.30
+ x11-themes/gnome-icon-theme-symbolic
+ colord? (
+ >=gnome-extra/gnome-color-manager-3
+ >=x11-misc/colord-0.1.34
+ >=x11-libs/colord-gtk-0.1.24 )
+ cups? (
+ >=app-admin/system-config-printer-gnome-1.3.5
+ net-print/cups-pk-helper )
+ input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+
+ !<gnome-base/gdm-2.91.94
+ !<gnome-extra/gnome-color-manager-3.1.2
+ !gnome-extra/gnome-media[pulseaudio]
+ !<gnome-extra/gnome-media-2.32.0-r300
+ !<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+ x11-proto/xf86miscproto
+ x11-proto/kbproto
+
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+
+ cups? ( sys-apps/sed )
+
+ gnome-base/gnome-common
+"
+# Needed for autoreconf
+# gnome-base/gnome-common
+
+src_prepare() {
+ # Gentoo handles completions in a different directory, bugs #465094 and #477390
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ shell/Makefile.am || die "sed completiondir failed"
+
+ # Make some panels and dependencies optional; requires eautoreconf
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ epatch "${FILESDIR}"/${PN}-3.10.2-optional.patch
+
+ # Fix some absolute paths to be appropriate for Gentoo
+ epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+ epatch_user
+
+ # top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to
+ # avoid libtoolize "We've already been run in this tree" warning, bug #484988
+ local d
+ for d in . egg-list-box; do
+ pushd "${d}" > /dev/null
+ AT_NOELIBTOOLIZE=yes eautoreconf
+ popd > /dev/null
+ done
+ elibtoolize --force
+
+ # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
+ # We need to touch timedated{c,h} to prevent them from being
+ # regenerated (bug #415901)
+ # Upstream think they should be removed, preventing compilation errors too
+ # (https://bugzilla.gnome.org/704822)
+ [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
+ [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-static \
+ --enable-documentation \
+ $(use_enable bluetooth) \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable i18n ibus) \
+ $(use_enable kerberos) \
+ $(use_with socialweb libsocialweb) \
+ $(use_with v4l cheese) \
+ $(use_enable input_devices_wacom wacom)
+}
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 73030ff..7d5c17a 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -6,38 +6,47 @@ EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
-inherit autotools eutils gnome2
+inherit autotools bash-completion-r1 eutils gnome2
if [[ ${PV} = 9999 ]]; then
inherit gnome2-live
fi
-DESCRIPTION="GNOME Desktop Configuration Tool"
-HOMEPAGE="http://www.gnome.org/"
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +networkmanager +socialweb systemd v4l"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +socialweb v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
fi
-# XXX: NetworkManager-0.9 support is automagic, make hard-dep once it's released
-#
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
+#
+# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
+# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
+#
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# FIXME: modemmanager is not optional
+# networkmanager is not optional
+
COMMON_DEPEND="
- >=dev-libs/glib-2.31:2
+ >=dev-libs/glib-2.37.2:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=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.6[colord?,policykit]
+ >=x11-libs/gtk+-3.9.12:3
+ >=gnome-base/gsettings-desktop-schemas-3.9.91
+ >=gnome-base/gnome-desktop-3.9.90:3=
+ >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
>=gnome-base/libgnomekbd-2.91.91
- app-text/iso-codes
- dev-libs/libpwquality
+ >=dev-libs/libpwquality-1.2.2
dev-libs/libxml2:2
gnome-base/gnome-menus:3
gnome-base/libgtop:2
@@ -47,44 +56,52 @@ COMMON_DEPEND="
>=media-sound/pulseaudio-2[glib]
>=sys-auth/polkit-0.97
>=sys-power/upower-0.9.1
- >=x11-libs/libnotify-0.7.3
+ >=x11-libs/libnotify-0.7.3:0=
+
+ >=gnome-extra/nm-applet-0.9.7.995
+ >=net-misc/networkmanager-0.9.8[modemmanager]
+ >=net-misc/modemmanager-0.7.990
+ virtual/opengl
x11-apps/xmodmap
x11-libs/libX11
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.5.5:= )
- colord? ( >=x11-misc/colord-0.1.8 )
- cups? ( >=net-print/cups-1.4[dbus] )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.5.90 )
- i18n? ( >=app-i18n/ibus-1.4.99 )
- input_devices_wacom? (
- >=dev-libs/libwacom-0.6
- >=x11-libs/libXi-1.2 )
- kerberos? ( virtual/krb5 )
- networkmanager? (
- >=gnome-extra/nm-applet-0.9.1.90
- >=net-misc/networkmanager-0.8.997 )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:= )
+ colord? (
+ net-libs/libsoup:2.4
+ >=x11-misc/colord-0.1.34 )
+ cups? (
+ >=net-print/cups-1.4[dbus]
+ >=net-fs/samba-3.6.14-r1[smbclient] )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
+ i18n? ( >=app-i18n/ibus-1.5.2 )
+ kerberos? ( app-crypt/mit-krb5 )
socialweb? ( net-libs/libsocialweb )
- systemd? ( >=sys-apps/systemd-31 )
v4l? (
media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
>=media-video/cheese-3.5.91 )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=media-libs/clutter-1.11.3:1.0
+ media-libs/clutter-gtk:1.0
+ >=x11-libs/libXi-1.2 )
"
# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
RDEPEND="${COMMON_DEPEND}
- gnome-base/gnome-settings-daemon[input_devices_wacom?]
- sys-apps/accountsservice
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+ >=sys-apps/accountsservice-0.6.30
x11-themes/gnome-icon-theme-symbolic
- colord? ( >=gnome-extra/gnome-color-manager-3 )
+ colord? (
+ >=gnome-extra/gnome-color-manager-3
+ >=x11-misc/colord-0.1.34
+ >=x11-libs/colord-gtk-0.1.24 )
cups? (
>=app-admin/system-config-printer-gnome-1.3.5
net-print/cups-pk-helper )
- !systemd? (
- app-admin/openrc-settingsd
- sys-auth/consolekit )
+ input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
!<gnome-base/gdm-2.91.94
!<gnome-extra/gnome-color-manager-3.1.2
@@ -94,6 +111,7 @@ RDEPEND="${COMMON_DEPEND}
"
# PDEPEND to avoid circular dependency
PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
DEPEND="${COMMON_DEPEND}
x11-proto/xproto
x11-proto/xf86miscproto
@@ -113,43 +131,52 @@ DEPEND="${COMMON_DEPEND}
# gnome-base/gnome-common
src_prepare() {
- # Make some panels optional; requires eautoreconf
- epatch "${FILESDIR}/${PN}-3.5.91-optional-bt-colord-goa-wacom.patch"
- # https://bugzilla.gnome.org/show_bug.cgi?id=686840
- epatch "${FILESDIR}/${PN}-3.5.91-optional-kerberos.patch"
- # Fix some absolute paths to be appropriate for Gentoo
- epatch "${FILESDIR}/${PN}-3.5.91-gentoo-paths.patch"
- # Needed for g-c-c 3.6.3 and PulseAudio >2.1. Remove in 3.6.4.
- epatch "${FILESDIR}/${P}-pulseaudio-3-fix.patch"
- [[ ${PV} != 9999 ]] && eautoreconf
+ # Gentoo handles completions in a different directory, bugs #465094 and #477390
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ shell/Makefile.am || die "sed completiondir failed"
- gnome2_src_prepare
+ # Make some panels and dependencies optional; requires eautoreconf
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ epatch "${FILESDIR}"/${PN}-3.10.2-optional.patch
- # panels/datetime/Makefile.am gets touched as a result of something in our
- # src_prepare(). We need to touch timedated{c,h} to prevent them from being
+ # Fix some absolute paths to be appropriate for Gentoo
+ epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+ epatch_user
+
+ # top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to
+ # avoid libtoolize "We've already been run in this tree" warning, bug #484988
+ local d
+ for d in . egg-list-box; do
+ pushd "${d}" > /dev/null
+ AT_NOELIBTOOLIZE=yes eautoreconf
+ popd > /dev/null
+ done
+ elibtoolize --force
+
+ # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
+ # We need to touch timedated{c,h} to prevent them from being
# regenerated (bug #415901)
- [[ -f panels/datetime/timedated.h ]] && touch panels/datetime/timedated.h
- [[ -f panels/datetime/timedated.c ]] && touch panels/datetime/timedated.c
+ # Upstream think they should be removed, preventing compilation errors too
+ # (https://bugzilla.gnome.org/704822)
+ [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
+ [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+ gnome2_src_prepare
}
src_configure() {
- G2CONF="${G2CONF}
- --disable-update-mimedb
- --disable-static
- --enable-documentation
- $(use_enable bluetooth)
- $(use_enable colord color)
- $(use_enable cups)
- $(use_enable gnome-online-accounts goa)
- $(use_enable i18n ibus)
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-static \
+ --enable-documentation \
+ $(use_enable bluetooth) \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable i18n ibus) \
+ $(use_enable kerberos) \
+ $(use_with socialweb libsocialweb) \
+ $(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
- $(use_with socialweb libsocialweb)
- $(use_enable systemd)
- $(use_with v4l cheese)"
- # XXX: $(use_with kerberos) # for 3.7.x
- if ! use kerberos; then
- G2CONF+=" KRB5_CONFIG=$(type -P true)"
- fi
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- gnome2_src_configure
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2014-04-20 18:17 Gilles Dartiguelongue
0 siblings, 0 replies; 23+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
To: gentoo-commits
commit: a31bb849caf844d3521e8d29c579e65a4ddb420f
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 15:20:28 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 15:48:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a31bb849
gnome-base/gnome-control-center: QAed
* Cosmetic changes for dependencies.
* Lower gnome-bluetooth dependency per configure, not sure why it was
3.11.3.
* Drop old patch revision.
* Fix keywords.
* Sync live ebuild.
---
.../gnome-control-center-3.10.2-optional.patch | 384 ---------------------
.../gnome-control-center-3.12.0.ebuild | 11 +-
.../gnome-control-center-9999.ebuild | 17 +-
3 files changed, 14 insertions(+), 398 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
deleted file mode 100644
index 0c4d111..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-optional.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-From 079e6b87816d96d73adaa5eeb2f8a1b620a0ae70 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 9 Dec 2013 23:23:13 +0100
-Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
-
-Upstream is not interested in any part of this patch:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=686840
-https://bugzilla.gnome.org/show_bug.cgi?id=697478
-https://bugzilla.gnome.org/show_bug.cgi?id=700145
-
-Dropped mm from this revision of the patch since it appears more
-complicated than ever to split it from the network panel.
-
-Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
----
- configure.ac | 140 ++++++++++++++++++++++++++------
- panels/Makefile.am | 10 ++-
- panels/user-accounts/um-realm-manager.c | 9 ++
- shell/Makefile.am | 10 ++-
- shell/cc-panel-loader.c | 8 ++
- 5 files changed, 149 insertions(+), 28 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 19bebaf..8b4177a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -136,14 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.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],
-+ [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 >= $GOA_REQUIRED_VERSION)
-+ build_online_accounts=true
-+fi
-+if test "x$build_online_accounts" = xtrue ; then
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
-+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 >= $COLORD_REQUIRED_VERSION
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-- libsoup-2.4
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+
-+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 >= $COLORD_REQUIRED_VERSION
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+ libsoup-2.4
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-+ 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)
-+
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -196,8 +240,24 @@ if test x${have_networkmanager} = xyes; then
- fi
-
- # Check for gnome-bluetooth
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
-- [have_bluetooth=yes], have_bluetooth=no)
-+have_bluetooth=no
-+AC_ARG_ENABLE(bluetooth,
-+ AC_HELP_STRING([--disable-bluetooth],
-+ [disable bluetooth management panel]),
-+ [case "${enableval}" in
-+ yes) WANT_BLUETOOTH=yes ;;
-+ no) WANT_BLUETOOTH=no ;;
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
-+ esac],
-+ [WANT_BLUETOOTH=yes]) dnl Default value
-+
-+if test x$WANT_BLUETOOTH = xyes; then
-+ # Check for gnome-bluetooth
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
-+ [have_bluetooth=yes], have_bluetooth=no)
-+ have_bluetooth=yes
-+fi
-+
- if test "x$have_bluetooth" = xyes ; then
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
- fi
-@@ -282,15 +342,26 @@ case $host_os in
- 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
-- clutter-gtk-1.0
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, [have_wacom=yes], [have_wacom=no])
-- if test x${have_wacom} = xyes; then
-+ 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
-+ clutter-gtk-1.0
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
-+ have_wacom=yes
- fi
- fi
- ;;
-@@ -301,16 +372,22 @@ esac
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
-
- # Kerberos kerberos support
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
--if test "$KRB5_CONFIG" = "no"; then
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
--fi
--
--AC_MSG_CHECKING(for krb5 libraries and flags)
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
--KRB5_LIBS="`$KRB5_CONFIG --libs`"
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+AC_ARG_ENABLE([kerberos],
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
-+ [enable_kerberos=yes])
-+
-+if test x"$enable_kerberos" != x"no" ; then
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-+ if test "$KRB5_CONFIG" = "no"; then
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-+ fi
-
-+ AC_MSG_CHECKING(for krb5 libraries and flags)
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`"
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
-+fi
- AC_SUBST(KRB5_CFLAGS)
- AC_SUBST(KRB5_LIBS)
-
-@@ -547,6 +624,11 @@ if test "x$have_bluetooth" = "xyes"; then
- 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
-@@ -557,11 +639,21 @@ 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
- AC_MSG_NOTICE([ Background panel Flickr support disabled])
- 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
- if test "x$have_wacom" = "xyes"; then
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
- else
-diff --git a/panels/Makefile.am b/panels/Makefile.am
-index 9961c25..0c54622 100644
---- a/panels/Makefile.am
-+++ b/panels/Makefile.am
-@@ -2,11 +2,9 @@ SUBDIRS= \
- common \
- background \
- power \
-- color \
- display \
- mouse \
- notifications \
-- online-accounts \
- region \
- info \
- sound \
-@@ -18,6 +16,10 @@ SUBDIRS= \
- privacy \
- sharing
-
-+if BUILD_COLOR
-+SUBDIRS += color
-+endif
-+
- if BUILD_WACOM
- SUBDIRS += wacom
- endif
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
- SUBDIRS += bluetooth
- endif
-
-+if BUILD_ONLINE_ACCOUNTS
-+SUBDIRS += online-accounts
-+endif
-+
- -include $(top_srcdir)/git.mk
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
-index 1fd41ad..ce0988e 100644
---- a/panels/user-accounts/um-realm-manager.c
-+++ b/panels/user-accounts/um-realm-manager.c
-@@ -23,7 +23,9 @@
-
- #include "um-realm-manager.h"
-
-+#ifdef HAVE_KERBEROS
- #include <krb5/krb5.h>
-+#endif
-
- #include <glib.h>
- #include <glib/gi18n.h>
-@@ -697,6 +699,7 @@ login_closure_free (gpointer data)
- g_slice_free (LoginClosure, login);
- }
-
-+#ifdef HAVE_KERBEROS
- static krb5_error_code
- login_perform_kinit (krb5_context k5,
- const gchar *realm,
-@@ -760,12 +763,14 @@ login_perform_kinit (krb5_context k5,
-
- return code;
- }
-+#endif /* HAVE_KERBEROS */
-
- static void
- kinit_thread_func (GSimpleAsyncResult *async,
- GObject *object,
- GCancellable *cancellable)
- {
-+#ifdef HAVE_KERBEROS
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
- krb5_context k5 = NULL;
- krb5_error_code code;
-@@ -843,6 +848,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
-
- if (k5)
- krb5_free_context (k5);
-+#else /* HAVE_KERBEROS */
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
-+ _("gnome-control-center was built without kerberos support"));
-+#endif
- }
-
- void
-diff --git a/shell/Makefile.am b/shell/Makefile.am
-index ad7a68f..cc968ac 100644
---- a/shell/Makefile.am
-+++ b/shell/Makefile.am
-@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \
- $(top_builddir)/libgd/libgd.la \
- $(top_builddir)/panels/common/liblanguage.la \
- $(top_builddir)/panels/background/libbackground.la \
-- $(top_builddir)/panels/color/libcolor.la \
- $(top_builddir)/panels/datetime/libdate_time.la \
- $(top_builddir)/panels/display/libdisplay.la \
- $(top_builddir)/panels/info/libinfo.la \
- $(top_builddir)/panels/keyboard/libkeyboard.la \
- $(top_builddir)/panels/mouse/libmouse-properties.la \
- $(top_builddir)/panels/notifications/libnotifications.la \
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
- $(top_builddir)/panels/power/libpower.la \
- $(top_builddir)/panels/privacy/libprivacy.la \
- $(top_builddir)/panels/region/libregion.la \
-@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
- endif
-
-+if BUILD_COLOR
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
-+endif
-+
-+if BUILD_ONLINE_ACCOUNTS
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
-+endif
-+
- AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
-
- # Dbus service file
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
-index 26576dc..8a92f95 100644
---- a/shell/cc-panel-loader.c
-+++ b/shell/cc-panel-loader.c
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
- #ifdef BUILD_BLUETOOTH
- extern GType cc_bluetooth_panel_get_type (void);
- #endif /* BUILD_BLUETOOTH */
-+#ifdef BUILD_COLOR
- extern GType cc_color_panel_get_type (void);
-+#endif /* BUILD_COLOR */
- extern GType cc_date_time_panel_get_type (void);
- extern GType cc_display_panel_get_type (void);
- extern GType cc_info_panel_get_type (void);
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
- extern GType cc_network_panel_get_type (void);
- #endif /* BUILD_NETWORK */
- extern GType cc_notifications_panel_get_type (void);
-+#ifdef BUILD_ONLINE_ACCOUNTS
- extern GType cc_goa_panel_get_type (void);
-+#endif /* BUILD_ONLINE_ACCOUNTS */
- extern GType cc_power_panel_get_type (void);
- #ifdef BUILD_PRINTERS
- extern GType cc_printers_panel_get_type (void);
-@@ -77,7 +81,9 @@ static struct {
- #ifdef BUILD_BLUETOOTH
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
- #endif
-+#ifdef BUILD_COLOR
- PANEL_TYPE("color", cc_color_panel_get_type ),
-+#endif
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
- PANEL_TYPE("display", cc_display_panel_get_type ),
- PANEL_TYPE("info", cc_info_panel_get_type ),
-@@ -87,7 +93,9 @@ static struct {
- PANEL_TYPE("network", cc_network_panel_get_type ),
- #endif
- PANEL_TYPE("notifications", cc_notifications_panel_get_type),
-+#ifdef BUILD_ONLINE_ACCOUNTS
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
-+#endif
- PANEL_TYPE("power", cc_power_panel_get_type ),
- #ifdef BUILD_PRINTERS
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
---
-1.8.3.2
-
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild
index 26f5b1e..db37e7b 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.10.3.ebuild,v 1.3 2014/03/09 11:58:09 pacho Exp $
+# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
@@ -14,7 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
@@ -41,13 +41,14 @@ COMMON_DEPEND="
gnome-base/gnome-menus:3
gnome-base/libgtop:2
media-libs/fontconfig
+ >=media-libs/grilo-0.2.6:0.2
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
>=sys-auth/polkit-0.97
- >=sys-power/upower-0.99.0
+ >=sys-power/upower-0.99
>=x11-libs/libnotify-0.7.3:0=
- >=media-libs/grilo-0.2.6:0.2
+
>=gnome-extra/nm-applet-0.9.7.995
>=net-misc/networkmanager-0.9.8[modemmanager]
>=net-misc/modemmanager-0.7.990
@@ -58,7 +59,7 @@ COMMON_DEPEND="
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.3:= )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34 )
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 13d6d21..524dd38 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos +socialweb v4l"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
@@ -38,11 +38,11 @@ QA_CONFIGURE_OPTIONS=".*"
# networkmanager is not optional
COMMON_DEPEND="
- >=dev-libs/glib-2.37.2:2
+ >=dev-libs/glib-2.39.91:2
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.9.12:3
+ >=x11-libs/gtk+-3.11.1:3
>=gnome-base/gsettings-desktop-schemas-3.9.91
- >=gnome-base/gnome-desktop-3.9.90:3=
+ >=gnome-base/gnome-desktop-3.11.3:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
>=gnome-base/libgnomekbd-2.91.91
@@ -51,11 +51,12 @@ COMMON_DEPEND="
gnome-base/gnome-menus:3
gnome-base/libgtop:2
media-libs/fontconfig
+ >=media-libs/grilo-0.2.6:0.2
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
>=sys-auth/polkit-0.97
- >=sys-power/upower-0.9.1
+ >=sys-power/upower-0.99
>=x11-libs/libnotify-0.7.3:0=
>=gnome-extra/nm-applet-0.9.7.995
@@ -68,7 +69,7 @@ COMMON_DEPEND="
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.9.3:= )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34 )
@@ -78,7 +79,6 @@ COMMON_DEPEND="
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
i18n? ( >=app-i18n/ibus-1.5.2 )
kerberos? ( app-crypt/mit-krb5 )
- socialweb? ( net-libs/libsocialweb )
v4l? (
media-libs/gstreamer:1.0
media-libs/clutter-gtk:1.0
@@ -137,7 +137,7 @@ src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.10.2-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.12.0-optional.patch
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
@@ -176,7 +176,6 @@ src_configure() {
$(use_enable gnome-online-accounts goa) \
$(use_enable i18n ibus) \
$(use_enable kerberos) \
- $(use_with socialweb libsocialweb) \
$(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2014-04-20 18:17 Gilles Dartiguelongue
0 siblings, 0 replies; 23+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-20 18:17 UTC (permalink / raw
To: gentoo-commits
commit: 383e5745db099c5e42eb582b0437fbbe683c78ee
Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 17 00:31:51 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Apr 20 15:48:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=383e5745
gnome-base/gnome-control-center: 3.10.3 → 3.12.0
Bump gnome-control-center, rebasing the optional patch and updating the appropriate deps.
---
.../gnome-control-center-3.12.0-optional.patch | 353 +++++++++++++++++++++
.../gnome-control-center-3.12.0.ebuild | 162 ++++++++++
2 files changed, 515 insertions(+)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
new file mode 100644
index 0000000..f1a626e
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
@@ -0,0 +1,353 @@
+diff --git a/configure.ac b/configure.ac
+index 4100481..f5f5d02 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,13 +140,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.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],
++ [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 >= $GOA_REQUIRED_VERSION)
++ build_online_accounts=true
++fi
++if test "x$build_online_accounts" = xtrue ; then
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++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.99.0
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+- colord >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- libsoup-2.4
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++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 >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++ 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)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -206,8 +251,25 @@ fi
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1,
+- [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++ AC_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [case "${enableval}" in
++ yes) WANT_BLUETOOTH=yes ;;
++ no) WANT_BLUETOOTH=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++ esac],
++ [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++ # Check for gnome-bluetooth
++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
++ [have_bluetooth=yes], have_bluetooth=no)
++ have_bluetooth=yes
++fi
++
++
+ if test "x$have_bluetooth" = xyes ; then
+ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -292,15 +354,26 @@ case $host_os in
+ 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
+- clutter-gtk-1.0
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, [have_wacom=yes], [have_wacom=no])
+- if test x${have_wacom} = xyes; then
++ 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
++ clutter-gtk-1.0
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ have_wacom=yes
+ fi
+ fi
+ ;;
+@@ -311,16 +384,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++ [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++ if test "$KRB5_CONFIG" = "no"; then
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++ fi
+
++ AC_MSG_CHECKING(for krb5 libraries and flags)
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+
+@@ -539,6 +618,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ 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
+@@ -549,6 +633,16 @@ 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$build_wacom" = "xtrue"; then
++ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
++else
++ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+- online-accounts \
+ region \
+ info \
+ sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ privacy \
+ sharing
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 0849160..58d50a6 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -696,6 +698,7 @@ login_closure_free (gpointer data)
+ g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+ const gchar *realm,
+@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5,
+
+ return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+ GObject *object,
+ GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+ krb5_context k5 = NULL;
+ krb5_error_code code;
+@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+ if (k5)
+ krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++ _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index ad7a68f..cc968ac 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/libgd/libgd.la \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+ $(top_builddir)/panels/keyboard/libkeyboard.la \
+ $(top_builddir)/panels/mouse/libmouse-properties.la \
+ $(top_builddir)/panels/notifications/libnotifications.la \
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
+ $(top_builddir)/panels/power/libpower.la \
+ $(top_builddir)/panels/privacy/libprivacy.la \
+ $(top_builddir)/panels/region/libregion.la \
+@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
+
+ # Dbus service file
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 26576dc..8a92f95 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+@@ -87,7 +93,9 @@ static struct {
+ PANEL_TYPE("network", cc_network_panel_get_type ),
+ #endif
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
++#endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
+ #ifdef BUILD_PRINTERS
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild
new file mode 100644
index 0000000..26f5b1e
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 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.10.3.ebuild,v 1.3 2014/03/09 11:58:09 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+
+inherit autotools bash-completion-r1 eutils gnome2
+
+DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
+HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
+
+LICENSE="GPL-2+"
+SLOT="2"
+IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+
+# False positives caused by nested configure scripts
+QA_CONFIGURE_OPTIONS=".*"
+
+# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
+# g-s-d[policykit] needed for bug #403527
+#
+# kerberos unfortunately means mit-krb5; build fails with heimdal
+
+# FIXME: modemmanager is not optional
+# networkmanager is not optional
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.39.91:2
+ >=x11-libs/gdk-pixbuf-2.23.0:2
+ >=x11-libs/gtk+-3.11.1:3
+ >=gnome-base/gsettings-desktop-schemas-3.9.91
+ >=gnome-base/gnome-desktop-3.11.3:3=
+ >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+ >=gnome-base/libgnomekbd-2.91.91
+
+ >=dev-libs/libpwquality-1.2.2
+ 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-2[glib]
+ >=sys-auth/polkit-0.97
+ >=sys-power/upower-0.99.0
+ >=x11-libs/libnotify-0.7.3:0=
+ >=media-libs/grilo-0.2.6:0.2
+ >=gnome-extra/nm-applet-0.9.7.995
+ >=net-misc/networkmanager-0.9.8[modemmanager]
+ >=net-misc/modemmanager-0.7.990
+
+ virtual/opengl
+ x11-apps/xmodmap
+ x11-libs/libX11
+ x11-libs/libXxf86misc
+ >=x11-libs/libXi-1.2
+
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.3:= )
+ colord? (
+ net-libs/libsoup:2.4
+ >=x11-misc/colord-0.1.34 )
+ cups? (
+ >=net-print/cups-1.4[dbus]
+ || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.9.90 )
+ i18n? ( >=app-i18n/ibus-1.5.2 )
+ kerberos? ( app-crypt/mit-krb5 )
+ v4l? (
+ media-libs/gstreamer:1.0
+ media-libs/clutter-gtk:1.0
+ >=media-video/cheese-3.5.91 )
+ input_devices_wacom? (
+ >=dev-libs/libwacom-0.7
+ >=media-libs/clutter-1.11.3:1.0
+ media-libs/clutter-gtk:1.0
+ >=x11-libs/libXi-1.2 )
+"
+# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x
+RDEPEND="${COMMON_DEPEND}
+ || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
+ >=sys-apps/accountsservice-0.6.30
+ x11-themes/gnome-icon-theme-symbolic
+ colord? (
+ >=gnome-extra/gnome-color-manager-3
+ >=x11-misc/colord-0.1.34
+ >=x11-libs/colord-gtk-0.1.24 )
+ cups? (
+ >=app-admin/system-config-printer-gnome-1.3.5
+ net-print/cups-pk-helper )
+ input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
+
+ !<gnome-base/gdm-2.91.94
+ !<gnome-extra/gnome-color-manager-3.1.2
+ !gnome-extra/gnome-media[pulseaudio]
+ !<gnome-extra/gnome-media-2.32.0-r300
+ !<net-wireless/gnome-bluetooth-3.3.2
+"
+# PDEPEND to avoid circular dependency
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
+
+DEPEND="${COMMON_DEPEND}
+ x11-proto/xproto
+ x11-proto/xf86miscproto
+ x11-proto/kbproto
+
+ dev-libs/libxml2:2
+ dev-libs/libxslt
+ >=dev-util/intltool-0.40.1
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+
+ cups? ( sys-apps/sed )
+
+ gnome-base/gnome-common
+"
+# Needed for autoreconf
+# gnome-base/gnome-common
+
+src_prepare() {
+ # Gentoo handles completions in a different directory, bugs #465094 and #477390
+ sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+ shell/Makefile.am || die "sed completiondir failed"
+
+ # Make some panels and dependencies optional; requires eautoreconf
+ # https://bugzilla.gnome.org/686840, 697478, 700145
+ epatch "${FILESDIR}"/${PN}-3.12.0-optional.patch
+
+ # Fix some absolute paths to be appropriate for Gentoo
+ epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
+
+ epatch_user
+
+ eautoreconf
+
+ # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
+ # We need to touch timedated{c,h} to prevent them from being
+ # regenerated (bug #415901)
+ # Upstream think they should be removed, preventing compilation errors too
+ # (https://bugzilla.gnome.org/704822)
+ [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
+ [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-update-mimedb \
+ --disable-static \
+ --enable-documentation \
+ $(use_enable bluetooth) \
+ $(use_enable colord color) \
+ $(use_enable cups) \
+ $(use_enable gnome-online-accounts goa) \
+ $(use_enable i18n ibus) \
+ $(use_enable kerberos) \
+ $(use_with v4l cheese) \
+ $(use_enable input_devices_wacom wacom)
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2014-04-25 21:07 Gilles Dartiguelongue
0 siblings, 0 replies; 23+ messages in thread
From: Gilles Dartiguelongue @ 2014-04-25 21:07 UTC (permalink / raw
To: gentoo-commits
commit: ac397260143baaf7e7bcf8e922f4342a696ea6b2
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 24 22:08:00 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Fri Apr 25 21:06:50 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ac397260
gnome-base/gnome-control-center: 3.12.0 → 3.12.1
---
... => gnome-control-center-3.12.1-optional.patch} | 58 ++++++++++++++++------
...0.ebuild => gnome-control-center-3.12.1.ebuild} | 2 +-
2 files changed, 45 insertions(+), 15 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
similarity index 87%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
rename to gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
index f1a626e..6662e0b 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.0-optional.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
@@ -1,11 +1,35 @@
+From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 146 ++++++++++++++++++++++++++------
+ panels/Makefile.am | 10 ++-
+ panels/user-accounts/um-realm-manager.c | 9 ++
+ shell/Makefile.am | 10 ++-
+ shell/cc-panel-loader.c | 8 ++
+ 5 files changed, 153 insertions(+), 30 deletions(-)
+
diff --git a/configure.ac b/configure.ac
-index 4100481..f5f5d02 100644
+index 511f78d..f82108e 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -140,13 +140,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+@@ -139,14 +139,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
- PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+-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,
@@ -66,7 +90,7 @@ index 4100481..f5f5d02 100644
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -206,8 +251,25 @@ fi
+@@ -206,8 +250,25 @@ fi
AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
# Check for gnome-bluetooth
@@ -85,7 +109,7 @@ index 4100481..f5f5d02 100644
+
+if test x$WANT_BLUETOOTH = xyes; then
+ # Check for gnome-bluetooth
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.9.3,
++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1,
+ [have_bluetooth=yes], have_bluetooth=no)
+ have_bluetooth=yes
+fi
@@ -94,7 +118,7 @@ index 4100481..f5f5d02 100644
if test "x$have_bluetooth" = xyes ; then
AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
fi
-@@ -292,15 +354,26 @@ case $host_os in
+@@ -292,15 +353,27 @@ case $host_os in
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
have_wacom=no
else
@@ -103,8 +127,10 @@ index 4100481..f5f5d02 100644
- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
- clutter-gtk-1.0
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION, [have_wacom=yes], [have_wacom=no])
-- if test x${have_wacom} = xyes; then
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+- have_wacom=yes
+- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
+ AC_ARG_ENABLE(wacom,
+ AC_HELP_STRING([--disable-wacom],
+ [disable wacom management panel]),
@@ -122,13 +148,14 @@ index 4100481..f5f5d02 100644
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ clutter-gtk-1.0
+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
+ have_wacom=yes
- fi
++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ fi
fi
;;
-@@ -311,16 +384,22 @@ esac
+ *)
+@@ -310,16 +383,22 @@ esac
AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
# Kerberos kerberos support
@@ -160,7 +187,7 @@ index 4100481..f5f5d02 100644
AC_SUBST(KRB5_CFLAGS)
AC_SUBST(KRB5_LIBS)
-@@ -539,6 +618,11 @@ if test "x$have_bluetooth" = "xyes"; then
+@@ -538,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then
else
AC_MSG_NOTICE([ Bluetooth panel disabled])
fi
@@ -172,7 +199,7 @@ index 4100481..f5f5d02 100644
if test "x$enable_cups" = "xyes"; then
AC_MSG_NOTICE([** CUPS (Printers panel)])
else
-@@ -549,6 +633,16 @@ if test "x$have_cheese" = "xyes"; then
+@@ -548,6 +632,16 @@ if test "x$have_cheese" = "xyes"; then
else
AC_MSG_NOTICE([ Users panel webcam support disabled])
fi
@@ -351,3 +378,6 @@ index 26576dc..8a92f95 100644
PANEL_TYPE("power", cc_power_panel_get_type ),
#ifdef BUILD_PRINTERS
PANEL_TYPE("printers", cc_printers_panel_get_type ),
+--
+1.9.0
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
similarity index 98%
rename from gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
index db37e7b..7abf471 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.12.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.12.1.ebuild
@@ -127,7 +127,7 @@ src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.12.0-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.12.1-optional.patch
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2014-10-12 23:19 Gilles Dartiguelongue
0 siblings, 0 replies; 23+ messages in thread
From: Gilles Dartiguelongue @ 2014-10-12 23:19 UTC (permalink / raw
To: gentoo-commits
commit: 3d31378518b25642ce0d497f0e764bb385918e79
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 12 22:26:51 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Oct 12 23:19:09 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d313785
gnome-base/gnome-control-center: update patch for 3.14
---
... => gnome-control-center-3.14.0-optional.patch} | 200 ++++++++++++++++++---
.../gnome-control-center-3.14.0.ebuild | 2 +-
.../gnome-control-center-9999.ebuild | 2 +-
3 files changed, 179 insertions(+), 25 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch
similarity index 66%
rename from gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
rename to gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch
index 6662e0b..a161658 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.12.1-optional.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch
@@ -1,4 +1,4 @@
-From a485992913ec84a4c558cad535dd8a2ab14b0c19 Mon Sep 17 00:00:00 2001
+From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Fri, 25 Apr 2014 22:17:24 +0200
Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
@@ -14,24 +14,38 @@ complicated than ever to split it from the network panel.
Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
---
- configure.ac | 146 ++++++++++++++++++++++++++------
- panels/Makefile.am | 10 ++-
+ configure.ac | 157 ++++++++++++++++++++++++++------
+ panels/Makefile.am | 10 +-
+ panels/background/Makefile.am | 8 +-
+ panels/background/bg-pictures-source.c | 20 ++++
panels/user-accounts/um-realm-manager.c | 9 ++
- shell/Makefile.am | 10 ++-
+ shell/Makefile.am | 10 +-
shell/cc-panel-loader.c | 8 ++
- 5 files changed, 153 insertions(+), 30 deletions(-)
+ 7 files changed, 186 insertions(+), 36 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 511f78d..f82108e 100644
+index fe723d5..f882e23 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -139,14 +139,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+- goa-1.0 >= $GOA_REQUIRED_VERSION
+- grilo-0.2 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+
+build_online_accounts=false
++background_online_accounts=
+AC_ARG_ENABLE(goa,
+ AC_HELP_STRING([--disable-goa],
+ [disable online accounts management panel]),
@@ -45,6 +59,7 @@ index 511f78d..f82108e 100644
+if test x$WANT_ONLINE_ACCOUNTS = xyes; then
+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
+ build_online_accounts=true
++ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
+fi
+if test "x$build_online_accounts" = xtrue ; then
+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
@@ -53,6 +68,10 @@ index 511f78d..f82108e 100644
+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
+
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++ $background_online_accounts)
++
PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
@@ -73,11 +92,12 @@ index 511f78d..f82108e 100644
+ [WANT_COLOR=yes]) dnl Default value
+
+if test x$WANT_COLOR = xyes; then
++
+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
-+ colord >= $COLORD_REQUIRED_VERSION
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
-+ libsoup-2.4
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++ colord >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+ build_color=true
+fi
+if test "x$build_color" = xtrue ; then
@@ -90,7 +110,7 @@ index 511f78d..f82108e 100644
PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -206,8 +250,25 @@ fi
+@@ -206,8 +253,25 @@ fi
AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
# Check for gnome-bluetooth
@@ -118,7 +138,7 @@ index 511f78d..f82108e 100644
if test "x$have_bluetooth" = xyes ; then
AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
fi
-@@ -292,15 +353,27 @@ case $host_os in
+@@ -292,15 +356,27 @@ case $host_os in
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
have_wacom=no
else
@@ -155,7 +175,7 @@ index 511f78d..f82108e 100644
fi
;;
*)
-@@ -310,16 +383,22 @@ esac
+@@ -310,16 +386,22 @@ esac
AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
# Kerberos kerberos support
@@ -187,7 +207,7 @@ index 511f78d..f82108e 100644
AC_SUBST(KRB5_CFLAGS)
AC_SUBST(KRB5_LIBS)
-@@ -538,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then
+@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then
else
AC_MSG_NOTICE([ Bluetooth panel disabled])
fi
@@ -199,7 +219,7 @@ index 511f78d..f82108e 100644
if test "x$enable_cups" = "xyes"; then
AC_MSG_NOTICE([** CUPS (Printers panel)])
else
-@@ -548,6 +632,16 @@ if test "x$have_cheese" = "xyes"; then
+@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then
else
AC_MSG_NOTICE([ Users panel webcam support disabled])
fi
@@ -252,6 +272,140 @@ index 9961c25..0c54622 100644
+endif
+
-include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb8017..bde4cdf 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ cc-background-chooser-dialog.c \
+ cc-background-chooser-dialog.h \
+- cc-background-grilo-miner.c \
+- cc-background-grilo-miner.h \
+ cc-background-item.c \
+ cc-background-item.h \
+ cc-background-xml.c \
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
+ bg-colors-source.c \
+ bg-colors-source.h
+
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES += \
++ cc-background-grilo-miner.c \
++ cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
+ libbackground_la_SOURCES = \
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index c165fa3..78ef4a5 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+
+ #include "bg-pictures-source.h"
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+ GCancellable *cancellable;
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ CcBackgroundGriloMiner *grl_miner;
++#endif
+
+ GnomeDesktopThumbnailFactory *thumb_factory;
+
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+ g_clear_object (&priv->cancellable);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ g_clear_object (&priv->grl_miner);
++#endif
+ g_clear_object (&priv->thumb_factory);
+
+ G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
+ gboolean needs_download;
+ gboolean retval = FALSE;
+ GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+ GrlMedia *media;
++#else
++ gpointer media = NULL;
++#endif
+
+ /* find png and jpeg files */
+ if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
+
+ read_file:
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+ if (media == NULL)
+ {
+ g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
+ return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+ GFile *file,
+@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+
+ return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ gboolean
+ bg_pictures_source_add (BgPicturesSource *bg_source,
+@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor,
+ }
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+ add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+
+ g_object_unref (dir);
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ priv->grl_miner = cc_background_grilo_miner_new ();
+ g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+ cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ priv->thumb_factory =
+ gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
index 0849160..58d50a6 100644
--- a/panels/user-accounts/um-realm-manager.c
@@ -301,10 +455,10 @@ index 0849160..58d50a6 100644
void
diff --git a/shell/Makefile.am b/shell/Makefile.am
-index ad7a68f..cc968ac 100644
+index c0cb91a..0b820fd 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
-@@ -52,14 +52,12 @@ gnome_control_center_LDADD = \
+@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \
$(top_builddir)/libgd/libgd.la \
$(top_builddir)/panels/common/liblanguage.la \
$(top_builddir)/panels/background/libbackground.la \
@@ -319,7 +473,7 @@ index ad7a68f..cc968ac 100644
$(top_builddir)/panels/power/libpower.la \
$(top_builddir)/panels/privacy/libprivacy.la \
$(top_builddir)/panels/region/libregion.la \
-@@ -85,6 +83,14 @@ if BUILD_BLUETOOTH
+@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH
gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
endif
@@ -331,9 +485,9 @@ index ad7a68f..cc968ac 100644
+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
+endif
+
- AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
-
# Dbus service file
+ servicefiledir = $(datadir)/dbus-1/services
+ servicefile_in_files = org.gnome.ControlCenter.service.in
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 26576dc..8a92f95 100644
--- a/shell/cc-panel-loader.c
@@ -379,5 +533,5 @@ index 26576dc..8a92f95 100644
#ifdef BUILD_PRINTERS
PANEL_TYPE("printers", cc_printers_panel_get_type ),
--
-1.9.0
+2.1.2
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
index a4a4090..9ea3b80 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.0.ebuild
@@ -127,7 +127,7 @@ src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
+ epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
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 3291a22..944a1e7 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -137,7 +137,7 @@ src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.12.1-optional-r1.patch
+ epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2015-05-10 17:20 Gilles Dartiguelongue
0 siblings, 0 replies; 23+ messages in thread
From: Gilles Dartiguelongue @ 2015-05-10 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 72663fd4382c7827a5663adeb1379dab5a3ef887
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun May 10 16:54:30 2015 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun May 10 17:19:47 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=72663fd4
gnome-base/gnome-control-center: 3.14.5 → 3.16.1
...ntrol-center-3.16.0-make-wayland-optional.patch | 44 ++++++++++++++++
...9.ebuild => gnome-control-center-3.16.1.ebuild} | 59 +++++++---------------
.../gnome-control-center-9999.ebuild | 48 ++++++------------
3 files changed, 76 insertions(+), 75 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
new file mode 100644
index 0000000..38d4ccd
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch
@@ -0,0 +1,44 @@
+From 95420469407223898564425b7622ac66e7ed70d5 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <tranquility@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
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
similarity index 70%
copy from gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
copy to gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
index 944a1e7..2ea4abf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.1.ebuild
@@ -1,15 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
@@ -17,31 +14,24 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
-#
+
# kerberos unfortunately means mit-krb5; build fails with heimdal
# FIXME: modemmanager is not optional
# networkmanager is not optional
COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2
+ >=dev-libs/glib-2.39.91:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.13:3
- >=gnome-base/gsettings-desktop-schemas-3.13.91
+ >=x11-libs/gtk+-3.15:3
+ >=gnome-base/gsettings-desktop-schemas-3.15.4
>=gnome-base/gnome-desktop-3.11.3:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
@@ -60,6 +50,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.9.8[modemmanager]
>=net-misc/modemmanager-0.7.990
+ virtual/libgudev
virtual/opengl
x11-apps/xmodmap
x11-libs/cairo
@@ -94,7 +85,7 @@ COMMON_DEPEND="
# libgnomekbd needed only for gkbd-keyboard-display tool
RDEPEND="${COMMON_DEPEND}
|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- >=sys-apps/accountsservice-0.6.30
+ >=sys-apps/accountsservice-0.6.39
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
@@ -123,45 +114,25 @@ DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
virtual/pkgconfig
- cups? ( sys-apps/sed )
-
gnome-base/gnome-common
"
# Needed for autoreconf
# gnome-base/gnome-common
src_prepare() {
- # Gentoo handles completions in a different directory, bugs #465094 and #477390
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- shell/Makefile.am || die "sed completiondir failed"
-
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+ # Make wayland support optional
+ epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
epatch_user
- # top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to
- # avoid libtoolize "We've already been run in this tree" warning, bug #484988
- local d
- for d in . egg-list-box; do
- pushd "${d}" > /dev/null
- AT_NOELIBTOOLIZE=yes eautoreconf
- popd > /dev/null
- done
- elibtoolize --force
-
- # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
- # We need to touch timedated{c,h} to prevent them from being
- # regenerated (bug #415901)
- # Upstream think they should be removed, preventing compilation errors too
- # (https://bugzilla.gnome.org/704822)
- [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
- [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
-
+ eautoreconf
gnome2_src_prepare
}
@@ -179,3 +150,7 @@ src_configure() {
$(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
}
+
+src_install() {
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+}
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 944a1e7..d3950c4 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -28,20 +28,17 @@ QA_CONFIGURE_OPTIONS=".*"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
-#
+
# kerberos unfortunately means mit-krb5; build fails with heimdal
# FIXME: modemmanager is not optional
# networkmanager is not optional
COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2
+ >=dev-libs/glib-2.39.91:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.13:3
- >=gnome-base/gsettings-desktop-schemas-3.13.91
+ >=x11-libs/gtk+-3.15:3
+ >=gnome-base/gsettings-desktop-schemas-3.15.4
>=gnome-base/gnome-desktop-3.11.3:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
@@ -60,6 +57,7 @@ COMMON_DEPEND="
>=net-misc/networkmanager-0.9.8[modemmanager]
>=net-misc/modemmanager-0.7.990
+ virtual/libgudev
virtual/opengl
x11-apps/xmodmap
x11-libs/cairo
@@ -94,7 +92,7 @@ COMMON_DEPEND="
# libgnomekbd needed only for gkbd-keyboard-display tool
RDEPEND="${COMMON_DEPEND}
|| ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 )
- >=sys-apps/accountsservice-0.6.30
+ >=sys-apps/accountsservice-0.6.39
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
@@ -123,45 +121,25 @@ DEPEND="${COMMON_DEPEND}
>=sys-devel/gettext-0.17
virtual/pkgconfig
- cups? ( sys-apps/sed )
-
gnome-base/gnome-common
"
# Needed for autoreconf
# gnome-base/gnome-common
src_prepare() {
- # Gentoo handles completions in a different directory, bugs #465094 and #477390
- sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
- shell/Makefile.am || die "sed completiondir failed"
-
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+ # Make wayland support optional
+ epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
+
# Fix some absolute paths to be appropriate for Gentoo
epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
epatch_user
- # top-level configure.ac does not use AC_CONFIG_SUBDIRS, so we need this to
- # avoid libtoolize "We've already been run in this tree" warning, bug #484988
- local d
- for d in . egg-list-box; do
- pushd "${d}" > /dev/null
- AT_NOELIBTOOLIZE=yes eautoreconf
- popd > /dev/null
- done
- elibtoolize --force
-
- # panels/datetime/Makefile.am gets touched by "gentoo-paths" patch.
- # We need to touch timedated{c,h} to prevent them from being
- # regenerated (bug #415901)
- # Upstream think they should be removed, preventing compilation errors too
- # (https://bugzilla.gnome.org/704822)
- [[ -f panels/datetime/timedated.h ]] && rm -f panels/datetime/timedated.h
- [[ -f panels/datetime/timedated.c ]] && rm -f panels/datetime/timedated.c
-
+ eautoreconf
gnome2_src_prepare
}
@@ -179,3 +157,7 @@ src_configure() {
$(use_with v4l cheese) \
$(use_enable input_devices_wacom wacom)
}
+
+src_install() {
+ gnome2_src_install completiondir="$(get_bashcompdir)"
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2015-10-02 12:50 Ole Reifschneider
0 siblings, 0 replies; 23+ messages in thread
From: Ole Reifschneider @ 2015-10-02 12:50 UTC (permalink / raw
To: gentoo-commits
commit: e67a7340ca1321024b041bc09c5e0f62398fdf5e
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 09:53:54 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Oct 2 09:53:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e67a7340
gnome-base/gnome-control-center: Bump version to 3.18.0
Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42
...ontrol-center-3.18.0-keep-panels-optional.patch | 39 ++
.../gnome-control-center-3.18.0-optional.patch | 537 +++++++++++++++++++++
...9.ebuild => gnome-control-center-3.18.0.ebuild} | 23 +-
.../gnome-control-center-9999.ebuild | 12 +-
4 files changed, 590 insertions(+), 21 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
new file mode 100644
index 0000000..23141e4
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch
@@ -0,0 +1,39 @@
+From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@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
+
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
new file mode 100644
index 0000000..96b58f6
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch
@@ -0,0 +1,537 @@
+From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Dropped mm from this revision of the patch since it appears more
+complicated than ever to split it from the network panel.
+
+Signed-Off: Gilles Dartiguelongue <eva@gentoo.org>
+---
+ configure.ac | 157 ++++++++++++++++++++++++++------
+ panels/Makefile.am | 10 +-
+ panels/background/Makefile.am | 8 +-
+ panels/background/bg-pictures-source.c | 20 ++++
+ panels/user-accounts/um-realm-manager.c | 9 ++
+ shell/Makefile.am | 10 +-
+ shell/cc-panel-loader.c | 8 ++
+ 7 files changed, 186 insertions(+), 36 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fe723d5..f882e23 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+- goa-1.0 >= $GOA_REQUIRED_VERSION
+- grilo-0.2 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++
++build_online_accounts=false
++background_online_accounts=
++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 >= $GOA_REQUIRED_VERSION)
++ build_online_accounts=true
++ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
++fi
++if test "x$build_online_accounts" = xtrue ; then
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++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(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0
++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++ $background_online_accounts)
++
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+- colord >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- libsoup-2.4
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++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 >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++ 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)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -206,8 +253,25 @@ fi
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
+- [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++ AC_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [case "${enableval}" in
++ yes) WANT_BLUETOOTH=yes ;;
++ no) WANT_BLUETOOTH=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++ esac],
++ [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++ # Check for gnome-bluetooth
++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0,
++ [have_bluetooth=yes], have_bluetooth=no)
++ have_bluetooth=yes
++fi
++
++
+ if test "x$have_bluetooth" = xyes ; then
+ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -292,15 +356,27 @@ case $host_os in
+ 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
+- clutter-gtk-1.0
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+- have_wacom=yes
+- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ 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
++ clutter-gtk-1.0
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
++ have_wacom=yes
++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ fi
+ fi
+ ;;
+ *)
+@@ -310,16 +386,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
+-
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++ [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++ if test "$KRB5_CONFIG" = "no"; then
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++ fi
+
++ AC_MSG_CHECKING(for krb5 libraries and flags)
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+
+@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ 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
+@@ -548,6 +635,16 @@ 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$build_wacom" = "xtrue"; then
++ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
++else
++ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+- online-accounts \
+ region \
+ info \
+ sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ privacy \
+ sharing
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb8017..bde4cdf 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ cc-background-chooser-dialog.c \
+ cc-background-chooser-dialog.h \
+- cc-background-grilo-miner.c \
+- cc-background-grilo-miner.h \
+ cc-background-item.c \
+ cc-background-item.h \
+ cc-background-xml.c \
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
+ bg-colors-source.c \
+ bg-colors-source.h
+
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES += \
++ cc-background-grilo-miner.c \
++ cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
+ libbackground_la_SOURCES = \
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index c165fa3..78ef4a5 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+
+ #include "bg-pictures-source.h"
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+ GCancellable *cancellable;
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ CcBackgroundGriloMiner *grl_miner;
++#endif
+
+ GnomeDesktopThumbnailFactory *thumb_factory;
+
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+ g_clear_object (&priv->cancellable);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ g_clear_object (&priv->grl_miner);
++#endif
+ g_clear_object (&priv->thumb_factory);
+
+ G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
+ gboolean needs_download;
+ gboolean retval = FALSE;
+ GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+ GrlMedia *media;
++#else
++ gpointer media = NULL;
++#endif
+
+ /* find png and jpeg files */
+ if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
+
+ read_file:
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+ if (media == NULL)
+ {
+ g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
+ return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+ GFile *file,
+@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+
+ return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ gboolean
+ bg_pictures_source_add (BgPicturesSource *bg_source,
+@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor,
+ }
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+ add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+
+ g_object_unref (dir);
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ priv->grl_miner = cc_background_grilo_miner_new ();
+ g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+ cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ priv->thumb_factory =
+ gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 0849160..58d50a6 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -696,6 +698,7 @@ login_closure_free (gpointer data)
+ g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+ const gchar *realm,
+@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5,
+
+ return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+ GObject *object,
+ GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+ krb5_context k5 = NULL;
+ krb5_error_code code;
+@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+ if (k5)
+ krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++ _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index c0cb91a..0b820fd 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/libgd/libgd.la \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+ $(top_builddir)/panels/keyboard/libkeyboard.la \
+ $(top_builddir)/panels/mouse/libmouse-properties.la \
+ $(top_builddir)/panels/notifications/libnotifications.la \
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
+ $(top_builddir)/panels/power/libpower.la \
+ $(top_builddir)/panels/privacy/libprivacy.la \
+ $(top_builddir)/panels/region/libregion.la \
+@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ # Dbus service file
+ servicefiledir = $(datadir)/dbus-1/services
+ servicefile_in_files = org.gnome.ControlCenter.service.in
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index 26576dc..8a92f95 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+@@ -87,7 +93,9 @@ static struct {
+ PANEL_TYPE("network", cc_network_panel_get_type ),
+ #endif
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
++#endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
+ #ifdef BUILD_PRINTERS
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
+--
+2.1.2
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.0.ebuild
similarity index 88%
copy from gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
copy to gnome-base/gnome-control-center/gnome-control-center-3.18.0.ebuild
index eba7108..dcb89d9 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.18.0.ebuild
@@ -4,12 +4,9 @@
EAPI="5"
GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
+GNOME2_LA_PUNT="yes"
inherit autotools bash-completion-r1 eutils gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
@@ -17,11 +14,7 @@ HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
LICENSE="GPL-2+"
SLOT="2"
IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
# False positives caused by nested configure scripts
QA_CONFIGURE_OPTIONS=".*"
@@ -39,7 +32,7 @@ COMMON_DEPEND="
>=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-3.15:3[X,wayland?]
>=gnome-base/gsettings-desktop-schemas-3.15.4
- >=gnome-base/gnome-desktop-3.11.3:3=
+ >=gnome-base/gnome-desktop-3.17.4:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
>=dev-libs/libpwquality-1.2.2
@@ -49,7 +42,7 @@ COMMON_DEPEND="
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.97
+ >=sys-auth/polkit-0.103[introspection]
>=sys-power/upower-0.99:=
>=x11-libs/libnotify-0.7.3:0=
@@ -61,7 +54,7 @@ COMMON_DEPEND="
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34:0=
@@ -96,7 +89,7 @@ RDEPEND="${COMMON_DEPEND}
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
- >=app-admin/system-config-printer-gnome-1.3.5
+ app-admin/system-config-printer
net-print/cups-pk-helper )
input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
i18n? ( >=gnome-base/libgnomekbd-3 )
@@ -129,9 +122,9 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
- epatch "${FILESDIR}"/${PN}-3.16.0-keep-panels-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
# Fix some absolute paths to be appropriate for Gentoo
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 eba7108..c40c0d0 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -39,7 +39,7 @@ COMMON_DEPEND="
>=x11-libs/gdk-pixbuf-2.23.0:2
>=x11-libs/gtk+-3.15:3[X,wayland?]
>=gnome-base/gsettings-desktop-schemas-3.15.4
- >=gnome-base/gnome-desktop-3.11.3:3=
+ >=gnome-base/gnome-desktop-3.17.4:3=
>=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
>=dev-libs/libpwquality-1.2.2
@@ -49,7 +49,7 @@ COMMON_DEPEND="
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.97
+ >=sys-auth/polkit-0.103[introspection]
>=sys-power/upower-0.99:=
>=x11-libs/libnotify-0.7.3:0=
@@ -61,7 +61,7 @@ COMMON_DEPEND="
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.11.1:= )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34:0=
@@ -96,7 +96,7 @@ RDEPEND="${COMMON_DEPEND}
x11-themes/gnome-icon-theme-symbolic
colord? ( >=gnome-extra/gnome-color-manager-3 )
cups? (
- >=app-admin/system-config-printer-gnome-1.3.5
+ app-admin/system-config-printer
net-print/cups-pk-helper )
input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] )
i18n? ( >=gnome-base/libgnomekbd-3 )
@@ -129,9 +129,9 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.14.0-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
- epatch "${FILESDIR}"/${PN}-3.16.0-keep-panels-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
# Fix some absolute paths to be appropriate for Gentoo
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/
@ 2016-03-25 0:56 Ole Reifschneider
0 siblings, 0 replies; 23+ messages in thread
From: Ole Reifschneider @ 2016-03-25 0:56 UTC (permalink / raw
To: gentoo-commits
commit: 40a666eeb8978886329cb335584cc880694fc975
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 22:01:57 2016 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 00:55:46 2016 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=40a666ee
gnome-base/gnome-control-center: Bump version to 3.20.0
Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42
.../gnome-control-center-3.20.0-optional.patch | 534 +++++++++++++++++++++
...0.ebuild => gnome-control-center-3.20.0.ebuild} | 23 +-
.../gnome-control-center-9999.ebuild | 20 +-
3 files changed, 554 insertions(+), 23 deletions(-)
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
new file mode 100644
index 0000000..0e7639d
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch
@@ -0,0 +1,534 @@
+From d3a9941031fc69d343fb011af52f2462de269bff Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 25 Apr 2014 22:17:24 +0200
+Subject: [PATCH] Make bluetooth/colord/goa/kerberos/wacom optional
+
+Upstream is not interested in any part of this patch:
+
+https://bugzilla.gnome.org/show_bug.cgi?id=686840
+https://bugzilla.gnome.org/show_bug.cgi?id=697478
+https://bugzilla.gnome.org/show_bug.cgi?id=700145
+
+Signed-Off: Ole Reifschneider <tranquility@gentoo.org>
+---
+ configure.ac | 157 ++++++++++++++++++++++++++------
+ panels/Makefile.am | 10 +-
+ panels/background/Makefile.am | 8 +-
+ panels/background/bg-pictures-source.c | 20 ++++
+ panels/user-accounts/um-realm-manager.c | 9 ++
+ shell/Makefile.am | 10 +-
+ shell/cc-panel-loader.c | 8 ++
+ 7 files changed, 187 insertions(+), 35 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0c2a779..0fd0025 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static])
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
+- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
+- goa-1.0 >= $GOA_REQUIRED_VERSION
+- grilo-0.3 >= $GRILO_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+@@ -140,14 +136,66 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
++
++build_online_accounts=false
++background_online_accounts=
++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 >= $GOA_REQUIRED_VERSION)
++ build_online_accounts=true
++ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION"
++fi
++if test "x$build_online_accounts" = xtrue ; then
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
++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(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
++ goa-1.0 >= $GOA_REQUIRED_VERSION
++ grilo-0.3 >= $GRILO_REQUIRED_VERSION)
++
+ PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0
+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
+- colord >= $COLORD_REQUIRED_VERSION
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
+- libsoup-2.4
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++
++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 >= $COLORD_REQUIRED_VERSION
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
++ libsoup-2.4
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
++ 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)
++
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
+@@ -221,8 +269,25 @@ fi
+ AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes])
+
+ # Check for gnome-bluetooth
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
+- [have_bluetooth=yes], have_bluetooth=no)
++have_bluetooth=no
++AC_ARG_ENABLE(bluetooth,
++ AC_HELP_STRING([--disable-bluetooth],
++ [disable bluetooth management panel]),
++ [case "${enableval}" in
++ yes) WANT_BLUETOOTH=yes ;;
++ no) WANT_BLUETOOTH=no ;;
++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
++ esac],
++ [WANT_BLUETOOTH=yes]) dnl Default value
++
++if test x$WANT_BLUETOOTH = xyes; then
++ # Check for gnome-bluetooth
++ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2,
++ [have_bluetooth=yes], have_bluetooth=no)
++ have_bluetooth=yes
++fi
++
++
+ if test "x$have_bluetooth" = xyes ; then
+ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
+ fi
+@@ -307,15 +372,27 @@ case $host_os in
+ 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
+- clutter-gtk-1.0
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
+- have_wacom=yes
+- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
+- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ 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
++ clutter-gtk-1.0
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION)
++ have_wacom=yes
++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted])
++ fi
+ fi
+ ;;
+ *)
+@@ -325,15 +402,22 @@ esac
+ AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
+
+ # Kerberos kerberos support
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+-if test "$KRB5_CONFIG" = "no"; then
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+-fi
++AC_ARG_ENABLE([kerberos],
++ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
++ [enable_kerberos=yes])
++
++if test x"$enable_kerberos" != x"no" ; then
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
++ if test "$KRB5_CONFIG" = "no"; then
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
++ fi
+
+-AC_MSG_CHECKING(for krb5 libraries and flags)
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+-KRB5_LIBS="`$KRB5_CONFIG --libs`"
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_MSG_CHECKING(for krb5 libraries and flags)
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
++ KRB5_LIBS="`$KRB5_CONFIG --libs`"
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available])
++fi
+
+ AC_SUBST(KRB5_CFLAGS)
+ AC_SUBST(KRB5_LIBS)
+@@ -569,6 +653,11 @@ if test "x$have_bluetooth" = "xyes"; then
+ 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
+@@ -579,6 +668,16 @@ 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$build_wacom" = "xtrue"; then
++ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
++else
++ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
++fi
+ if test "x$have_wacom" = "xyes"; then
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
+ else
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
+ common \
+ background \
+ power \
+- color \
+ display \
+ mouse \
+ notifications \
+- online-accounts \
+ region \
+ info \
+ sound \
+@@ -18,6 +16,10 @@ SUBDIRS= \
+ privacy \
+ sharing
+
++if BUILD_COLOR
++SUBDIRS += color
++endif
++
+ if BUILD_WACOM
+ SUBDIRS += wacom
+ endif
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
+ SUBDIRS += bluetooth
+ endif
+
++if BUILD_ONLINE_ACCOUNTS
++SUBDIRS += online-accounts
++endif
++
+ -include $(top_srcdir)/git.mk
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
+index ccb8017..bde4cdf 100644
+--- a/panels/background/Makefile.am
++++ b/panels/background/Makefile.am
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
+ $(BUILT_SOURCES) \
+ cc-background-chooser-dialog.c \
+ cc-background-chooser-dialog.h \
+- cc-background-grilo-miner.c \
+- cc-background-grilo-miner.h \
+ cc-background-item.c \
+ cc-background-item.h \
+ cc-background-xml.c \
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \
+ bg-colors-source.c \
+ bg-colors-source.h
+
++if BUILD_ONLINE_ACCOUNTS
++libbackground_chooser_la_SOURCES += \
++ cc-background-grilo-miner.c \
++ cc-background-grilo-miner.h
++endif
++
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
+
+ libbackground_la_SOURCES = \
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
+index de5f189..c41267d 100644
+--- a/panels/background/bg-pictures-source.c
++++ b/panels/background/bg-pictures-source.c
+@@ -23,13 +23,17 @@
+
+ #include "bg-pictures-source.h"
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include "cc-background-grilo-miner.h"
++#endif
+ #include "cc-background-item.h"
+
+ #include <string.h>
+ #include <cairo-gobject.h>
+ #include <gio/gio.h>
++#ifdef BUILD_ONLINE_ACCOUNTS
+ #include <grilo.h>
++#endif
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h>
+ #include <gdesktop-enums.h>
+
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate
+ {
+ GCancellable *cancellable;
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ CcBackgroundGriloMiner *grl_miner;
++#endif
+
+ GnomeDesktopThumbnailFactory *thumb_factory;
+
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object)
+ g_clear_object (&priv->cancellable);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ g_clear_object (&priv->grl_miner);
++#endif
+ g_clear_object (&priv->thumb_factory);
+
+ G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source,
+ gboolean needs_download;
+ gboolean retval = FALSE;
+ GFile *pictures_dir, *cache_dir;
++#ifdef BUILD_ONLINE_ACCOUNTS
+ GrlMedia *media;
++#else
++ gpointer media = NULL;
++#endif
+
+ /* find png and jpeg files */
+ if (!content_type)
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source,
+
+ read_file:
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ media = g_object_get_data (G_OBJECT (file), "grl-media");
++#endif
+ if (media == NULL)
+ {
+ g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
+ return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static gboolean
+ add_single_file_from_media (BgPicturesSource *bg_source,
+ GFile *file,
+@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
+
+ return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ gboolean
+ bg_pictures_source_add (BgPicturesSource *bg_source,
+@@ -891,6 +907,7 @@ files_changed_cb (GFileMonitor *monitor,
+ }
+ }
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ static void
+ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ {
+@@ -902,6 +919,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
+ g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
+ add_single_file_from_media (self, file, media);
+ }
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ static void
+ bg_pictures_source_init (BgPicturesSource *self)
+@@ -969,9 +987,11 @@ bg_pictures_source_init (BgPicturesSource *self)
+
+ g_object_unref (dir);
+
++#ifdef BUILD_ONLINE_ACCOUNTS
+ priv->grl_miner = cc_background_grilo_miner_new ();
+ g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
+ cc_background_grilo_miner_start (priv->grl_miner);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+
+ priv->thumb_factory =
+ gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
+index 8a0a0e6..22c6b94 100644
+--- a/panels/user-accounts/um-realm-manager.c
++++ b/panels/user-accounts/um-realm-manager.c
+@@ -22,7 +22,9 @@
+
+ #include "um-realm-manager.h"
+
++#ifdef HAVE_KERBEROS
+ #include <krb5/krb5.h>
++#endif
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+@@ -698,6 +700,7 @@ login_closure_free (gpointer data)
+ g_slice_free (LoginClosure, login);
+ }
+
++#ifdef HAVE_KERBEROS
+ static krb5_error_code
+ login_perform_kinit (krb5_context k5,
+ const gchar *realm,
+@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5,
+
+ return code;
+ }
++#endif /* HAVE_KERBEROS */
+
+ static void
+ kinit_thread_func (GSimpleAsyncResult *async,
+ GObject *object,
+ GCancellable *cancellable)
+ {
++#ifdef HAVE_KERBEROS
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async);
+ krb5_context k5 = NULL;
+ krb5_error_code code;
+@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async,
+
+ if (k5)
+ krb5_free_context (k5);
++#else /* HAVE_KERBEROS */
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC,
++ _("gnome-control-center was built without kerberos support"));
++#endif
+ }
+
+ void
+diff --git a/shell/Makefile.am b/shell/Makefile.am
+index e9cac8b..7706437 100644
+--- a/shell/Makefile.am
++++ b/shell/Makefile.am
+@@ -58,14 +58,12 @@ gnome_control_center_LDADD = \
+ $(top_builddir)/panels/common/liblanguage.la \
+ $(top_builddir)/panels/common/libdevice.la \
+ $(top_builddir)/panels/background/libbackground.la \
+- $(top_builddir)/panels/color/libcolor.la \
+ $(top_builddir)/panels/datetime/libdate_time.la \
+ $(top_builddir)/panels/display/libdisplay.la \
+ $(top_builddir)/panels/info/libinfo.la \
+ $(top_builddir)/panels/keyboard/libkeyboard.la \
+ $(top_builddir)/panels/mouse/libmouse-properties.la \
+ $(top_builddir)/panels/notifications/libnotifications.la \
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
+ $(top_builddir)/panels/power/libpower.la \
+ $(top_builddir)/panels/privacy/libprivacy.la \
+ $(top_builddir)/panels/region/libregion.la \
+@@ -91,6 +89,14 @@ if BUILD_BLUETOOTH
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
+ endif
+
++if BUILD_COLOR
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
++endif
++
++if BUILD_ONLINE_ACCOUNTS
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
++endif
++
+ # Dbus service file
+ servicefiledir = $(datadir)/dbus-1/services
+ servicefile_in_files = org.gnome.ControlCenter.service.in
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
+index de9c5df..17503fe 100644
+--- a/shell/cc-panel-loader.c
++++ b/shell/cc-panel-loader.c
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
+ #ifdef BUILD_BLUETOOTH
+ extern GType cc_bluetooth_panel_get_type (void);
+ #endif /* BUILD_BLUETOOTH */
++#ifdef BUILD_COLOR
+ extern GType cc_color_panel_get_type (void);
++#endif /* BUILD_COLOR */
+ extern GType cc_date_time_panel_get_type (void);
+ extern GType cc_display_panel_get_type (void);
+ extern GType cc_info_panel_get_type (void);
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
+ extern GType cc_network_panel_get_type (void);
+ #endif /* BUILD_NETWORK */
+ extern GType cc_notifications_panel_get_type (void);
++#ifdef BUILD_ONLINE_ACCOUNTS
+ extern GType cc_goa_panel_get_type (void);
++#endif /* BUILD_ONLINE_ACCOUNTS */
+ extern GType cc_power_panel_get_type (void);
+ #ifdef BUILD_PRINTERS
+ extern GType cc_printers_panel_get_type (void);
+@@ -77,7 +81,9 @@ static struct {
+ #ifdef BUILD_BLUETOOTH
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
+ #endif
++#ifdef BUILD_COLOR
+ PANEL_TYPE("color", cc_color_panel_get_type ),
++#endif
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
+ PANEL_TYPE("display", cc_display_panel_get_type ),
+ PANEL_TYPE("info", cc_info_panel_get_type ),
+@@ -87,7 +93,9 @@ static struct {
+ PANEL_TYPE("network", cc_network_panel_get_type ),
+ #endif
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type),
++#ifdef BUILD_ONLINE_ACCOUNTS
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
++#endif
+ PANEL_TYPE("power", cc_power_panel_get_type ),
+ #ifdef BUILD_PRINTERS
+ PANEL_TYPE("printers", cc_printers_panel_get_type ),
+--
+2.7.2
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.0.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.20.0.ebuild
similarity index 90%
rename from gnome-base/gnome-control-center/gnome-control-center-3.18.0.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.20.0.ebuild
index dcb89d9..b70af42 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.18.0.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,19 +21,16 @@ QA_CONFIGURE_OPTIONS=".*"
# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login
# g-s-d[policykit] needed for bug #403527
-
# kerberos unfortunately means mit-krb5; build fails with heimdal
-
# udev could be made optional, only conditions gsd-device-panel
# (mouse, keyboards, touchscreen, etc)
-
COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2[dbus]
+ >=dev-libs/glib-2.44.0:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.15:3[X,wayland?]
- >=gnome-base/gsettings-desktop-schemas-3.15.4
- >=gnome-base/gnome-desktop-3.17.4:3=
- >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+ >=x11-libs/gtk+-3.19.12:3[X,wayland?]
+ >=gnome-base/gsettings-desktop-schemas-3.19.3
+ >=gnome-base/gnome-desktop-3.19.93:3=
+ >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
>=dev-libs/libpwquality-1.2.2
dev-libs/libxml2:2
@@ -42,7 +39,7 @@ COMMON_DEPEND="
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.103[introspection]
+ >=sys-auth/polkit-0.97
>=sys-power/upower-0.99:=
>=x11-libs/libnotify-0.7.3:0=
@@ -54,7 +51,7 @@ COMMON_DEPEND="
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34:0=
@@ -63,7 +60,7 @@ COMMON_DEPEND="
>=net-print/cups-1.4[dbus]
|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
gnome-online-accounts? (
- >=media-libs/grilo-0.2.6:0.2
+ >=media-libs/grilo-0.3.0:0.3
>=net-libs/gnome-online-accounts-3.15.1 )
i18n? ( >=app-i18n/ibus-1.5.2 )
kerberos? ( app-crypt/mit-krb5 )
@@ -122,7 +119,7 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.20.0-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
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 c40c0d0..1bac6d5 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,12 +35,12 @@ QA_CONFIGURE_OPTIONS=".*"
# (mouse, keyboards, touchscreen, etc)
COMMON_DEPEND="
- >=dev-libs/glib-2.39.91:2[dbus]
+ >=dev-libs/glib-2.44.0:2[dbus]
>=x11-libs/gdk-pixbuf-2.23.0:2
- >=x11-libs/gtk+-3.15:3[X,wayland?]
- >=gnome-base/gsettings-desktop-schemas-3.15.4
- >=gnome-base/gnome-desktop-3.17.4:3=
- >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit]
+ >=x11-libs/gtk+-3.19.12:3[X,wayland?]
+ >=gnome-base/gsettings-desktop-schemas-3.19.3
+ >=gnome-base/gnome-desktop-3.19.93:3=
+ >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit]
>=dev-libs/libpwquality-1.2.2
dev-libs/libxml2:2
@@ -49,7 +49,7 @@ COMMON_DEPEND="
>=media-libs/libcanberra-0.13[gtk3]
>=media-sound/pulseaudio-2[glib]
- >=sys-auth/polkit-0.103[introspection]
+ >=sys-auth/polkit-0.97
>=sys-power/upower-0.99:=
>=x11-libs/libnotify-0.7.3:0=
@@ -61,7 +61,7 @@ COMMON_DEPEND="
x11-libs/libXxf86misc
>=x11-libs/libXi-1.2
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= )
+ bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= )
colord? (
net-libs/libsoup:2.4
>=x11-misc/colord-0.1.34:0=
@@ -70,7 +70,7 @@ COMMON_DEPEND="
>=net-print/cups-1.4[dbus]
|| ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) )
gnome-online-accounts? (
- >=media-libs/grilo-0.2.6:0.2
+ >=media-libs/grilo-0.3.0:0.3
>=net-libs/gnome-online-accounts-3.15.1 )
i18n? ( >=app-i18n/ibus-1.5.2 )
kerberos? ( app-crypt/mit-krb5 )
@@ -129,7 +129,7 @@ DEPEND="${COMMON_DEPEND}
src_prepare() {
# Make some panels and dependencies optional; requires eautoreconf
# https://bugzilla.gnome.org/686840, 697478, 700145
- epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch
+ epatch "${FILESDIR}"/${PN}-3.20.0-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch
epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch
epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2016-03-25 0:56 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-20 18:17 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2016-03-25 0:56 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
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-05-25 8:22 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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox