| 1 |
commit: 6c8d370a1d14e4139686bbb3cdd4183e9ca77e38 |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Sep 2 05:40:27 2011 +0000 |
| 4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Sep 2 07:11:07 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6c8d370a |
| 7 |
|
| 8 |
gnome-base/gnome-control-center: 3.1.5 → 3.1.90 |
| 9 |
|
| 10 |
Version bump with numerous improvements, including a new wacom tablet |
| 11 |
configuration panel. Add a patch to prevent the system info panel from |
| 12 |
crashing when systemd's hostnamed is not running. |
| 13 |
|
| 14 |
--- |
| 15 |
...me-control-center-3.1.90-hostnamed-assert.patch | 53 ++++++++++++++++++++ |
| 16 |
...5.ebuild => gnome-control-center-3.1.90.ebuild} | 9 +++- |
| 17 |
.../gnome-control-center-9999.ebuild | 9 +++- |
| 18 |
3 files changed, 69 insertions(+), 2 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..bd65970 |
| 23 |
--- /dev/null |
| 24 |
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch |
| 25 |
@@ -0,0 +1,53 @@ |
| 26 |
+From afbe67f102551917b5c6edbf00ea442ac103ecf0 Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Alexandre Rostovtsev <tetromino@×××××.com> |
| 28 |
+Date: Fri, 2 Sep 2011 02:08:05 -0400 |
| 29 |
+Subject: [PATCH] Do not assert if hostnamed is not running |
| 30 |
+ |
| 31 |
+Most Gentoo users do not use systemd; asserting if systemd's hostnamed |
| 32 |
+is not running is crazy. |
| 33 |
+--- |
| 34 |
+ panels/info/cc-info-panel.c | 21 +++++++++++---------- |
| 35 |
+ 1 files changed, 11 insertions(+), 10 deletions(-) |
| 36 |
+ |
| 37 |
+diff --git a/panels/info/cc-info-panel.c b/panels/info/cc-info-panel.c |
| 38 |
+index 9e72e2a..0cb9342 100644 |
| 39 |
+--- a/panels/info/cc-info-panel.c |
| 40 |
++++ b/panels/info/cc-info-panel.c |
| 41 |
+@@ -1118,14 +1118,6 @@ info_panel_setup_hostname (CcInfoPanel *self, |
| 42 |
+ char *str; |
| 43 |
+ GtkWidget *entry; |
| 44 |
+ |
| 45 |
+- entry = WID ("name_entry"); |
| 46 |
+- |
| 47 |
+- gtk_widget_show (WID ("label4")); |
| 48 |
+- gtk_widget_show (entry); |
| 49 |
+- |
| 50 |
+- if (g_permission_get_allowed (permission) != FALSE) |
| 51 |
+- gtk_widget_set_sensitive (entry, TRUE); |
| 52 |
+- |
| 53 |
+ self->priv->hostnamed_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, |
| 54 |
+ G_DBUS_PROXY_FLAGS_NONE, |
| 55 |
+ NULL, |
| 56 |
+@@ -1136,8 +1128,17 @@ info_panel_setup_hostname (CcInfoPanel *self, |
| 57 |
+ NULL); |
| 58 |
+ |
| 59 |
+ /* This could only happen if the policy file was installed |
| 60 |
+- * but not hostnamed, which points to a system bug */ |
| 61 |
+- g_assert (self->priv->hostnamed_proxy); |
| 62 |
++ * but not hostnamed */ |
| 63 |
++ if (!self->priv->hostnamed_proxy) |
| 64 |
++ return; |
| 65 |
++ |
| 66 |
++ entry = WID ("name_entry"); |
| 67 |
++ |
| 68 |
++ gtk_widget_show (WID ("label4")); |
| 69 |
++ gtk_widget_show (entry); |
| 70 |
++ |
| 71 |
++ if (g_permission_get_allowed (permission) != FALSE) |
| 72 |
++ gtk_widget_set_sensitive (entry, TRUE); |
| 73 |
+ |
| 74 |
+ str = info_panel_get_hostname (self); |
| 75 |
+ gtk_entry_set_text (GTK_ENTRY (entry), str); |
| 76 |
+-- |
| 77 |
+1.7.6.1 |
| 78 |
+ |
| 79 |
|
| 80 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.1.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuild |
| 81 |
similarity index 91% |
| 82 |
rename from gnome-base/gnome-control-center/gnome-control-center-3.1.5.ebuild |
| 83 |
rename to gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuild |
| 84 |
index 4d8264d..ab2784f 100644 |
| 85 |
--- a/gnome-base/gnome-control-center/gnome-control-center-3.1.5.ebuild |
| 86 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuild |
| 87 |
@@ -6,7 +6,7 @@ EAPI="4" |
| 88 |
GCONF_DEBUG="yes" |
| 89 |
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen |
| 90 |
|
| 91 |
-inherit gnome2 |
| 92 |
+inherit eutils gnome2 |
| 93 |
if [[ ${PV} = 9999 ]]; then |
| 94 |
inherit gnome2-live |
| 95 |
fi |
| 96 |
@@ -103,3 +103,10 @@ pkg_setup() { |
| 97 |
$(use_with socialweb libsocialweb)" |
| 98 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
| 99 |
} |
| 100 |
+ |
| 101 |
+src_prepare() { |
| 102 |
+ gnome2_src_prepare |
| 103 |
+ # Do not assert & die when systemd's hostnamed is not running. |
| 104 |
+ # Whatever upstream thinks, Gnome on Gentoo should not depend on systemd. |
| 105 |
+ epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch" |
| 106 |
+} |
| 107 |
|
| 108 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild |
| 109 |
index 4d8264d..ab2784f 100644 |
| 110 |
--- a/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild |
| 111 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild |
| 112 |
@@ -6,7 +6,7 @@ EAPI="4" |
| 113 |
GCONF_DEBUG="yes" |
| 114 |
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen |
| 115 |
|
| 116 |
-inherit gnome2 |
| 117 |
+inherit eutils gnome2 |
| 118 |
if [[ ${PV} = 9999 ]]; then |
| 119 |
inherit gnome2-live |
| 120 |
fi |
| 121 |
@@ -103,3 +103,10 @@ pkg_setup() { |
| 122 |
$(use_with socialweb libsocialweb)" |
| 123 |
DOCS="AUTHORS ChangeLog NEWS README TODO" |
| 124 |
} |
| 125 |
+ |
| 126 |
+src_prepare() { |
| 127 |
+ gnome2_src_prepare |
| 128 |
+ # Do not assert & die when systemd's hostnamed is not running. |
| 129 |
+ # Whatever upstream thinks, Gnome on Gentoo should not depend on systemd. |
| 130 |
+ epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch" |
| 131 |
+} |
Archives