From 2a80a697e37f7c38f6b8a60c89c01994ac5bb166 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 30 Aug 2011 17:38:15 -0400 Subject: [PATCH 1/5] 2.24.6 --- .gitignore | 1 + gtk2.spec | 11 ++++------- sources | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 91fa938..4fb9073 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ gtk+-2.21.5.tar.bz2 /gtk+-2.24.3.tar.bz2 /gtk+-2.24.4.tar.bz2 /gtk+-2.24.5.tar.xz +/gtk+-2.24.6.tar.xz diff --git a/gtk2.spec b/gtk2.spec index 0d315d7..c53a340 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -17,7 +17,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 -Version: 2.24.5 +Version: 2.24.6 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -283,8 +283,6 @@ fi /usr/bin/update-gtk-immodules %{_host} %files -f gtk20.lang -%defattr(-, root, root) - %doc AUTHORS COPYING NEWS README %{_bindir}/gtk-query-immodules-2.0* %{_bindir}/update-gtk-immodules @@ -307,7 +305,6 @@ fi %{_libdir}/girepository-1.0 %files immodules -%defattr(-, root, root) %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-am-et.so %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cedilla.so %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-cyrillic-translit.so @@ -322,11 +319,9 @@ fi %config(noreplace) %{_sysconfdir}/gtk-2.0/im-multipress.conf %files immodule-xim -%defattr(-, root, root) %{_libdir}/gtk-2.0/%{bin_version}/immodules/im-xim.so %files devel -f gtk20-properties.lang -%defattr(-, root, root) %{_libdir}/lib*.so %{_libdir}/gtk-2.0/include %{_includedir}/* @@ -338,7 +333,6 @@ fi %{_datadir}/gir-1.0 %files devel-docs -%defattr(-, root, root) %{_datadir}/gtk-doc # oops, man pages went missing # %{_mandir}/man1/* @@ -347,6 +341,9 @@ fi %doc tmpdocs/examples %changelog +* Tue Aug 30 2011 Matthias Clasen - 2.24.6-1 +- Update to 2.24.6 + * Fri Jun 17 2011 Tomas Bzatek - 2.24.5-1 - Update to 2.24.5 diff --git a/sources b/sources index 9f721d4..84f48f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f229b6de6699b898682939bc5baa0c61 gtk+-2.24.5.tar.xz +4d7efde4ac24dbaa720bc0744eee8235 gtk+-2.24.6.tar.xz From 591be0e285a34a00da2567385a56ac0176a40baf Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 Oct 2011 22:19:10 -0400 Subject: [PATCH 2/5] 2.24.7 --- .gitignore | 1 + gtk2-schar.patch | 36 ++++++++++++++++++++++++++++++++++++ gtk2.spec | 7 ++++++- sources | 2 +- window-dragging.patch | 38 +++++++++++++++----------------------- 5 files changed, 59 insertions(+), 25 deletions(-) create mode 100644 gtk2-schar.patch diff --git a/.gitignore b/.gitignore index 4fb9073..933fa5c 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ gtk+-2.21.5.tar.bz2 /gtk+-2.24.4.tar.bz2 /gtk+-2.24.5.tar.xz /gtk+-2.24.6.tar.xz +/gtk+-2.24.7.tar.xz diff --git a/gtk2-schar.patch b/gtk2-schar.patch new file mode 100644 index 0000000..1846ce8 --- /dev/null +++ b/gtk2-schar.patch @@ -0,0 +1,36 @@ +diff -up gtk+-2.24.7/gdk/gdkmarshalers.c.schar gtk+-2.24.7/gdk/gdkmarshalers.c +--- gtk+-2.24.7/gdk/gdkmarshalers.c.schar 2011-10-17 18:05:32.000000000 -0400 ++++ gtk+-2.24.7/gdk/gdkmarshalers.c 2011-10-17 20:07:54.859431530 -0400 +@@ -5,7 +5,7 @@ + + #ifdef G_ENABLE_DEBUG + #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) +-#define g_marshal_value_peek_char(v) g_value_get_schar (v) ++#define g_marshal_value_peek_char(v) g_value_get_char (v) + #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) + #define g_marshal_value_peek_int(v) g_value_get_int (v) + #define g_marshal_value_peek_uint(v) g_value_get_uint (v) +diff -up gtk+-2.24.7/gtk/gtkmarshal.c.schar gtk+-2.24.7/gtk/gtkmarshal.c +--- gtk+-2.24.7/gtk/gtkmarshal.c.schar 2011-10-17 20:10:48.682425316 -0400 ++++ gtk+-2.24.7/gtk/gtkmarshal.c 2011-10-17 20:10:56.723425027 -0400 +@@ -6,7 +6,7 @@ + + #ifdef G_ENABLE_DEBUG + #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) +-#define g_marshal_value_peek_char(v) g_value_get_schar (v) ++#define g_marshal_value_peek_char(v) g_value_get_char (v) + #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) + #define g_marshal_value_peek_int(v) g_value_get_int (v) + #define g_marshal_value_peek_uint(v) g_value_get_uint (v) +diff -up gtk+-2.24.7/gtk/gtkmarshalers.c.schar gtk+-2.24.7/gtk/gtkmarshalers.c +--- gtk+-2.24.7/gtk/gtkmarshalers.c.schar 2011-10-17 18:05:54.000000000 -0400 ++++ gtk+-2.24.7/gtk/gtkmarshalers.c 2011-10-17 20:07:54.860431529 -0400 +@@ -6,7 +6,7 @@ + + #ifdef G_ENABLE_DEBUG + #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) +-#define g_marshal_value_peek_char(v) g_value_get_schar (v) ++#define g_marshal_value_peek_char(v) g_value_get_char (v) + #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) + #define g_marshal_value_peek_int(v) g_value_get_int (v) + #define g_marshal_value_peek_uint(v) g_value_get_uint (v) diff --git a/gtk2.spec b/gtk2.spec index c53a340..972d1b6 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -17,7 +17,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 -Version: 2.24.6 +Version: 2.24.7 Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -39,6 +39,7 @@ Patch8: tooltip-positioning.patch #Patch14: gtk2-landscape-pdf-print.patch # https://bugzilla.gnome.org/show_bug.cgi?id=611313 Patch15: window-dragging.patch +Patch16: gtk2-schar.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -155,6 +156,7 @@ This package contains developer documentation for the GTK+ widget toolkit. %patch8 -p1 -b .tooltip-positioning #%patch14 -p1 -b .landscape-pdf-print %patch15 -p1 -b .window-dragging +%patch16 -p1 -b .schar %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -341,6 +343,9 @@ fi %doc tmpdocs/examples %changelog +* Mon Oct 17 2011 Matthias Clasen - 2.24.7-1 +- Update to 2.24.7 + * Tue Aug 30 2011 Matthias Clasen - 2.24.6-1 - Update to 2.24.6 diff --git a/sources b/sources index 84f48f7..97027e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4d7efde4ac24dbaa720bc0744eee8235 gtk+-2.24.6.tar.xz +719df30b5076a0e37b62f968a5e1312c gtk+-2.24.7.tar.xz diff --git a/window-dragging.patch b/window-dragging.patch index bb8543c..88aa26b 100644 --- a/window-dragging.patch +++ b/window-dragging.patch @@ -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 @@ index 4788590..cb94c64 100644 } } } -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 @@ index 8f065a7..c72a09f 100644 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)); From 58c3a272c320ea84677b6ccf7aa8687898ea049d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 26 Oct 2011 20:11:50 -0500 Subject: [PATCH 3/5] - Rebuilt for glibc bug#747377 --- gtk2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtk2.spec b/gtk2.spec index 972d1b6..08c2b6f 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -18,7 +18,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: 2.24.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org @@ -343,6 +343,9 @@ fi %doc tmpdocs/examples %changelog +* Wed Oct 26 2011 Fedora Release Engineering - 2.24.7-2 +- Rebuilt for glibc bug#747377 + * Mon Oct 17 2011 Matthias Clasen - 2.24.7-1 - Update to 2.24.7 From ee8dd37078aeff2d1086d324a7fd5b2f254d3cb3 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 2 Nov 2011 15:45:29 -0400 Subject: [PATCH 4/5] Add upstream patch for crasher bug #749541. Upstream bug is https://bugzilla.gnome.org/show_bug.cgi?id=662633 --- ...d5af99f2ae9b0f8cc6b943b98b7be43ed723.patch | 23 +++++++++++++++++++ gtk2.spec | 7 ++++++ 2 files changed, 30 insertions(+) create mode 100644 0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch diff --git a/0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch b/0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch new file mode 100644 index 0000000..b5351c6 --- /dev/null +++ b/0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch @@ -0,0 +1,23 @@ +From 0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723 Mon Sep 17 00:00:00 2001 +From: Michael Natterer +Date: Wed, 02 Nov 2011 19:27:39 +0000 +Subject: Bug 662633 - Scheduled transaction editor crashes with gtk+-2.24.7 + +Fix commit a516d2359c9eac84bfa4682a70a62315adedb1d6: check if +priv->arrow_button exists in forall(). +--- +diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c +index edeab88..b2c4b15 100644 +--- a/gtk/gtktoolbar.c ++++ b/gtk/gtktoolbar.c +@@ -2532,7 +2532,7 @@ gtk_toolbar_forall (GtkContainer *container, + list = next; + } + +- if (include_internals) ++ if (include_internals && priv->arrow_button) + callback (priv->arrow_button, callback_data); + } + +-- +cgit v0.9.0.2 diff --git a/gtk2.spec b/gtk2.spec index 08c2b6f..342f3bd 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -40,6 +40,9 @@ Patch8: tooltip-positioning.patch # https://bugzilla.gnome.org/show_bug.cgi?id=611313 Patch15: window-dragging.patch Patch16: gtk2-schar.patch +# https://bugzilla.gnome.org/show_bug.cgi?id=662633 +# merged for 2.24.8 +Patch17: 0a0fd5af99f2ae9b0f8cc6b943b98b7be43ed723.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -157,6 +160,7 @@ This package contains developer documentation for the GTK+ widget toolkit. #%patch14 -p1 -b .landscape-pdf-print %patch15 -p1 -b .window-dragging %patch16 -p1 -b .schar +%patch17 -p1 -b .toolbar-arrow-button %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; @@ -343,6 +347,9 @@ fi %doc tmpdocs/examples %changelog +* Wed Nov 02 2011 Bill Nottingham - 2.24.7-3 +- add upstream patch for #749541/b.g.o #662633 + * Wed Oct 26 2011 Fedora Release Engineering - 2.24.7-2 - Rebuilt for glibc bug#747377 From 046be53b4b9b772a227e8e15b55e25deffe67014 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 2 Nov 2011 18:06:58 -0400 Subject: [PATCH 5/5] bump release --- gtk2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtk2.spec b/gtk2.spec index 342f3bd..deedc60 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -18,7 +18,7 @@ Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: 2.24.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: http://www.gtk.org