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 1PqJrz-0005C8-Qy for garchives@archives.gentoo.org; Fri, 18 Feb 2011 06:31:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58029E0540; Fri, 18 Feb 2011 06:31:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 05A76E0540 for ; Fri, 18 Feb 2011 06:31:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F07B1B40C5 for ; Fri, 18 Feb 2011 06:31:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D59D78006E for ; Fri, 18 Feb 2011 06:31:03 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <72e71c02acade703dcfa3561f091aa23407bd7ae.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/, gnome-base/gnome-control-center/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/files/gnome-control-center-2.91.5-fix-keyboard-infinite-loop.patch gnome-base/gnome-control-center/files/gnome-control-center-2.91.6-port-to-gtkstyle-context.patch gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild gnome-base/gnome-control-center/gnome-control-center-2.91.6.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ gnome-base/gnome-control-center/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 72e71c02acade703dcfa3561f091aa23407bd7ae Date: Fri, 18 Feb 2011 06:31:03 +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: 944d781077d5c49219c65eee06a9fa2b commit: 72e71c02acade703dcfa3561f091aa23407bd7ae Author: Nirbheek Chauhan gentoo org> AuthorDate: Fri Feb 18 06:21:19 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Fri Feb 18 06:23:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D72e71c02 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 =3D> 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-f= ix-keyboard-infinite-loop.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1423f9c7bd1d8dc65fd6e78c939d1489d27fc015 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 19 Jan 2011 14:51:34 +0000 -Subject: [PATCH] region: Fix infinite loop when selecting Xkb options - -Spotted by Arun Raghavan - -https://bugzilla.gnome.org/show_bug.cgi?id=3D639951 ---- - 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/gn= ome-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 =3D FALSE; -- gchar **options_list =3D xkb_options_get_selected_list (); -- if (options_list !=3D NULL) { -- gchar **option =3D options_list; -- while (*option !=3D NULL) -- if (!strcmp (*option, optionname)) { -- already_selected =3D TRUE; -- break; -- } -+ gchar **options_list; -+ guint i; -+ -+ options_list =3D xkb_options_get_selected_list (); -+ for (i =3D 0; options_list !=3D NULL && options_list[i] !=3D NULL; i++= ) { -+ gchar *option =3D options_list[i]; -+ if (!strcmp (option, optionname)) { -+ already_selected =3D TRUE; -+ break; -+ } - } -=20 - if (!already_selected) { ---=20 -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/fi= les/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-p= ort-to-gtkstyle-context.patch @@ -0,0 +1,68 @@ +From 7da8390241cca72035f81f1809226ea4eee6060b Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi +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-acco= unts/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= ) +=20 + static void + update_entry_font (GtkWidget *widget, +- GtkStyle *previous_style, + UmEditableEntry *e) + { + UmEditableEntryPrivate *priv =3D e->priv; + PangoFontDescription *desc; +- GtkStyle *style; ++ GtkStyleContext *style; + gint size; +=20 + if (!priv->weight_set && !priv->scale_set) +@@ -129,17 +128,19 @@ update_entry_font (GtkWidget *widget, +=20 + g_signal_handlers_block_by_func (widget, update_entry_font, e); +=20 +- gtk_widget_modify_font (widget, NULL); ++ gtk_widget_override_font (widget, NULL); =20 ++ ++ style =3D gtk_widget_get_style_context (widget); ++ desc =3D pango_font_description_copy=20 ++ (gtk_style_context_get_font (style, gtk_widget_get_stat= e_flags (widget))); +=20 +- style =3D gtk_widget_get_style (widget); +- desc =3D pango_font_description_copy (style->font_desc); + if (priv->weight_set) + pango_font_description_set_weight (desc, priv->weight); + if (priv->scale_set) { + size =3D pango_font_description_get_size (desc); + pango_font_description_set_size (desc, priv->scale * si= ze); + } +- gtk_widget_modify_font (widget, desc); ++ gtk_widget_override_font (widget, desc); +=20 + pango_font_description_free (desc); +=20 +@@ -172,7 +173,7 @@ update_fonts (UmEditableEntry *e) +=20 + pango_attr_list_unref (attrs); +=20 +- update_entry_font ((GtkWidget *)priv->entry, NULL, e); ++ update_entry_font ((GtkWidget *)priv->entry, e); + } +=20 + void +@@ -469,7 +470,7 @@ um_editable_entry_init (UmEditableEntry *e) + g_signal_connect (priv->entry, "activate", G_CALLBACK (entry_ac= tivated), e); + g_signal_connect (priv->entry, "focus-out-event", G_CALLBACK (e= ntry_focus_out), e); + g_signal_connect (priv->entry, "key-press-event", G_CALLBACK (e= ntry_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 (upd= ate_entry_font), e); + g_signal_connect (gtk_bin_get_child (GTK_BIN (priv->button)), "= size-allocate", G_CALLBACK (update_button_padding), e); +=20 + gtk_container_add (GTK_CONTAINER (e), (GtkWidget*)priv->noteboo= k); +-- +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.e= build similarity index 93% rename from gnome-base/gnome-control-center/gnome-control-center-2.91.6.e= build 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.ebui= ld @@ -6,7 +6,7 @@ EAPI=3D"3" GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" # gmodule is used, which uses dlopen =20 -inherit gnome2 +inherit eutils gnome2 =20 DESCRIPTION=3D"The gnome2 Desktop configuration tool" HOMEPAGE=3D"http://www.gnome.org/" @@ -78,11 +78,14 @@ DEPEND=3D"${COMMON_DEPEND} # Needed for autoreconf # gnome-base/gnome-common =20 -pkg_setup() { +src_prepare() { # TODO: libsocialweb G2CONF=3D"${G2CONF} --disable-update-mimedb --disable-static --disable-schemas-install" DOCS=3D"AUTHORS ChangeLog NEWS README TODO" + + # Taken from upstream, remove for next release, bug 353684 + epatch "${FILESDIR}/${P}-port-to-gtkstyle-context.patch" }