From 15c5e1b836de285ac186fc11fa350e15569aec92e981365af2e030289963d1e8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 1 Nov 2010 19:56:26 +0000 Subject: [PATCH] Accepting request 51606 from home:vuntz:branches:GNOME:Factory OBS-URL: https://build.opensuse.org/request/show/51606 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=16 --- gtk+-2.91.0.tar.bz2 | 3 -- gtk+-2.91.2.tar.bz2 | 3 ++ gtk3-fix-badmatch-gnome-shell.patch | 12 ----- gtk3-fix-tests-build.patch | 59 ++++++++++++++++++++++ gtk3.changes | 76 +++++++++++++++++++++++++++++ gtk3.spec | 26 ++++++---- 6 files changed, 154 insertions(+), 25 deletions(-) delete mode 100644 gtk+-2.91.0.tar.bz2 create mode 100644 gtk+-2.91.2.tar.bz2 delete mode 100644 gtk3-fix-badmatch-gnome-shell.patch create mode 100644 gtk3-fix-tests-build.patch diff --git a/gtk+-2.91.0.tar.bz2 b/gtk+-2.91.0.tar.bz2 deleted file mode 100644 index 453c3e9..0000000 --- a/gtk+-2.91.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:694e887b946a3aa28af10f776bc6f79bc566d0e1be679783d4e7469bc728aeac -size 16898729 diff --git a/gtk+-2.91.2.tar.bz2 b/gtk+-2.91.2.tar.bz2 new file mode 100644 index 0000000..434959e --- /dev/null +++ b/gtk+-2.91.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:754459ed3d6a1667a8a2a88be1c47914f620c6fbd0fd6329b7bdf48eb9ed4d05 +size 16329107 diff --git a/gtk3-fix-badmatch-gnome-shell.patch b/gtk3-fix-badmatch-gnome-shell.patch deleted file mode 100644 index 8c346b4..0000000 --- a/gtk3-fix-badmatch-gnome-shell.patch +++ /dev/null @@ -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; diff --git a/gtk3-fix-tests-build.patch b/gtk3-fix-tests-build.patch new file mode 100644 index 0000000..958c4ad --- /dev/null +++ b/gtk3-fix-tests-build.patch @@ -0,0 +1,59 @@ +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.changes b/gtk3.changes index 2364bbe..3dc343c 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +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 diff --git a/gtk3.spec b/gtk3.spec index 050067a..7d32f6c 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -1,5 +1,5 @@ # -# spec file for package gtk3 (Version 2.91.0) +# spec file for package gtk3 (Version 2.91.2) # # 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 -Release: 2 +Version: 2.91.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. -Patch4: gtk3-fix-badmatch-gnome-shell.patch +# PATCH-FIX-UPSTREAM gtk3-fix-tests-build.patch bgo#633374 vuntz@opensuse.org -- Fix build of tests +Patch4: gtk3-fix-tests-build.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/