From 5846d526e05cfb63bd00805bdcffc83a6ad15ed6ac9f178070189cabf2be9b12 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 16 Jun 2011 14:40:39 +0000 Subject: [PATCH 1/7] Accepting request 73660 from home:dimstar:branches:GNOME:Factory Update to 3.1.6 - depends on new glib2 OBS-URL: https://build.opensuse.org/request/show/73660 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=42 --- gtk+-3.0.11.tar.bz2 | 3 -- gtk+-3.1.6.tar.bz2 | 3 ++ gtk3.changes | 107 ++++++++++++++++++++++++++++++++++++++++++++ gtk3.spec | 3 +- 4 files changed, 112 insertions(+), 4 deletions(-) delete mode 100644 gtk+-3.0.11.tar.bz2 create mode 100644 gtk+-3.1.6.tar.bz2 diff --git a/gtk+-3.0.11.tar.bz2 b/gtk+-3.0.11.tar.bz2 deleted file mode 100644 index 75e2a2e..0000000 --- a/gtk+-3.0.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:852d848e2e51373daf04446dc7b427f91bf6953632b45fbe173fb5ed0694100f -size 16949671 diff --git a/gtk+-3.1.6.tar.bz2 b/gtk+-3.1.6.tar.bz2 new file mode 100644 index 0000000..cad459d --- /dev/null +++ b/gtk+-3.1.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a6837bc00a9f78bffb69b0ce28cfcca8812c04fa061927a7ecb0cb877c5aa0b +size 17241334 diff --git a/gtk3.changes b/gtk3.changes index 052338b..79d920d 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,110 @@ +------------------------------------------------------------------- +Wed Jun 15 10:25:43 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.1.6: + + GtkOverlay is a new container that allows to place one or more + 'overlay' widgets on top of another widget. This can be used + for 'floating statusbars' and similar interfaces. + + GtkLockButton has been simplified in appearance to look like a + normal button + + GtkNotebook now supports height-for-width layout + + Accessibility for menuitems and combo boxes has been restored + + The horizontal and vertical subclasses of GtkBox, GtkPaned, + GtkSeparator, GtkScrollbar, GtkScale and GtkButtonBox have + been deprecated + + The print dialog can now display color profile information + + Many enhancements and fixes to CSS theming + - The CSS parser has been rewritten with the goal of better CSS + compliance and improved error handling + - A testsuite for the parser has been added + - Attributes can be inherited from parent widgets + - Shorthand properties are supported + - Color and font attributes are now inherited + - Borders and padding are now handled much more consistently, + and border-radius support is more complete + - text-shadow, box-shadow and icon-shadow attributes are now + supported + - nth-child works for boxes + + Bugs fixed: bgo#353712, bgo#576492, bgo#624539, bgo#634491, + bgo#634994, bgo#641087, bgo#642768, bgo#642773, bgo#642929, + bgo#644906, bgo#646859, bgo#649314, bgo#649779, bgo#649972, + bgo#649979, bgo#650012, bgo#650110, bgo#650114, bgo#650167, + bgo#650202, bgo#650302, bgo#650382, bgo#650418, bgo#650420, + bgo#650424, bgo#650530, bgo#650664, bgo#651194, bgo#651706, + bgo#651707, bgo#651734, bgo#651979, bgo#652045, bgo#652102, + bgo#652103, bgo#652282. + + Updated translations. +- Add pkgconfig(colord) BuildRequires. + +------------------------------------------------------------------- +Tue Jun 7 16:51:16 CEST 2011 - dimstar@opensuse.org + +- Update to version 3.1.4: + + GtkAssistant has received a visual refresh; as a side-effect, + the various image properties are no longer used + + GtkTextView can now handle RGBA colors + + GtkFileChooser now remembers the last opened directory + + GtkLockButton is a new widget to control dialogs with + PolicyKit (or other) permissions + + Size allocation changes: + - GtkPaned and GtkMenuBar now do height-for-width + - GtkAccelLabel is smarter about hiding the accel if too small + - GTK+ now warns if widgets are under-allocated; this + may cause considerable noise, it will be turned off + before the next stable release + - Label size allocation has been reworked, check your labels + - No longer try to guess the size of labels; this makes + it more important to give windows reasonable default + sizes or set width-chars/max-width-chars on labels + - The computation of initial window size has been reworked, + check your windows + + A test framework for mozilla-style reftests has been added + + GDK Broadway backend changes: + - Improved key event handling + - Make resize grips work + - Make window close buttons work + - Stream data over websocket + + Bugs fixed: bgo#618815, bgo#626457, bgo#626503, bgo#642214, + bgo#644426, bgo#646517, bgo#646876, bgo#647284, bgo#647790, + bgo#647806, bgo#647962, bgo#648136, bgo#648419, bgo#648570, + bgo#648943, bgo#649295, bgo#649313, bgo#649457, bgo#649593 + + Updated translations. +- Changes from version 3.1.2: + + Theming fixes and enhancements + - GtkNotebook has an initial-gap style property + - GtkNotebook tab drawing fixes + - Fix problems with transparent backgrounds in panel applets + - Style classes for 'inline' and 'primary' toolbars and + sidebars + - Dark theme information is made available to window managers + via the _GTK_THEME_VARIANT property + - Improved rendering of insensitive text + - Support non-uniform border withs in the default engine + - Fix prelight on treeview expanders + + GtkEntry supports 'hinting' + + GtkExpander can resize toplevel windows when expanding + + GtkGrid supports RTL flipping + + GtkStatusIcon reads the _NET_SYSTEM_TRAY_ICON_SIZE property + to get information about the preferred icon size + + To help with debugging of rendering problems, GDK consults + the GDK_RENDERING environment variable. Possible values include + 'similar', 'image' and 'recording' + + Fix some problems with XI2 and input methods + + New, experimental GDK backends: + - broadway, which targets HTML5 + - wayland, which targets the wayland display server + + Bugs fixed: bgo#440963, bgo#635254, bgo#639584, bgo#640692, + bgo#642712, bgo#642918, bgo#643805, bgo#643841, bgo#644276, + bgo#644348, bgo#644353, bgo#644355, bgo#644570, bgo#644777, + bgo#644836, bgo#644847, bgo#644925, bgo#644975, bgo#644976, + bgo#645057, bgo#645134, bgo#645172, bgo#645176, bgo#645232, + bgo#645234, bgo#645235, bgo#645236, bgo#645341, bgo#645354, + bgo#645405, bgo#645458, bgo#645937, bgo#645960, bgo#646338, + bgo#646446, bgo#646457, bgo#646458, bgo#646460, bgo#646461, + bgo#646462, bgo#646500, bgo#646815, bgo#646882, bgo#646886, + bgo#647086, bgo#647152, bgo#647244, bgo#647275, bgo#647278, + bgo#647594, bgo#554057 + ------------------------------------------------------------------- Tue Jun 7 14:01:21 UTC 2011 - fcrozat@novell.com diff --git a/gtk3.spec b/gtk3.spec index 72052e7..44d3505 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -22,7 +22,7 @@ Name: gtk3 %define _name gtk+ -Version: 3.0.11 +Version: 3.1.6 Release: 1 License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) @@ -46,6 +46,7 @@ BuildRequires: cups-devel BuildRequires: gnome-patch-translation BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(colord) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.21.0 BuildRequires: pkgconfig(glib-2.0) From a522adccc5daf83e4e052569b190bdd8933e311fe5b8c9acb7a6e0abb3569c6e Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 16 Jun 2011 14:50:48 +0000 Subject: [PATCH 2/7] Accepting request 73869 from home:vuntz:branches:GNOME:Factory clarify why we need colord OBS-URL: https://build.opensuse.org/request/show/73869 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=43 --- gtk3.changes | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gtk3.changes b/gtk3.changes index 79d920d..fc563a5 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -34,7 +34,8 @@ Wed Jun 15 10:25:43 CEST 2011 - dimstar@opensuse.org bgo#651707, bgo#651734, bgo#651979, bgo#652045, bgo#652102, bgo#652103, bgo#652282. + Updated translations. -- Add pkgconfig(colord) BuildRequires. +- Add pkgconfig(colord) BuildRequires for new color profile + information feature. ------------------------------------------------------------------- Tue Jun 7 16:51:16 CEST 2011 - dimstar@opensuse.org @@ -67,7 +68,7 @@ Tue Jun 7 16:51:16 CEST 2011 - dimstar@opensuse.org + Bugs fixed: bgo#618815, bgo#626457, bgo#626503, bgo#642214, bgo#644426, bgo#646517, bgo#646876, bgo#647284, bgo#647790, bgo#647806, bgo#647962, bgo#648136, bgo#648419, bgo#648570, - bgo#648943, bgo#649295, bgo#649313, bgo#649457, bgo#649593 + bgo#648943, bgo#649295, bgo#649313, bgo#649457, bgo#649593. + Updated translations. - Changes from version 3.1.2: + Theming fixes and enhancements @@ -103,7 +104,7 @@ Tue Jun 7 16:51:16 CEST 2011 - dimstar@opensuse.org bgo#646446, bgo#646457, bgo#646458, bgo#646460, bgo#646461, bgo#646462, bgo#646500, bgo#646815, bgo#646882, bgo#646886, bgo#647086, bgo#647152, bgo#647244, bgo#647275, bgo#647278, - bgo#647594, bgo#554057 + bgo#647594, bgo#554057. ------------------------------------------------------------------- Tue Jun 7 14:01:21 UTC 2011 - fcrozat@novell.com From e308f9dd4e6b22c10aa89f73fad667faee9956038c50b0eb15e09a63052d2970 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Jun 2011 06:48:10 +0000 Subject: [PATCH 3/7] Accepting request 73892 from home:vuntz:branches:GNOME:Factory Build broadway backend OBS-URL: https://build.opensuse.org/request/show/73892 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=44 --- gtk3.changes | 12 ++++++++++++ gtk3.spec | 11 +++++++++++ 2 files changed, 23 insertions(+) diff --git a/gtk3.changes b/gtk3.changes index fc563a5..278c139 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Jun 16 19:31:53 CEST 2011 - vuntz@opensuse.org + +- Pass --enable-x11-backend to configure to make sure we always + build the X11 backend, that we always want. +- Add a build_broadway_backend define, that controls whether we + build the broadway (HTML5!) backend. If set: + + we pass --enable-broadway-backend to configure + + we package the additional files +- Set build_broadway_backend to 1 for now, so people can play with + the backend. + ------------------------------------------------------------------- Wed Jun 15 10:25:43 CEST 2011 - dimstar@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 44d3505..620fa07 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -16,6 +16,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define build_broadway_backend 1 # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 3.0.0 @@ -284,6 +285,10 @@ gnome-patch-translation-update %configure \ --disable-static \ --enable-man \ + --enable-x11-backend \ +%if %{build_broadway_backend} + --enable-broadway-backend \ +%endif --enable-introspection %{__make} V=1 %{?_smp_mflags} @@ -522,8 +527,14 @@ fi %{_libdir}/gtk-3.0/modules/libferret.so %{_libdir}/pkgconfig/gail-3.0.pc %{_libdir}/pkgconfig/gdk-3.0.pc +%if %{build_broadway_backend} +%{_libdir}/pkgconfig/gdk-broadway-3.0.pc +%endif %{_libdir}/pkgconfig/gdk-x11-3.0.pc %{_libdir}/pkgconfig/gtk+-3.0.pc +%if %{build_broadway_backend} +%{_libdir}/pkgconfig/gtk+-broadway-3.0.pc +%endif %{_libdir}/pkgconfig/gtk+-unix-print-3.0.pc %{_libdir}/pkgconfig/gtk+-x11-3.0.pc %{_libdir}/libgailutil-3.so From 6e4efb35367098f2a788dffef2476da9a9805e70c16b811ae08bd80f8c5f4a7b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 28 Jun 2011 10:35:27 +0000 Subject: [PATCH 4/7] Accepting request 74759 from home:vuntz:branches:GNOME:Factory Make empathy usable again with two patches in gtk3 OBS-URL: https://build.opensuse.org/request/show/74759 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=45 --- gtk3-fix-100-empathy.patch | 46 ++++++++++++++++++++++++++++++++++++++ gtk3-fix-crash.patch | 19 ++++++++++++++++ gtk3.changes | 8 +++++++ gtk3.spec | 6 +++++ 4 files changed, 79 insertions(+) create mode 100644 gtk3-fix-100-empathy.patch create mode 100644 gtk3-fix-crash.patch diff --git a/gtk3-fix-100-empathy.patch b/gtk3-fix-100-empathy.patch new file mode 100644 index 0000000..267d61f --- /dev/null +++ b/gtk3-fix-100-empathy.patch @@ -0,0 +1,46 @@ +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 new file mode 100644 index 0000000..734d9da --- /dev/null +++ b/gtk3-fix-crash.patch @@ -0,0 +1,19 @@ +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 278c139..fa02ab7 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jun 28 11:52:32 CEST 2011 - vuntz@opensuse.org + +- Add gtk3-fix-100-empathy.patch to fix empathy taking 100% of the + CPU. +- Add gtk3-fix-crash.patch to fix a crash in empathy, when opening + the context menu for a contact. + ------------------------------------------------------------------- Thu Jun 16 19:31:53 CEST 2011 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 620fa07..93b7a73 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -42,6 +42,10 @@ 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 @@ -279,6 +283,8 @@ cp -a %{S:1} . %patch1 -p0 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 gnome-patch-translation-update %build From 46669d356b0ff9e412b8335b9b58cce7a6a2aad823e5065c742845a8be9e9fc0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Jul 2011 09:16:48 +0000 Subject: [PATCH 5/7] 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 From e492aeeace8701dce491668d12a3800459a5ca39a2f2ef34817ffac37c2efa85 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Jul 2011 17:03:21 +0000 Subject: [PATCH 6/7] Accepting request 75551 from home:vuntz:branches:GNOME:Factory Some branding cleanups OBS-URL: https://build.opensuse.org/request/show/75551 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=47 --- gtk3.changes | 9 +++++++++ gtk3.spec | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gtk3.changes b/gtk3.changes index 5e368d6..79eb8c0 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jul 6 16:05:11 CEST 2011 - vuntz@opensuse.org + +- Change branding-upstream subpackage: + + Add Requires for libgtk-3-0 since the branding package is + useless without it. + + Update summary and description. + + Make noarch. + ------------------------------------------------------------------- Wed Jul 6 00:31:20 CEST 2011 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 6ed481a..b9e6767 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -244,17 +244,22 @@ ranging from small one-off projects to complete application suites. %package branding-upstream License: LGPLv2.1+ -Summary: The GTK+ toolkit library (version 3) -- Branding Files +Summary: The GTK+ toolkit library (version 3) -- Upstream theme configuration Group: System/Libraries +Requires: libgtk-3-0 = %{version} Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) +BuildArch: noarch %description branding-upstream GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. +This package provides the upstream theme configuration for widgets and +icon themes. + %package devel License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 3) -- Development Files From 6b25f930fe49d7f6f92840e884730f69791fbf8580fce622f3c3d705ae968f87 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 7 Jul 2011 09:15:42 +0000 Subject: [PATCH 7/7] Accepting request 75628 from home:vuntz:branches:GNOME:Factory Add branding doc OBS-URL: https://build.opensuse.org/request/show/75628 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=48 --- gtk3.changes | 2 ++ gtk3.spec | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/gtk3.changes b/gtk3.changes index 79eb8c0..466ac98 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -6,6 +6,8 @@ Wed Jul 6 16:05:11 CEST 2011 - vuntz@opensuse.org useless without it. + Update summary and description. + Make noarch. + + Add branding comments to let people know how gtk3 branding + works. ------------------------------------------------------------------- Wed Jul 6 00:31:20 CEST 2011 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index b9e6767..22036ee 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -251,6 +251,10 @@ Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) BuildArch: noarch +#BRAND: Provides /etc/gtk-3.0/settings.ini, to define default theme and icon +#BRAND: theme. +#BRAND: Do not forget to add proper Requires in branding package if changing +#BRAND: those. %description branding-upstream GTK+ is a multi-platform toolkit for creating graphical user interfaces.