[gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/

[Alexandre Restovtsev]

commit:     eb7d27fb0679fed5c52469b90b66817a58cf50ef
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Mon Sep 26 10:37:09 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Mon Sep 26 17:43:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=eb7d27fb

gnome-base/gnome-control-center: 3.1.91 → 3.2.0

Version bump with numerous bugfixes. The hostnamed assert issue was
finally fixed upstream.

---
 ...me-control-center-3.1.90-hostnamed-assert.patch |   53 --------------------
 ...91.ebuild => gnome-control-center-3.2.0.ebuild} |   12 +----
 .../gnome-control-center-9999.ebuild               |   12 +----
 3 files changed, 4 insertions(+), 73 deletions(-)

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch
deleted file mode 100644
index bd65970..0000000
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From afbe67f102551917b5c6edbf00ea442ac103ecf0 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@×××××.com>
-Date: Fri, 2 Sep 2011 02:08:05 -0400
-Subject: [PATCH] Do not assert if hostnamed is not running
-
-Most Gentoo users do not use systemd; asserting if systemd's hostnamed
-is not running is crazy.
----
- panels/info/cc-info-panel.c |   21 +++++++++++----------
- 1 files changed, 11 insertions(+), 10 deletions(-)
-
-diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c
-index 9e72e2a..0cb9342 100644
---- a/panels/info/cc-info-panel.c
-+++ b/panels/info/cc-info-panel.c
-@@ -1118,14 +1118,6 @@ info_panel_setup_hostname (CcInfoPanel  *self,
-   char *str;
-   GtkWidget *entry;
- 
--  entry = WID ("name_entry");
--
--  gtk_widget_show (WID ("label4"));
--  gtk_widget_show (entry);
--
--  if (g_permission_get_allowed (permission) != FALSE)
--    gtk_widget_set_sensitive (entry, TRUE);
--
-   self->priv->hostnamed_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
-                                                                G_DBUS_PROXY_FLAGS_NONE,
-                                                                NULL,
-@@ -1136,8 +1128,17 @@ info_panel_setup_hostname (CcInfoPanel  *self,
-                                                                NULL);
- 
-   /* This could only happen if the policy file was installed
--   * but not hostnamed, which points to a system bug */
--  g_assert (self->priv->hostnamed_proxy);
-+   * but not hostnamed */
-+  if (!self->priv->hostnamed_proxy)
-+    return;
-+
-+  entry = WID ("name_entry");
-+
-+  gtk_widget_show (WID ("label4"));
-+  gtk_widget_show (entry);
-+
-+  if (g_permission_get_allowed (permission) != FALSE)
-+    gtk_widget_set_sensitive (entry, TRUE);
- 
-   str = info_panel_get_hostname (self);
-   gtk_entry_set_text (GTK_ENTRY (entry), str);
--- 
-1.7.6.1
-

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.1.91.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
similarity index 90%
rename from gnome-base/gnome-control-center/gnome-control-center-3.1.91.ebuild
rename to gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
index ab2784f..26505cf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.1.91.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -32,7 +32,7 @@ fi
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.1.3:3
+	>=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
@@ -97,16 +97,8 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
-		--disable-maintainer-mode
 		$(use_with cheese)
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-	# Do not assert & die when systemd's hostnamed is not running.
-	# Whatever upstream thinks, Gnome on Gentoo should not depend on systemd.
-	epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.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 ab2784f..26505cf 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
 
-inherit eutils gnome2
+inherit gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -32,7 +32,7 @@ fi
 COMMON_DEPEND="
 	>=dev-libs/glib-2.29.14:2
 	>=x11-libs/gdk-pixbuf-2.23.0:2
-	>=x11-libs/gtk+-3.1.3:3
+	>=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
@@ -97,16 +97,8 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--disable-update-mimedb
 		--disable-static
-		--disable-maintainer-mode
 		$(use_with cheese)
 		$(use_enable cups)
 		$(use_with socialweb libsocialweb)"
 	DOCS="AUTHORS ChangeLog NEWS README TODO"
 }
-
-src_prepare() {
-	gnome2_src_prepare
-	# Do not assert & die when systemd's hostnamed is not running.
-	# Whatever upstream thinks, Gnome on Gentoo should not depend on systemd.
-	epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch"
-}