OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtk2?expand=0&rev=26

2008-02-22 00:26:35 +00:00 · 2008-02-22 00:26:35 +00:00 · 95997c6d00
commit 95997c6d00
parent cd663b16a2
5 changed files with 67 additions and 22 deletions
--- a/gtk+-2.12.5.tar.bz2
+++ b/gtk+-2.12.5.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9e364df3d7368c1e69dab1b2352a68bc8ac07e35bf647bf23f3445d902bb4a4c
-size 15963537
--- a/gtk+-2.12.8.tar.bz2
+++ b/gtk+-2.12.8.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff2f542d5dca2089f9e6bef67ba5ebce6224d88b5372d87f4195dcdbe938f0ef
+size 16101527
--- a/gtk2-remove-empty-cache.patch
+++ b/gtk2-remove-empty-cache.patch
@ -1,17 +1,17 @@
 Index: gtk/updateiconcache.c
-================================================================================
--- gtk/updateiconcache.c
+===================================================================
+--- gtk/updateiconcache.c.orig
 +++ gtk/updateiconcache.c
-@@ -44,6 +44,7 @@
- static gboolean quiet = FALSE;
+@@ -47,6 +47,7 @@ static gboolean quiet = FALSE;
 static gboolean index_only = FALSE;
+ static gboolean validate = FALSE;
 static gchar *var_name = "-";
 +static gboolean remove_empty_cache = FALSE;
 
- #define CACHE_NAME "icon-theme.cache"
- 
-@@ -1168,12 +1169,17 @@
-   
+ /* Quite ugly - if we just add the c file to the
+  * list of sources in Makefile.am, libtool complains.
+@@ -1452,12 +1453,17 @@ build_cache (const gchar *path)
+  
   directories = scan_directory (path, NULL, files, NULL, 0);
 
 +  cache_path = g_build_filename (path, CACHE_NAME, NULL);
@ -28,7 +28,7 @@ Index: gtk/updateiconcache.c
       exit (0);
     }
     
-@@ -1187,10 +1193,10 @@
+@@ -1471,6 +1477,7 @@ build_cache (const gchar *path)
   if (!retval)
     {
       g_unlink (tmp_cache_path);
@ -36,11 +36,16 @@ Index: gtk/updateiconcache.c
       exit (1);
     }
 
-  cache_path = g_build_filename (path, CACHE_NAME, NULL);
+@@ -1481,8 +1488,6 @@ build_cache (const gchar *path)
+       exit (1);
+     }
 
+-  cache_path = g_build_filename (path, CACHE_NAME, NULL);
+-
 #ifdef G_OS_WIN32
   if (g_file_test (cache_path, G_FILE_TEST_EXISTS))
-@@ -1204,6 +1210,7 @@
+     {
+@@ -1495,6 +1500,7 @@ build_cache (const gchar *path)
 		      g_strerror (errno),
 		      cache_path);
 	  g_unlink (cache_path);
@ -48,7 +53,7 @@ Index: gtk/updateiconcache.c
 	  bak_cache_path = NULL;
 	}
     }
-@@ -1215,6 +1222,7 @@
+@@ -1506,6 +1512,7 @@ build_cache (const gchar *path)
 		  tmp_cache_path, cache_path,
 		  g_strerror (errno));
       g_unlink (tmp_cache_path);
@ -56,7 +61,7 @@ Index: gtk/updateiconcache.c
 #ifdef G_OS_WIN32
       if (bak_cache_path != NULL)
 	if (g_rename (bak_cache_path, cache_path) == -1)
-@@ -1233,12 +1241,17 @@
+@@ -1524,12 +1531,17 @@ build_cache (const gchar *path)
   /* FIXME: What do do if an error occurs here? */
   if (g_stat (path, &path_stat) < 0 ||
       g_stat (cache_path, &cache_stat))
@ -75,11 +80,11 @@ Index: gtk/updateiconcache.c
   if (!quiet)
     g_printerr (_("Cache file created successfully.\n"));
 }
-@@ -1282,6 +1295,7 @@
-   { "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, N_("Overwrite an existing cache, even if uptodate"), NULL },
+@@ -1573,6 +1585,7 @@ static GOptionEntry args[] = {
+   { "force", 'f', 0, G_OPTION_ARG_NONE, &force_update, N_("Overwrite an existing cache, even if up to date"), NULL },
   { "ignore-theme-index", 't', 0, G_OPTION_ARG_NONE, &ignore_theme_index, N_("Don't check for the existence of index.theme"), NULL },
   { "index-only", 'i', 0, G_OPTION_ARG_NONE, &index_only, N_("Don't include image data in the cache"), NULL },
 +  { "remove-empty-cache", 'r', 0, G_OPTION_ARG_NONE, &remove_empty_cache, "Remove the cache file if there is nothing to cache", NULL },
   { "source", 'c', 0, G_OPTION_ARG_STRING, &var_name, N_("Output a C header file"), "NAME" },
   { "quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Turn off verbose output"), NULL },
-   { NULL }
+   { "validate", 'v', 0, G_OPTION_ARG_NONE, &validate, N_("Validate existing icon cache"), NULL },
--- a/gtk2.changes
+++ b/gtk2.changes
@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Feb 18 17:21:11 CET 2008 - maw@suse.de
+
+- Update to version 2.12.8:
+  + Make the directfb backend build with GLib 2.15
+  + Improve the handling of modal windows on win32
+  + GtkFileChooser: 
+    + Activate bookmarks on single-click
+    + Improve some focus handling issues
+    + Don't select filename extensions in the save dialog
+  + GtkBuilder supports accessibility properties and
+    relations now
+  + Bugs fixed: bgo#499835, bgo#516024, bgo#144269, bgo#419737,
+    bgo#148828, bgo#455627, bgo#473786, bgo#494515, bgo#499940,
+    bgo#503569, bgo#505928, bgo#511111, bgo#511987, bgo#514621,
+    bgo#514643, bgo#514789, bgo#515047, bgo#515667, bgo#362516,
+    bgo#506769, bgo#477175, bgo#496645, bgo#496651, bgo#504611,
+    bgo#507751, bgo#508516, bgo#509153, bgo#512375, and
+    bgo#454653
+  + Updated translations.
+
 -------------------------------------------------------------------
 Tue Jan 29 10:48:21 CET 2008 - sbrabec@suse.cz

--- a/gtk2.spec
+++ b/gtk2.spec
@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.12.5)
+# spec file for package gtk2 (Version 2.12.8)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@ -10,6 +10,7 @@

 # norootforbuild

+
 Name:           gtk2
 %define _name gtk+
 # If you enable DirectFB support here, you have to enable it in cairo, too:
@ -27,8 +28,8 @@ License:        LGPL v2.1 or later
 Group:          System/Libraries
 AutoReqProv:    on
 PreReq:         /usr/bin/touch /bin/rm /bin/rmdir
-Version:        2.12.5
-Release:        4
+Version:        2.12.8
+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
 Source1:        SuSEconfig.gtk2
@ -369,6 +370,24 @@ fi
 %{_datadir}/gtk-doc/html/*

 %changelog
+* Mon Feb 18 2008 maw@suse.de
+- Update to version 2.12.8:
+  + Make the directfb backend build with GLib 2.15
+  + Improve the handling of modal windows on win32
+  + GtkFileChooser:
+  + Activate bookmarks on single-click
+  + Improve some focus handling issues
+  + Don't select filename extensions in the save dialog
+  + GtkBuilder supports accessibility properties and
+  relations now
+  + Bugs fixed: bgo#499835, bgo#516024, bgo#144269, bgo#419737,
+  bgo#148828, bgo#455627, bgo#473786, bgo#494515, bgo#499940,
+  bgo#503569, bgo#505928, bgo#511111, bgo#511987, bgo#514621,
+  bgo#514643, bgo#514789, bgo#515047, bgo#515667, bgo#362516,
+  bgo#506769, bgo#477175, bgo#496645, bgo#496651, bgo#504611,
+  bgo#507751, bgo#508516, bgo#509153, bgo#512375, and
+  bgo#454653
+  + Updated translations.
 * Tue Jan 29 2008 sbrabec@suse.cz
 - Use glibc locale for week info with glibc >= 2.7 (bnc#104417).
 * Wed Jan 23 2008 maw@suse.de