[gtk2] 2.24.7
Matthias Clasen
mclasen at fedoraproject.org
Tue Oct 18 02:55:31 UTC 2011
commit 43f5848eb2b5cc102f362770a1ba54f613fb1545
Author: Matthias Clasen <mclasen at redhat.com>
Date: Mon Oct 17 22:55:00 2011 -0400
2.24.7
.gitignore | 2 ++
gtk2.spec | 16 +++++++++-------
sources | 2 +-
window-dragging.patch | 38 +++++++++++++++-----------------------
4 files changed, 27 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 91fa938..933fa5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ 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
+/gtk+-2.24.7.tar.xz
diff --git a/gtk2.spec b/gtk2.spec
index 0d315d7..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.5
+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;
@@ -283,8 +285,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 +307,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 +321,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 +335,6 @@ fi
%{_datadir}/gir-1.0
%files devel-docs
-%defattr(-, root, root)
%{_datadir}/gtk-doc
# oops, man pages went missing
# %{_mandir}/man1/*
@@ -347,6 +343,12 @@ fi
%doc tmpdocs/examples
%changelog
+* Mon Oct 17 2011 Matthias Clasen <mclasen at redhat.com> - 2.24.7-1
+- Update to 2.24.7
+
+* Tue Aug 30 2011 Matthias Clasen <mclasen at redhat.com> - 2.24.6-1
+- Update to 2.24.6
+
* Fri Jun 17 2011 Tomas Bzatek <tbzatek at redhat.com> - 2.24.5-1
- Update to 2.24.5
diff --git a/sources b/sources
index 9f721d4..97027e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f229b6de6699b898682939bc5baa0c61 gtk+-2.24.5.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));
More information about the scm-commits
mailing list