From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QzOlE-0005BN-TY for garchives@archives.gentoo.org; Fri, 02 Sep 2011 08:06:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BDD2E21C0C3; Fri, 2 Sep 2011 08:05:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 80F3221C0C3 for ; Fri, 2 Sep 2011 08:05:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA3BC1B4033 for ; Fri, 2 Sep 2011 08:05:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id F28FD80042 for ; Fri, 2 Sep 2011 08:05:51 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <6c8d370a1d14e4139686bbb3cdd4183e9ca77e38.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-hostnamed-assert.patch gnome-base/gnome-control-center/gnome-control-center-3.1.5.ebuild gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuild gnome-base/gnome-control-center/gnome-control-center-9999.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 6c8d370a1d14e4139686bbb3cdd4183e9ca77e38 Date: Fri, 2 Sep 2011 08:05:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 68c2e84b8ccebc0b461797cc7233f785 commit: 6c8d370a1d14e4139686bbb3cdd4183e9ca77e38 Author: Alexandre Rostovtsev gmail com> AuthorDate: Fri Sep 2 05:40:27 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Fri Sep 2 07:11:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D6c8d370a gnome-base/gnome-control-center: 3.1.5 =E2=86=92 3.1.90 Version bump with numerous improvements, including a new wacom tablet configuration panel. Add a patch to prevent the system info panel from crashing when systemd's hostnamed is not running. --- ...me-control-center-3.1.90-hostnamed-assert.patch | 53 ++++++++++++++= ++++++ ...5.ebuild =3D> gnome-control-center-3.1.90.ebuild} | 9 +++- .../gnome-control-center-9999.ebuild | 9 +++- 3 files changed, 69 insertions(+), 2 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/gnom= e-control-center-3.1.90-hostnamed-assert.patch new file mode 100644 index 0000000..bd65970 --- /dev/null +++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.1.90-h= ostnamed-assert.patch @@ -0,0 +1,53 @@ +From afbe67f102551917b5c6edbf00ea442ac103ecf0 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +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; +=20 +- entry =3D WID ("name_entry"); +- +- gtk_widget_show (WID ("label4")); +- gtk_widget_show (entry); +- +- if (g_permission_get_allowed (permission) !=3D FALSE) +- gtk_widget_set_sensitive (entry, TRUE); +- + self->priv->hostnamed_proxy =3D g_dbus_proxy_new_for_bus_sync (G_BUS_= TYPE_SYSTEM, + G_DBUS_P= ROXY_FLAGS_NONE, + NULL, +@@ -1136,8 +1128,17 @@ info_panel_setup_hostname (CcInfoPanel *self, + NULL); +=20 + /* 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 =3D WID ("name_entry"); ++ ++ gtk_widget_show (WID ("label4")); ++ gtk_widget_show (entry); ++ ++ if (g_permission_get_allowed (permission) !=3D FALSE) ++ gtk_widget_set_sensitive (entry, TRUE); +=20 + str =3D info_panel_get_hostname (self); + gtk_entry_set_text (GTK_ENTRY (entry), str); +--=20 +1.7.6.1 + diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.1.5.e= build b/gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebuil= d similarity index 91% rename from gnome-base/gnome-control-center/gnome-control-center-3.1.5.eb= uild rename to gnome-base/gnome-control-center/gnome-control-center-3.1.90.ebu= ild index 4d8264d..ab2784f 100644 --- 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 @@ -6,7 +6,7 @@ EAPI=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 -inherit gnome2 +inherit eutils gnome2 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -103,3 +103,10 @@ pkg_setup() { $(use_with socialweb libsocialweb)" DOCS=3D"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 system= d. + epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch" +} diff --git a/gnome-base/gnome-control-center/gnome-control-center-9999.eb= uild b/gnome-base/gnome-control-center/gnome-control-center-9999.ebuild index 4d8264d..ab2784f 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=3D"4" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 -inherit gnome2 +inherit eutils gnome2 if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -103,3 +103,10 @@ pkg_setup() { $(use_with socialweb libsocialweb)" DOCS=3D"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 system= d. + epatch "${FILESDIR}/${PN}-3.1.90-hostnamed-assert.patch" +}