From a1c39e7c69ecd2cd0d361d812f155c0a71df7b56 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mar 13 2007 23:43:57 +0000 Subject: 2.10.10 --- diff --git a/gtk+-2.10.10-tab-detach.patch b/gtk+-2.10.10-tab-detach.patch new file mode 100644 index 0000000..019a0e4 --- /dev/null +++ b/gtk+-2.10.10-tab-detach.patch @@ -0,0 +1,23 @@ +--- gtk+-2.10.10/gtk/gtknotebook.c.detach 2007-03-12 23:36:03.000000000 -0400 ++++ gtk+-2.10.10/gtk/gtknotebook.c 2007-03-12 23:42:11.000000000 -0400 +@@ -3926,9 +3926,6 @@ + else + g_object_ref_sink (page->menu_label); + +- /* child visible will be turned on by switch_page below */ +- gtk_widget_set_child_visible (child, FALSE); +- + if (notebook->menu) + gtk_notebook_menu_item_create (notebook, + g_list_find (notebook->children, page)); +@@ -3942,6 +3939,10 @@ + if (!notebook->first_tab) + notebook->first_tab = notebook->children; + ++ /* child visible will be turned on by switch_page below */ ++ if (notebook->cur_page != page) ++ gtk_widget_set_child_visible (child, FALSE); ++ + if (tab_label) + { + if (notebook->show_tabs && GTK_WIDGET_VISIBLE (child)) diff --git a/gtk2.spec b/gtk2.spec index c0886b3..c8b2e09 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -10,13 +10,13 @@ %define cairo_version %{cairo_base_version}-1 %define libpng_version 2:1.2.2-16 -%define base_version 2.10.9 +%define base_version 2.10.10 %define bin_version 2.10.0 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X Name: gtk2 Version: %{base_version} -Release: 4%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2 @@ -38,6 +38,9 @@ Patch7: gtk+-2.10.7-cursor-blink.patch # fixed in upstream cvs Patch10: gtk+-2.10.4-im-reset.patch +# fixed in upstream svn +Patch11: gtk+-2.10.10-tab-detach.patch + BuildRequires: atk-devel >= %{atk_version} BuildRequires: pango-devel >= %{pango_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -122,6 +125,7 @@ docs for the GTK+ widget toolkit. %patch7 -p1 -b .cursor-blink %patch10 -p1 -b .im-reset +%patch11 -p1 -b .tab-detach for i in config.guess config.sub ; do test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . @@ -288,8 +292,11 @@ rm -rf $RPM_BUILD_ROOT %doc tmpdocs/examples %changelog +* Mon Mar 12 2007 Matthias Clasen - 2.10.10-1 +- Update to 2.10.10 + * Fri Feb 9 2007 Stepan Kasal - 2.10.9-4 -- Clean up the autotools calles in %%prep. +- Clean up the autotools calls in %%prep. * Fri Feb 2 2007 Matthias Clasen - 2.10.9-3 - Fix update-gtk-immodules and update-gdk-pixbuf-loaders diff --git a/sources b/sources index aadddf4..ec85274 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -20d763198efb38263b22dee347f69da6 gtk+-2.10.9.tar.bz2 +73967e62a2e2e588ace772ac9db1bc32 gtk+-2.10.10.tar.bz2