From 46669d356b0ff9e412b8335b9b58cce7a6a2aad823e5065c742845a8be9e9fc0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Jul 2011 09:16:48 +0000 Subject: [PATCH] Accepting request 75481 from home:vuntz:branches:GNOME:Factory Update to 3.1.8 OBS-URL: https://build.opensuse.org/request/show/75481 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=46 --- gtk+-3.1.6.tar.bz2 | 3 --- gtk+-3.1.8.tar.bz2 | 3 +++ gtk3-fix-100-empathy.patch | 46 -------------------------------------- gtk3-fix-crash.patch | 19 ---------------- gtk3.changes | 14 ++++++++++++ gtk3.spec | 10 ++------- 6 files changed, 19 insertions(+), 76 deletions(-) delete mode 100644 gtk+-3.1.6.tar.bz2 create mode 100644 gtk+-3.1.8.tar.bz2 delete mode 100644 gtk3-fix-100-empathy.patch delete mode 100644 gtk3-fix-crash.patch diff --git a/gtk+-3.1.6.tar.bz2 b/gtk+-3.1.6.tar.bz2 deleted file mode 100644 index cad459d..0000000 --- a/gtk+-3.1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a6837bc00a9f78bffb69b0ce28cfcca8812c04fa061927a7ecb0cb877c5aa0b -size 17241334 diff --git a/gtk+-3.1.8.tar.bz2 b/gtk+-3.1.8.tar.bz2 new file mode 100644 index 0000000..c82f88c --- /dev/null +++ b/gtk+-3.1.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e51970133bb6ff7d585ce9f678e8ce6e3073a1b1d455cc42671503ce71d93533 +size 17305226 diff --git a/gtk3-fix-100-empathy.patch b/gtk3-fix-100-empathy.patch deleted file mode 100644 index 267d61f..0000000 --- a/gtk3-fix-100-empathy.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 1687127d7c791fcfc40e7cc22fc785a96b2076d9 -Author: Vincent Untz -Date: Tue Jun 28 11:47:37 2011 +0200 - - gtkbox: Invalidate order on changes, even if the child is not visible - - When we build the sibling path for the order, we do not skip hidden - children (since, quoting the comment, "we cannot reliably detect changes - in widget visibility"). So we need to invalidate the order when hidden - children are reordered and removed. - - https://bugzilla.gnome.org/show_bug.cgi?id=652769 - -diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c -index f97a80d..b711a52 100644 ---- a/gtk/gtkbox.c -+++ b/gtk/gtkbox.c -@@ -1612,10 +1612,12 @@ gtk_box_reorder_child (GtkBox *box, - priv->children = g_list_insert_before (priv->children, new_link, child_info); - - gtk_widget_child_notify (child, "position"); -+ -+ gtk_box_invalidate_order (box); -+ - if (gtk_widget_get_visible (child) - && gtk_widget_get_visible (GTK_WIDGET (box))) - { -- gtk_box_invalidate_order (box); - gtk_widget_queue_resize (child); - } - } -@@ -1799,12 +1801,13 @@ gtk_box_remove (GtkContainer *container, - g_list_free (children); - g_free (child); - -+ gtk_box_invalidate_order (box); -+ - /* queue resize regardless of gtk_widget_get_visible (container), - * since that's what is needed by toplevels. - */ - if (was_visible) - { -- gtk_box_invalidate_order (box); - gtk_widget_queue_resize (GTK_WIDGET (container)); - } - diff --git a/gtk3-fix-crash.patch b/gtk3-fix-crash.patch deleted file mode 100644 index 734d9da..0000000 --- a/gtk3-fix-crash.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit c903ece96be6b307eb756430f0b0b9acfca4dbae -Author: Juan A. Suarez Romero -Date: Tue Jun 14 09:49:23 2011 +0000 - - image: Initialize variable - -diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c -index 821f98c..6fbb718 100644 ---- a/gtk/gtkimage.c -+++ b/gtk/gtkimage.c -@@ -1499,7 +1499,7 @@ ensure_stated_icon_from_info (GtkImage *image, - { - GtkImagePrivate *priv = image->priv; - GtkStyleContext *context; -- GdkPixbuf *destination; -+ GdkPixbuf *destination = NULL; - gboolean symbolic; - - context = gtk_widget_get_style_context (GTK_WIDGET (image)); diff --git a/gtk3.changes b/gtk3.changes index fa02ab7..5e368d6 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Jul 6 00:31:20 CEST 2011 - vuntz@opensuse.org + +- Update to version 3.1.8: + + Theming improvements: + - Multiple colors are now supported + - Support CSS font properties like font-size, font-family, etc + - nth-child works for toolbars too + + Bug fixes: bgo#652506, bgo#652618, bgo#652769, bgo#653053, + bgo#653191, bgo#653333, bgo#653512, bgo#653785. + + Updated translations. +- Drop gtk3-fix-crash.patch: fixed upstream. +- Drop gtk3-fix-100-empathy.patch: fixed upstream another way. + ------------------------------------------------------------------- Tue Jun 28 11:52:32 CEST 2011 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 93b7a73..6ed481a 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -23,13 +23,13 @@ Name: gtk3 %define _name gtk+ -Version: 3.1.6 +Version: 3.1.8 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) Url: http://www.gtk.org/ Group: System/Libraries -Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.90/%{_name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/gtk+/3.1/%{_name}-%{version}.tar.bz2 Source1: README.SUSE Source2: settings.ini Source3: macros.gtk3 @@ -42,10 +42,6 @@ Patch1: gtk3-path-local.patch Patch2: gtk3-bnc129753-localize-font-style-name.patch # PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch -# PATCH-FIX-UPSTREAM gtk3-fix-100-empathy.patch bgo#652769 vuntz@opensuse.org -- Fix empathy taking 100% of the CPU, submitted upstream -Patch4: gtk3-fix-100-empathy.patch -# PATCH-FIX-UPSTREAM gtk3-fix-crash.patch vuntz@opensuse.org -- Initialize a variable to fix a crash in empathy -Patch5: gtk3-fix-crash.patch BuildRequires: fdupes BuildRequires: cups-devel BuildRequires: gnome-patch-translation @@ -283,8 +279,6 @@ cp -a %{S:1} . %patch1 -p0 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 gnome-patch-translation-update %build