Hello community, here is the log from the commit of package gtk2 for openSUSE:Factory checked in at 2012-01-11 15:36:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk2 (Old) and /work/SRC/openSUSE:Factory/.gtk2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gtk2", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gtk2/gtk2.changes 2011-10-29 08:00:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtk2.new/gtk2.changes 2012-01-11 15:37:29.000000000 +0100 @@ -1,0 +2,31 @@ +Wed Dec 21 03:28:49 UTC 2011 - vu...@opensuse.org + +- Add gtk2-use-gmodule.patch: fix build by linking + gtk-query-immodules-2.0 to gmodule-2.0; taken from git. +- Update gtk2-window-dragging.patch from Fedora, and really apply + it. + +------------------------------------------------------------------- +Thu Dec 8 22:11:26 UTC 2011 - dims...@opensuse.org + +- Split typelib files into typelib-1_0-Gtk-2_0 subpackage. +- Add typelib-1_0-Gtk-2_0 Requires to devel subpackage. + +------------------------------------------------------------------- +Tue Nov 15 11:10:55 UTC 2011 - vu...@opensuse.org + +- Update to version 2.24.8: + + Major Win32 backend update. + + OS X updates. + + Ensure that the MOD1 modifier always means ALT, as this + assumption is already used in many places in Gtk+ + + Search engine backend updated to Tracker 0.12 + + Bugs fixed: bgo#84314, bgo#142874, bgo#169811, bgo#171456, + bgo#324254, bgo#516822, bgo#537296, bgo#542777, bgo#552041, + bgo#574935, bgo#604156, bgo#612359, bgo#631384, bgo#647460, + bgo#650300, bgo#658272, bgo#659565, bgo#661997, bgo#662633, + bgo#662670, bgo#663138, bgo#663182, bgo#663543, bgo#663605. +- Drop gtk2-tracker-0.10.patch: fixed upstream. +- Re-enable parallel build now that it works. + +------------------------------------------------------------------- Old: ---- gtk+-2.24.7.tar.bz2 gtk2-tracker-0.10.patch New: ---- gtk+-2.24.8.tar.bz2 gtk2-use-gmodule.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2.spec ++++++ --- /var/tmp/diff_new_pack.8t7bfW/_old 2012-01-11 15:37:40.000000000 +0100 +++ /var/tmp/diff_new_pack.8t7bfW/_new 2012-01-11 15:37:40.000000000 +0100 @@ -21,14 +21,13 @@ Name: gtk2 %define _name gtk+ -Version: 2.24.7 -Release: 1 -# FIXME: 2.19.3 doesn't compile with parallel build. Check if this is still true for later versions. +Version: 2.24.8 +Release: 0 # FIXME: when updating to next version, check whether we can remove the workaround for bgo#596977 below (removing -fomit-frame-pointer) -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -Url: http://www.gtk.org/ +License: LGPL-2.1+ Group: System/Libraries +Url: http://www.gtk.org/ Source: http://download.gnome.org/sources/gtk+/2.24/%{_name}-%{version}.tar.bz2 Source2: README.SuSE Source3: gtkrc @@ -46,8 +45,8 @@ Patch23: bugzilla-131498-allow-xim-for-all-languages.patch # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 feder...@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages Patch24: gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff -# PATCH-FIX-UPSTREAM gtk2-tracker-0.10.patch vu...@opensuse.org -- Use new tracker 0.10 API to fix search in open file dialogs. Cherry-picked from GTK+ 3 branch, with some additional fixes (bgo#642768, bgo#642771) -Patch25: gtk2-tracker-0.10.patch +# PATCH-FIX-UPSTREAM gtk2-use-gmodule.patch vu...@opensuse.org -- fix build by linking gtk-query-immodules-2.0 to gmodule-2.0; taken from git +Patch25: gtk2-use-gmodule.patch # Patches taken from upstream or slated to go upstream. We can expect these to become obsolete # in future releases. # Please don't delete this comment even if this section is empty -- "# empty" should @@ -56,11 +55,11 @@ # be here instead. # PATCH-FIX-OPENSUSE gtk-path-local.patch Search in /usr/local/%{_lib} by default. bnc369696 bgo534474 Patch53: gtk-path-local.patch -BuildRequires: fdupes -BuildRequires: gcc-c++ BuildRequires: atk-devel BuildRequires: cairo-devel BuildRequires: cups-devel +BuildRequires: fdupes +BuildRequires: gcc-c++ BuildRequires: gdk-pixbuf-devel # Needed for patches touching the build system BuildRequires: gnome-common @@ -78,7 +77,6 @@ ranging from small one-off projects to complete application suites. %package -n libgtk-2_0-0 -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) Group: System/Libraries Requires(post): %{name}-tools @@ -115,8 +113,18 @@ Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. +%package -n typelib-1_0-Gtk-2_0 +Summary: The GTK+ toolkit library (version 2) -- Introspection bindings +Group: System/Libraries + +%description -n typelib-1_0-Gtk-2_0 +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 GObject Introspection bindings for GTK+. + %package immodule-amharic -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Amharic Input Method Group: System/Libraries Requires: %{name} = %{version} @@ -132,7 +140,6 @@ This package provides an input method for Amharic. %package immodule-inuktitut -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Inuktitut Input Method Group: System/Libraries Requires: %{name} = %{version} @@ -148,7 +155,6 @@ This package provides an input method for Inuktitut. %package immodule-multipress -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Multipress Input Method Group: System/Libraries Requires: %{name} = %{version} @@ -164,7 +170,6 @@ multi-press method, as on a mobile phone. %package immodule-thai -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Thai-Lao Input Method Group: System/Libraries Requires: %{name} = %{version} @@ -181,7 +186,6 @@ This package provides an input method for Thai-Lao. %package immodules-tigrigna -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Tigrigna Input Methods Group: System/Libraries Requires: %{name} = %{version} @@ -197,7 +201,6 @@ This package provides two input methods for Tigrigna. %package immodule-vietnamese -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Vietnamese Input Method Group: System/Libraries Requires: %{name} = %{version} @@ -213,7 +216,6 @@ This package provides an input method for Vietnamese. %package immodule-xim -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- X Input Method Group: System/Libraries Requires: %{name} = %{version} @@ -232,7 +234,6 @@ This package provides an input method based on the X Input Method. %package tools -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Tools Group: System/Libraries Requires(post): update-alternatives @@ -244,7 +245,6 @@ ranging from small one-off projects to complete application suites. %package data -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Data Files Group: System/Libraries BuildArch: noarch @@ -255,7 +255,6 @@ ranging from small one-off projects to complete application suites. %package branding-upstream -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Upstream theme configuration Group: System/Libraries Requires: libgtk-2_0-0 = %{version} @@ -273,10 +272,10 @@ ranging from small one-off projects to complete application suites. %package devel -License: LGPLv2.1+ Summary: The GTK+ toolkit library (version 2) -- Development Files Group: Development/Libraries/X11 Requires: libgtk-2_0-0 = %{version} +Requires: typelib-1_0-Gtk-2_0 = %{version} # gtk-builder-convert needs this. Requires: python-xml # gail is part of gtk+ as of 2.13.x @@ -311,6 +310,7 @@ fi done gnome-patch-translation-prepare +%patch0 -p1 %if "%_lib" == "lib64" cp -a %{S:2} . # WARNING: This patch does not patch not installed demos and tests. @@ -320,9 +320,7 @@ %patch22 -p1 %patch23 -p1 %patch24 -p1 -%if 0%{?suse_version} > 1130 %patch25 -p1 -%endif %patch53 gnome-patch-translation-update @@ -340,8 +338,7 @@ --enable-man \ --with-xinput=xfree \ --enable-introspection -#%{__make} %{?_smp_mflags} -%{__make} +make %{?_smp_mflags} %install %makeinstall @@ -503,6 +500,9 @@ %{_libdir}/libgailutil.so.* %{_libdir}/libgdk-x11-2.0.so.* %{_libdir}/libgtk-x11-2.0.so.* + +%files -n typelib-1_0-Gtk-2_0 +%defattr(-,root,root) %{_libdir}/girepository-1.0/Gdk-2.0.typelib %{_libdir}/girepository-1.0/GdkX11-2.0.typelib %{_libdir}/girepository-1.0/Gtk-2.0.typelib ++++++ gtk+-2.24.7.tar.bz2 -> gtk+-2.24.8.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/gtk2/gtk+-2.24.7.tar.bz2 /work/SRC/openSUSE:Factory/.gtk2.new/gtk+-2.24.8.tar.bz2 differ: char 11, line 1 ++++++ gtk2-use-gmodule.patch ++++++ >From 26b749440bb61c59f79d8be93ddf7bc529085c3e Mon Sep 17 00:00:00 2001 From: Florian Müllner <fmuell...@gnome.org> Date: Thu, 24 Nov 2011 15:31:47 +0000 Subject: build: Add gmodule-2.0 dependency for gtk-query-immodules-2.0 --- diff --git a/configure.in b/configure.in index 1f81bf1..9577c54 100644 --- a/configure.in +++ b/configure.in @@ -392,6 +392,8 @@ fi PKG_CHECK_MODULES(CAIRO_BACKEND, [cairo-$cairo_backend >= cairo_required_version]) +PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) + if test "$os_win32" != yes; then # libtool option to control which symbols are exported # right now, symbols starting with _ are not exported diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 15343df..cf3edd6 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1076,7 +1076,7 @@ gtk-update-icon-cache.exe.manifest: endif gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) -gtk_query_immodules_2_0_LDADD = $(LDADDS) +gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GMODULE_LIBS) gtk_query_immodules_2_0_SOURCES = queryimmodules.c gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) -- cgit v0.9.0.2 ++++++ gtk2-window-dragging.patch ++++++ --- /var/tmp/diff_new_pack.8t7bfW/_old 2012-01-11 15:37:40.000000000 +0100 +++ /var/tmp/diff_new_pack.8t7bfW/_new 2012-01-11 15:37:40.000000000 +0100 @@ -1,8 +1,7 @@ -diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c -index 4788590..cb94c64 100644 ---- a/gtk/gtkmenushell.c -+++ b/gtk/gtkmenushell.c -@@ -585,18 +585,45 @@ gtk_menu_shell_button_press (GtkWidget *widget, +diff -up gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging gtk+-2.24.7/gtk/gtkmenushell.c +--- gtk+-2.24.7/gtk/gtkmenushell.c.window-dragging 2011-08-15 22:30:52.000000000 -0400 ++++ gtk+-2.24.7/gtk/gtkmenushell.c 2011-10-17 19:50:52.180468086 -0400 +@@ -589,18 +589,45 @@ gtk_menu_shell_button_press (GtkWidget if (!menu_shell->active || !menu_shell->button) { @@ -55,26 +54,20 @@ } } } -diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c -index 8f065a7..c72a09f 100644 ---- a/gtk/gtktoolbar.c -+++ b/gtk/gtktoolbar.c -@@ -2699,17 +2699,41 @@ static gboolean +diff -up gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging gtk+-2.24.7/gtk/gtktoolbar.c +--- gtk+-2.24.7/gtk/gtktoolbar.c.window-dragging 2011-10-01 11:29:06.000000000 -0400 ++++ gtk+-2.24.7/gtk/gtktoolbar.c 2011-10-17 19:52:56.104463657 -0400 +@@ -2701,6 +2701,8 @@ static gboolean gtk_toolbar_button_press (GtkWidget *toolbar, GdkEventButton *event) { + GtkWidget *window; + - if (event->button == 3) + if (_gtk_button_event_triggers_context_menu (event)) { gboolean return_value; -- -+ - g_signal_emit (toolbar, toolbar_signals[POPUP_CONTEXT_MENU], 0, - (int)event->x_root, (int)event->y_root, event->button, - &return_value); -- -+ +@@ -2711,7 +2713,29 @@ gtk_toolbar_button_press (GtkWidget + return return_value; } - @@ -104,11 +97,10 @@ return FALSE; } -diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c -index 58ce2db..921c22a 100644 ---- a/gtk/gtkwidget.c -+++ b/gtk/gtkwidget.c -@@ -2443,6 +2443,13 @@ gtk_widget_class_init (GtkWidgetClass *klass) +diff -up gtk+-2.24.7/gtk/gtkwidget.c.window-dragging gtk+-2.24.7/gtk/gtkwidget.c +--- gtk+-2.24.7/gtk/gtkwidget.c.window-dragging 2011-10-17 19:50:52.175468086 -0400 ++++ gtk+-2.24.7/gtk/gtkwidget.c 2011-10-17 19:50:52.184468086 -0400 +@@ -2467,6 +2467,13 @@ gtk_widget_class_init (GtkWidgetClass *k 0.0, 1.0, 0.04, GTK_PARAM_READABLE)); -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
