diff --git a/gtk+-2.17.10.tar.bz2 b/gtk+-2.17.10.tar.bz2 deleted file mode 100644 index 447c864..0000000 --- a/gtk+-2.17.10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d858bebe37c4dcbe23b2a40b132ffee4b078555fa4ec4fa397313445fbcb8dd -size 18959649 diff --git a/gtk+-2.17.11.tar.bz2 b/gtk+-2.17.11.tar.bz2 new file mode 100644 index 0000000..9686d92 --- /dev/null +++ b/gtk+-2.17.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbbb13462ec385ba6803f08b5c6d15342b74282828b2fe699e75723aa0e89c70 +size 18920203 diff --git a/gtk2-64bit-build-fix.patch b/gtk2-64bit-build-fix.patch new file mode 100644 index 0000000..aafcfda --- /dev/null +++ b/gtk2-64bit-build-fix.patch @@ -0,0 +1,13 @@ +Index: gtk+-2.17.11/tests/testwindows.c +=================================================================== +--- gtk+-2.17.11.orig/tests/testwindows.c ++++ gtk+-2.17.11/tests/testwindows.c +@@ -1034,7 +1034,7 @@ main (int argc, char **argv) + button = gtk_button_new_with_label ("Restack above"); + g_signal_connect (button, "clicked", + G_CALLBACK (restack_clicked), +- 1); ++ GINT_TO_POINTER (1)); + gtk_table_attach_defaults (GTK_TABLE (table), + button, + 2, 3, diff --git a/gtk2-install-po.patch b/gtk2-install-po.patch new file mode 100644 index 0000000..a90ba31 --- /dev/null +++ b/gtk2-install-po.patch @@ -0,0 +1,32 @@ +commit 05ef84e9d6a5409d22f87023b861fb2450c4f86a +Author: Matthias Clasen +Date: Sat Sep 5 01:46:39 2009 -0400 + + Fix fallout from automake version bump + +diff --git a/po-properties/Makefile.in.in b/po-properties/Makefile.in.in +index f7bf587..db1b638 100644 +--- a/po-properties/Makefile.in.in ++++ b/po-properties/Makefile.in.in +@@ -107,7 +107,7 @@ install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + $(mkdir_p) $(DESTDIR)$(datadir); \ +- @catalogs='$(CATALOGS)'; \ ++ catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ +diff --git a/po/Makefile.in.in b/po/Makefile.in.in +index 7e9c655..5f53019 100644 +--- a/po/Makefile.in.in ++++ b/po/Makefile.in.in +@@ -126,7 +126,7 @@ install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + $(mkdir_p) $(DESTDIR)$(datadir); \ +- @catalogs='$(CATALOGS)'; \ ++ catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ diff --git a/gtk2.changes b/gtk2.changes index 5c3c54a..400af9a 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,43 @@ +------------------------------------------------------------------- +Wed Sep 9 18:14:19 CEST 2009 - vuntz@opensuse.org + +- Update to version 2.17.11: + + Client-side windows: + - Add gdk_cairo_reset_clip that lets you get back the original + drawable clip + - Add gdk_window_restack to more conveniently restack child + windows + - Add gdk_window_is_destroyed as a replacement for + GDK_WINDOW_DESTROYED + - Deprecated GDK_WINDOW_OBJECT and GdkWindowObject + + GSEAL: + - Add gtk_widget_set_receives_default and + gtk_widget_get_receives_default accessors for + GTK_RECEIVES_DEFAULT + + GtkTreeView: + - Correctly propagate insensitive state to cell renderers + + GtkTextView: + - Merge a number of scrolling-related fixes from Maemo + + Bugs fixed: + - bgo#564160 - gtk_combo_box_entry_set_text_column too + restrictive + - bgo#593868 - gtk_im_multicontext_set_client_window recreate a + new slave... + - bgo#593644 - gdk_x11_screen_get_window_manager_name should + not cache... + - bgo#594178 - gdk-pixbuf-query-loaders segfault in + write_loader_info + - bgo#567124 - proposal to delay doing something related to + immodule... + - bgo#588788 - GTK+ compilation should work with automake1.10 + - bgo#584638 - Build of gtkupdateiconcache without NLS breaks + - bgo#593788 - misprint in the returning value of + gdk_selection_property_get + - bgo#593606 - Missing include in gtk/gtkcellrendereraccel.c + - bgo#593877 - Undefined symbols while compilation +- Add gtk2-install-po.patch to fix build. +- Add gtk2-64bit-build-fix.patch to fix build. + ------------------------------------------------------------------- Tue Sep 1 21:10:43 CEST 2009 - dimstar@opensuse.org diff --git a/gtk2.spec b/gtk2.spec index fa2a2bb..bfcdd19 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -1,5 +1,5 @@ # -# spec file for package gtk2 (Version 2.17.10) +# spec file for package gtk2 (Version 2.17.11) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -38,7 +38,7 @@ Obsoletes: gtk2-64bit %endif # PreReq: /usr/bin/touch /bin/rm /bin/rmdir -Version: 2.17.10 +Version: 2.17.11 Release: 1 Summary: Library for Creation of Graphical User Interfaces (version 2) Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.12/%{_name}-%{version}.tar.bz2 @@ -57,6 +57,10 @@ Patch22: bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff Patch23: bugzilla-131498-allow-xim-for-all-languages.patch # PATCH-FIX-UPSTREAM gtk2-bnc130159-bgo319483-async-selection-in-gtk-font-selection.diff bnc130159 bgo319483 federico@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-install-po.patch vuntz@novell.com -- Taken from git +Patch25: gtk2-install-po.patch +# PATCH-FIX-UPSTREAM gtk2-64bit-build-fix.patch bgo594679 vuntz@novell.com -- 64 bit issue +Patch26: gtk2-64bit-build-fix.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 @@ -89,32 +93,6 @@ with GTK1, so to switch, programmers have to port applications to it. To develop applications with gtk, you need the package gtk2-devel. - - -Authors: --------- - Peter Mattis - Spencer Kimball - Josh MacDonald - Shawn T. Amundson - Jerome Bolliet - Damon Chaplin - Tony Gale - Jeff Garzik - Lars Hamann - Raja R Harinath - Carsten Haitzler - Tim Janik - Stefan Jeske - Elliot Lee - Raph Levien - Ian Main - Federico Mena - Paolo Molaro - Jay Painter - Manish Singh - Owen Taylor - %package branding-upstream License: LGPL v2.1 or later Summary: Library for Creation of Graphical User Interfaces (version 2) @@ -137,32 +115,6 @@ with GTK1, so to switch, programmers have to port applications to it. To develop applications with gtk, you need the package gtk2-devel. - - -Authors: --------- - Peter Mattis - Spencer Kimball - Josh MacDonald - Shawn T. Amundson - Jerome Bolliet - Damon Chaplin - Tony Gale - Jeff Garzik - Lars Hamann - Raja R Harinath - Carsten Haitzler - Tim Janik - Stefan Jeske - Elliot Lee - Raph Levien - Ian Main - Federico Mena - Paolo Molaro - Jay Painter - Manish Singh - Owen Taylor - %package devel License: LGPL v2.1 or later Summary: Development environment for the Gtk2 GUI library @@ -196,32 +148,6 @@ Originally it was written for the GIMP and hence has the name Gimp ToolKit. Many people like it because it is small, efficient, and very configurable. - - -Authors: --------- - Peter Mattis - Spencer Kimball - Josh MacDonald - Shawn T. Amundson - Jerome Bolliet - Damon Chaplin - Tony Gale - Jeff Garzik - Lars Hamann - Raja R Harinath - Carsten Haitzler - Tim Janik - Stefan Jeske - Elliot Lee - Raph Levien - Ian Main - Federico Mena - Paolo Molaro - Jay Painter - Manish Singh - Owen Taylor - %lang_package %prep %setup -q -n %{_name}-%{version} @@ -238,6 +164,8 @@ cp -a %{S:2} . %patch22 -p1 %patch23 -p1 %patch24 -p1 +%patch25 -p1 +%patch26 -p1 %patch53 # gnome-patch-translation-update