Accepting request 53490 from GNOME:Factory

Accepted submit request 53490 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/53490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk3?expand=0&rev=8

gtk+-2.91.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:694e887b946a3aa28af10f776bc6f79bc566d0e1be679783d4e7469bc728aeac
-size 16898729

gtk+-2.91.4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e56f27762e3755190134dc9a02c2487b980164611eded43097184fbc2c16bba
+size 16346360

gtk3-fix-badmatch-gnome-shell.patch

@@ -1,12 +0,0 @@
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 66494d6..aa326bf 100644
---- a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -2676,6 +2676,7 @@ gdk_window_x11_set_background (GdkWindow      *window,
-       if (cairo_pattern_get_surface (pattern, &surface) == CAIRO_STATUS_SUCCESS &&
-           matrix_is_identity (&matrix) &&
-           cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_XLIB &&
-+          cairo_xlib_surface_get_visual (surface) == GDK_VISUAL_XVISUAL (gdk_window_get_visual ((window))) &&
-           cairo_xlib_surface_get_display (surface) == GDK_WINDOW_XDISPLAY (window))
-         {
-           double x, y;

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) \

gtk3.changes

@@ -1,3 +1,113 @@
+-------------------------------------------------------------------
+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
+
+- Update to version 2.91.2:
+  + GtkApplication has been rewritten. It mostly relies on
+    GApplication API now. Remaining functions include
+    gtk_application_new() and gtk_window_set_application()
+  + A GtkScrollable interface has been added and implemented by all
+    scrollable widgets. GtkScrolledWindow has
+    ::min-display-width/height properties to control the minimal
+    size of the content area.
+  + GtkComboBox changes:
+    - Popups can be wider than the combo box itself
+    - The deprecated GtkComboBoxEntry subclass has been removed
+    - The deprecated combo box text convenience API has been
+      removed
+  + GtkRecentManager changes:
+    - Store xbel file in XDG_USER_DATA
+    - Add gtk_recent_info_create_app_info()
+    - Add gtk_recent_info_get_gicon()
+    - Coalesce multiple changes
+  + GtkIconView allows tree models (ignoring anything below the
+    root level)
+  + GtkProgressBar, GtkSpinButton, GtkEntry and GtkCalendar no
+    longer have their own input-output window
+  + gtk_widget_hide_all() has been removed
+  + GtkGrid: A legacy-free, height-for-width grid container
+  + GDK gained a GdkRGBA color struct containing 4 doubles, and
+    various GdkColor APIs have GdkRGBA counterparts now.
+  + Bugs fixed: bgo#324899, bgo#438318, bgo#524304, bgo#617174,
+    bgo#632381, bgo#632538, bgo#632539, bgo#632677, bgo#632736,
+    bgo#632936.
+  + Updated translations.
+- Changes from version 2.91.1:
+  + GTK+ can now add a resize grip to any window. The resize grip
+    functionality in GtkStatusbar has been removed.
+  + A very old bug in the handling of geometry widgets has been
+    fixed, and a way to set geometry in terms of the geometry
+    widget has been added: gtk_window_resize_to_geometry()
+  + The GtkFileChooser now uses GSettings to store its settings
+    instead of the keyfile ~/.config/gtk-2.0/gtkfilechooser.ini
+  + GtkWrapBox has been dropped from GTK+ again. The widget will be
+    available in libegg until clear use cases have been
+    established.
+  + GtkWidget now has horizontal and vertical expand flags, in the
+    form of ::hexpand and ::vexpand properties. These flags are
+    intended to obsolete most custom container-specific expand
+    child properties, over time. Expandability is inherited up the
+    widget hierarchy.
+  + GtkComboBoxEntry has been deprecated in favor of a ::has-entry
+    property on GtkComboBox.
+  + The GtkComboBox text convenience API (gtk_combo_box_new_text(),
+    etc) has been deprecated in favor of a new GtkComboBoxText
+    class.
+  + GtkLinkButton has gained a ::activate-link signal that can be
+    used to suppress the default behavior.
+  + The very outdated tutorial has been dropped from the GTK+
+    distribution, and a new 'Getting started' section has been
+    added to the API documentation that will accumulate tutorial
+    material over time.
+  + Bugs fixed: bgo#68668, bgo#313350, bgo#351247, bgo#423201,
+    bgo#563002, bgo#612396, bgo#613728, bgo#628902, bgo#629722,
+    bgo#629778, bgo#629955, bgo#630850, bgo#630900, bgo#631203,
+    bgo#631311, bgo#631473, bgo#631475, bgo#631599, bgo#631719,
+    bgo#631794, bgo#631976, bgo#632059, bgo#632095, bgo#632140,
+    bgo#632218.
+  + Updated translations.
+- Drop gtk3-fix-badmatch-gnome-shell.patch: fixed upstream.
+- Add gtk3-fix-tests-build.patch to fix the build in the tests.
+- Change gtk3-data Recommends to Requires in libgtk-3_0-0 since it
+  now contains a GSettings schemas, and GSettings schemas are
+  definitely required at runtime.
+- Use %glib2_gsettings_schema_* macros for GSettings schemas
+  installation.
+- Ship README.multipress in gtk3-immodule-multipress.
+
 -------------------------------------------------------------------
 Fri Oct 15 17:12:37 CEST 2010 - vuntz@opensuse.org
 

gtk3.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gtk3 (Version 2.91.0)
+# 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,10 +22,9 @@
 
 Name:           gtk3
 %define _name gtk+
-Version:        2.91.0
+Version:        2.91.4
-Release:        2
+Release:        1
 # FIXME: 2.90.5 doesn't compile with parallel build (bgo#624304). Check if this is still true for later versions.
-# FIXME: once https://bugzilla.gnome.org/show_bug.cgi?id=631872 is fixed, distribute README.multipress
 License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3)
 Url:            http://www.gtk.org/
@@ -43,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-badmatch-gnome-shell.patch vuntz@opensuse.org -- Fix BadMatch in gnome-shell. Already in git.
+# PATCH-FIX-UPSTREAM gtk3-introspection-build-fix.patch vuntz@opensuse.org -- Fix build of introspection data, taken from git
-Patch4:         gtk3-fix-badmatch-gnome-shell.patch
+Patch4:         gtk3-introspection-build-fix.patch
 BuildRequires:  fdupes
 BuildRequires:  cups-devel
 BuildRequires:  gnome-patch-translation
@@ -80,10 +79,10 @@ Requires(post): %{name}-tools
 # such instead of as a Recommends because many applications just
 # assume it's there and we need to have a low-level package to
 # bring it in.
+Requires:       %{name}-data = %{version}
 Requires:       hicolor-icon-theme
-# gtk+ can work without branding/data/translations. Built in defaults will be used then.
+# gtk+ can work without branding/translations. Built in defaults will be used then.
 Recommends:     %{name}-branding
-Recommends:     %{name}-data = %{version}
 # it's nice to have input modules for various locales installed by default
 Recommends:     %{name}-immodule-amharic = %{version}
 Recommends:     %{name}-immodule-inuktitut = %{version}
@@ -231,6 +230,7 @@ License:        LGPLv2.1+
 Summary:        The GTK+ toolkit library (version 3) -- Data Files
 Group:          System/Libraries
 BuildArch:      noarch
+%glib2_gsettings_schema_requires
 
 %description data
 GTK+ is a multi-platform toolkit for creating graphical user interfaces.
@@ -367,6 +367,9 @@ if [ $1 == 1 ]; then
   fi
 fi
 
+%post data
+%glib2_gsettings_schema_post
+
 %if 0
 # No need to call gtk-query-immodules-3.0 in postun:
 # - if it's an upgrade, it will have been called in post
@@ -396,6 +399,9 @@ fi
 %postun immodule-xim
 %{_gtk_query_immodules_update_cache}
 
+%postun data
+%glib2_gsettings_schema_postun
+
 %files -n libgtk-3_0-0
 %defattr(-, root, root)
 %doc AUTHORS COPYING README NEWS ChangeLog
@@ -435,8 +441,7 @@ fi
 
 %files immodule-multipress
 %defattr(-,root,root)
-# Not in tarball
+%doc modules/input/README.multipress
-#%doc modules/input/README.multipress
 %{_libdir}/gtk-3.0/%{gtk_binary_version}/immodules/im-multipress.so
 %config %{_sysconfdir}/gtk-3.0/im-multipress.conf
 
@@ -466,6 +471,7 @@ fi
 
 %files data
 %defattr(-,root,root)
+%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
 %{_datadir}/themes/Default/
 %{_datadir}/themes/Emacs/
 %{_datadir}/themes/Raleigh/