From cfb69cb60d590f9dc5591ea7a2a3fa2b87c58e3ed1fca33057c704a107e0f64a Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 19 Nov 2010 08:57:37 +0000 Subject: [PATCH] Accepting request 53385 from home:dimstar:branches:GNOME:Factory thanks OBS-URL: https://build.opensuse.org/request/show/53385 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=17 --- gtk+-2.91.2.tar.bz2 | 3 -- gtk+-2.91.4.tar.bz2 | 3 ++ gtk3-fix-tests-build.patch | 59 ------------------------------ gtk3-introspection-build-fix.patch | 26 +++++++++++++ gtk3.changes | 34 +++++++++++++++++ gtk3.spec | 8 ++-- 6 files changed, 67 insertions(+), 66 deletions(-) delete mode 100644 gtk+-2.91.2.tar.bz2 create mode 100644 gtk+-2.91.4.tar.bz2 delete mode 100644 gtk3-fix-tests-build.patch create mode 100644 gtk3-introspection-build-fix.patch diff --git a/gtk+-2.91.2.tar.bz2 b/gtk+-2.91.2.tar.bz2 deleted file mode 100644 index 434959e..0000000 --- a/gtk+-2.91.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:754459ed3d6a1667a8a2a88be1c47914f620c6fbd0fd6329b7bdf48eb9ed4d05 -size 16329107 diff --git a/gtk+-2.91.4.tar.bz2 b/gtk+-2.91.4.tar.bz2 new file mode 100644 index 0000000..1e1a8a6 --- /dev/null +++ b/gtk+-2.91.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e56f27762e3755190134dc9a02c2487b980164611eded43097184fbc2c16bba +size 16346360 diff --git a/gtk3-fix-tests-build.patch b/gtk3-fix-tests-build.patch deleted file mode 100644 index 958c4ad..0000000 --- a/gtk3-fix-tests-build.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 4f9f52a6ea3c2010473005430bcb31e80ec543c4 -Author: Vincent Untz -Date: Thu Oct 28 12:16:55 2010 -0400 - - Port tests to GtkScrollable API instead of deprecated GtkLayout API - - https://bugzilla.gnome.org/show_bug.cgi?id=633374 - -diff --git a/tests/testgtk.c b/tests/testgtk.c -index d748912..f240b3f 100644 ---- a/tests/testgtk.c -+++ b/tests/testgtk.c -@@ -9780,12 +9780,12 @@ void create_layout (GtkWidget *widget) - /* We set step sizes here since GtkLayout does not set - * them itself. - */ -- hadjustment = gtk_layout_get_hadjustment (layout); -- vadjustment = gtk_layout_get_vadjustment (layout); -+ hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (layout)); -+ vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (layout)); - gtk_adjustment_set_step_increment (hadjustment, 10.0); - gtk_adjustment_set_step_increment (vadjustment, 10.0); -- gtk_layout_set_hadjustment (layout, hadjustment); -- gtk_layout_set_vadjustment (layout, vadjustment); -+ gtk_scrollable_set_hadjustment (GTK_SCROLLABLE (layout), hadjustment); -+ gtk_scrollable_set_vadjustment (GTK_SCROLLABLE (layout), vadjustment); - - gtk_widget_set_events (layout_widget, GDK_EXPOSURE_MASK); - g_signal_connect (layout, "draw", -diff --git a/tests/testoffscreen.c b/tests/testoffscreen.c -index e20ea38..8b4e61f 100644 ---- a/tests/testoffscreen.c -+++ b/tests/testoffscreen.c -@@ -62,7 +62,7 @@ scroll_layout (gpointer data) - GtkWidget *layout = data; - GtkAdjustment *adj; - -- adj = gtk_layout_get_hadjustment (GTK_LAYOUT (layout)); -+ adj = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (layout)); - gtk_adjustment_set_value (adj, - gtk_adjustment_get_value (adj) + 5.0); - return TRUE; -@@ -96,12 +96,12 @@ create_layout (GtkWidget *vbox) - /* We set step sizes here since GtkLayout does not set - * them itself. - */ -- hadjustment = gtk_layout_get_hadjustment (layout); -- vadjustment = gtk_layout_get_vadjustment (layout); -+ hadjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (layout)); -+ vadjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (layout)); - gtk_adjustment_set_step_increment (hadjustment, 10.0); - gtk_adjustment_set_step_increment (vadjustment, 10.0); -- gtk_layout_set_hadjustment (layout, hadjustment); -- gtk_layout_set_vadjustment (layout, vadjustment); -+ gtk_scrollable_set_hadjustment (GTK_SCROLLABLE (layout), hadjustment); -+ gtk_scrollable_set_vadjustment (GTK_SCROLLABLE (layout), vadjustment); - - gtk_widget_set_events (layout_widget, GDK_EXPOSURE_MASK); - g_signal_connect (layout, "draw", diff --git a/gtk3-introspection-build-fix.patch b/gtk3-introspection-build-fix.patch new file mode 100644 index 0000000..327eb04 --- /dev/null +++ b/gtk3-introspection-build-fix.patch @@ -0,0 +1,26 @@ +Index: gtk+-2.91.4/gtk/Makefile.am +=================================================================== +--- gtk+-2.91.4.orig/gtk/Makefile.am ++++ gtk+-2.91.4/gtk/Makefile.am +@@ -918,7 +918,7 @@ Gtk_3_0_gir_CFLAGS = \ + -DGTK_TEXT_USE_INTERNAL_UNSUPPORTED_API + Gtk_3_0_gir_LIBS = $(gtktargetlib) + if USE_X11 +-Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/x11/libgdk-x11.la ++Gtk_3_0_gir_LIBS += $(top_builddir)/gdk/libgdk-x11-3.0.la + endif + Gtk_3_0_gir_FILES = $(introspection_files) + INTROSPECTION_GIRS += Gtk-3.0.gir +Index: gtk+-2.91.4/gtk/Makefile.in +=================================================================== +--- gtk+-2.91.4.orig/gtk/Makefile.in ++++ gtk+-2.91.4/gtk/Makefile.in +@@ -68,7 +68,7 @@ DIST_COMMON = $(am__gtkunixprintinclude_ + @USE_QUARTZ_TRUE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_12 = $(gtk_use_quartz_c_sources) + @USE_QUARTZ_FALSE@@USE_WIN32_FALSE@@USE_X11_FALSE@am__append_13 = $(gtk_use_stub_c_sources) + @HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_14 = --add-include-path=$(top_builddir)/gdk/x11 +-@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = $(top_builddir)/gdk/x11/libgdk-x11.la ++@HAVE_INTROSPECTION_TRUE@@USE_X11_TRUE@am__append_15 = $(top_builddir)/gdk/libgdk-x11-3.0.la + @HAVE_INTROSPECTION_TRUE@am__append_16 = Gtk-3.0.gir + @HAVE_INTROSPECTION_TRUE@am__append_17 = $(gir_DATA) $(typelibs_DATA) + bin_PROGRAMS = gtk-query-immodules-3.0$(EXEEXT) \ diff --git a/gtk3.changes b/gtk3.changes index 3dc343c..bdcce13 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Wed Nov 17 17:17:36 CET 2010 - dimstar@opensuse.org + +- Update to version 2.91.4: + + bgo#609622: disappearing statusicon + + bgo#631331: window icons don't work anymore + + bgo#632894: Only show Desktop in file chooser button if there + is one + + bgo#633670: Child minimum/natural size is not respected by + GtkScrolledWindow + + bgo#633762: Correctly convert colors to CSS and deal with + librsvg limitations + + bgo#633915: gtk_button_box_child_requisition() mishandles size + allocations + + bgo#634060: Support for GIcon pixbufs + + bgo#634338: Move GtkPaned documentation to inline comments + + bgo#634339: Move GtkProgressBar documentation to inline + comments + + bgo#634340: Move GtkPageSetup documentation to inline comments +- Changes from version 2.91.3: + + The scrollable interface has gained some extra properties + to influence scrolling behaviour: [hv]scroll-policy + + The size_request vfunc and signal have been deprecated and + are no longer used inside GTK+ itself + + GtkAssistant has added a custom page type that gives full + control of button visibility + + The homogeneous parameter has been removed from gtk_box_new + + Bugs fixed: bgo#61852, bgo#576498, bgo#612611, bgo#633050, + bgo#633216, bgo#633274, bgo#633374, bgo#633500. + + Updated translations. +- Drop gtk3-fix-tests-build.patch: fixed upstream. +- Add gtk3-introspection-build-fix.patch to fix the introspection + build, based on changes from git. + ------------------------------------------------------------------- Thu Oct 28 16:07:38 CEST 2010 - vuntz@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 7d32f6c..421611c 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -1,5 +1,5 @@ # -# spec file for package gtk3 (Version 2.91.2) +# spec file for package gtk3 (Version 2.91.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands @@ -22,7 +22,7 @@ Name: gtk3 %define _name gtk+ -Version: 2.91.2 +Version: 2.91.4 Release: 1 # FIXME: 2.90.5 doesn't compile with parallel build (bgo#624304). Check if this is still true for later versions. License: LGPLv2.1+ @@ -42,8 +42,8 @@ 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-tests-build.patch bgo#633374 vuntz@opensuse.org -- Fix build of tests -Patch4: gtk3-fix-tests-build.patch +# PATCH-FIX-UPSTREAM gtk3-introspection-build-fix.patch vuntz@opensuse.org -- Fix build of introspection data, taken from git +Patch4: gtk3-introspection-build-fix.patch BuildRequires: fdupes BuildRequires: cups-devel BuildRequires: gnome-patch-translation