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

gtk+-2.12.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faa1dc73f8077f72849ade14963202d8af22b51469c1e8e88e20c69d330fd2fd
-size 15732170

gtk+-2.12.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e77dcec1b2f7ab7606afdaf63a1ddf80af4c5f518e1fcc7260dadb679dd858fa
+size 15898599

gtk2-303869-disable-icon-cache-validation.diff

@@ -15,23 +15,23 @@
 	* gtk/updateiconcache.c (validate_file): Here it *is* mandatory to
 	do the validation.
 
-diff --git a/gtk/gtkiconcache.c b/gtk/gtkiconcache.c
+Index: gtk+-2.12.1/gtk/gtkiconcache.c
-index 7cce508..be2d9fb 100644
+===================================================================
---- a/gtk/gtkiconcache.c
+--- gtk+-2.12.1.orig/gtk/gtkiconcache.c
-+++ b/gtk/gtkiconcache.c
++++ gtk+-2.12.1/gtk/gtkiconcache.c
-@@ -127,7 +127,7 @@ _gtk_icon_cache_new_for_path (const gchar *path)
+@@ -130,7 +130,7 @@ _gtk_icon_cache_new_for_path (const gcha
-   info.n_directories = 0;
+ #ifdef G_ENABLE_DEBUG
-   info.flags = CHECK_OFFSETS|CHECK_STRINGS;
+   if (gtk_debug_flags & GTK_DEBUG_ICONTHEME)
- 
--  if (!_gtk_icon_cache_validate (&info))
-+  if (!_gtk_icon_cache_validate (&info, path, FALSE))
      {
-       g_mapped_file_free (map);
+-      if (!_gtk_icon_cache_validate (&info))
-       g_warning ("Icon cache '%s' is invalid\n", cache_filename);
++      if (!_gtk_icon_cache_validate (&info, path, FALSE))
-diff --git a/gtk/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c
+         {
-index 73cf351..757b34a 100644
+           g_mapped_file_free (map);
---- a/gtk/gtkiconcachevalidator.c
+           g_warning ("Icon cache '%s' is invalid\n", cache_filename);
-+++ b/gtk/gtkiconcachevalidator.c
+Index: gtk+-2.12.1/gtk/gtkiconcachevalidator.c
+===================================================================
+--- gtk+-2.12.1.orig/gtk/gtkiconcachevalidator.c
++++ gtk+-2.12.1/gtk/gtkiconcachevalidator.c
 @@ -17,6 +17,7 @@
   * Boston, MA 02111-1307, USA.
   */
@@ -73,10 +73,10 @@ index 73cf351..757b34a 100644
    if (!check_version (info))
      return FALSE;
    check ("header, hash offset", get_uint32 (info, 4, &hash_offset));
-diff --git a/gtk/gtkiconcachevalidator.h b/gtk/gtkiconcachevalidator.h
+Index: gtk+-2.12.1/gtk/gtkiconcachevalidator.h
-index 9b22e85..5ed3b26 100644
+===================================================================
---- a/gtk/gtkiconcachevalidator.h
+--- gtk+-2.12.1.orig/gtk/gtkiconcachevalidator.h
-+++ b/gtk/gtkiconcachevalidator.h
++++ gtk+-2.12.1/gtk/gtkiconcachevalidator.h
 @@ -37,7 +37,9 @@ typedef struct {
    gint flags;
  } CacheInfo;
@@ -88,10 +88,10 @@ index 9b22e85..5ed3b26 100644
  
  G_END_DECLS
  
-diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c
+Index: gtk+-2.12.1/gtk/updateiconcache.c
-index fd4ca66..6ad7b1d 100644
+===================================================================
---- a/gtk/updateiconcache.c
+--- gtk+-2.12.1.orig/gtk/updateiconcache.c
-+++ b/gtk/updateiconcache.c
++++ gtk+-2.12.1/gtk/updateiconcache.c
 @@ -49,6 +49,10 @@ static gboolean validate = FALSE;
  static gchar *var_name = "-";
  static gboolean remove_empty_cache = FALSE;
@@ -103,7 +103,7 @@ index fd4ca66..6ad7b1d 100644
  /* Quite ugly - if we just add the c file to the
   * list of sources in Makefile.am, libtool complains.
   */
-@@ -1419,7 +1423,7 @@ validate_file (const gchar *file)
+@@ -1408,7 +1412,7 @@ validate_file (const gchar *file)
    info.n_directories = 0;
    info.flags = CHECK_OFFSETS|CHECK_STRINGS|CHECK_PIXBUFS;
  

gtk2-swt-tooltips.patch

@@ -1,10 +0,0 @@
---- trunk/gtk/gtktooltips.c	2007/08/07 13:32:19	18587
-+++ trunk/gtk/gtktooltips.c	2007/09/24 18:23:01	18864
-@@ -230,6 +230,7 @@
-     }
-   
-   if (tooltips->active_tips_data 
-+      && tooltipsdata
-       && tooltips->active_tips_data->widget == widget
-       && GTK_WIDGET_DRAWABLE (tooltips->active_tips_data->widget))
-     {

gtk2.changes

@@ -1,8 +1,42 @@
+-------------------------------------------------------------------
+Mon Dec 17 14:36:49 CST 2007 - maw@suse.de
+
+- Update to version 2.12.3:
+  + Bugs (bugzilla.gnome.org) fixed: #494776, #482531, #488918,
+    #347585, #479463, #164537, #371036, #388321, #405178, #461222,
+    #467711, #467722, #468793, #473813, #476827, #485662, #486369,
+    #486420, #487954, #488017, #488051, #489370, #491207, #492117,
+    #492209, #493404, #495574, #495769, #496689, #497164, #499703,
+    #107398, #463865, #489782, #490624, #496734, #496795, #498922,
+    #467490, #497102, #499868, #500804, #144269, #495124, and
+    #501583
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Dec 17 14:30:57 CST 2007 - maw@suse.de
+
+- Remove mtime.patch, as it's upstreamed as of 2.12.1.
+
 -------------------------------------------------------------------
 Wed Dec 12 19:21:53 CET 2007 - schwab@suse.de
 
 - Fix invalid casts.
 
+-------------------------------------------------------------------
+Fri Nov 23 12:05:34 CST 2007 - maw@suse.de
+
+- Update to version 2.12.1:
+  + Bugs (bugzilla.gnome.org) fixed: #472965, #460194, #478803,
+    #480123, #483223, #476342, #484008, #327243, #465380, #467269,
+    #476686, #478173, #478371, #482089, #482504, #482841, #483563,
+    #483730, #484650, #484730, #486360, #389358, #448343, #477447,
+    #482034, #482837, #478637, #484132, #486636, #455284, #478377,
+    #485301, #485437, #486155, #339877, #456137, #456676, #352643,
+    #477280, #477704, and #476920
+  + Updated translations
+- Remove gtk2-swt-tooltips.patch, which has been upstreamed
+- Respin gtk2-303869-disable-icon-cache-validation.diff.
+
 -------------------------------------------------------------------
 Fri Sep 28 17:22:28 CEST 2007 - btimothy@suse.de
 

gtk2.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package gtk2 (Version 2.12.0)
+# spec file for package gtk2 (Version 2.12.3)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -27,8 +27,8 @@ License:        LGPL v2.1 or later
 Group:          System/Libraries
 AutoReqProv:    on
 PreReq:         /usr/bin/touch /bin/rm /bin/rmdir
-Version:        2.12.0
+Version:        2.12.3
-Release:        26
+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
@@ -49,9 +49,6 @@ Patch24:        gtk+-2.8.6-fontsel.patch
 Patch31:        gtk+-2.8.6-fontsel-fix.patch
 Patch32:        gtk2-set-invisible-char-to-circle.patch
 Patch35:        gtk2-flash-player-busyloop.patch
-# PATCH-FIX-UPSTREAM gtk2-swt-tooltips.patch bnc326059 bgo460194
-Patch36:        gtk2-swt-tooltips.patch
-Patch37:        mtime.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
@@ -216,8 +213,6 @@ cp -a %{S:2} .
 %patch31
 %patch32 -p1
 %patch35
-%patch36 -p1
-%patch37
 %patch50 -p1
 gnome-patch-translation-update
 
@@ -372,8 +367,33 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Mon Dec 17 2007 - maw@suse.de
+- Update to version 2.12.3:
+  + Bugs (bugzilla.gnome.org) fixed: #494776, #482531, #488918,
+  [#347585], #479463, #164537, #371036, #388321, #405178, #461222,
+  [#467711], #467722, #468793, #473813, #476827, #485662, #486369,
+  [#486420], #487954, #488017, #488051, #489370, #491207, #492117,
+  [#492209], #493404, #495574, #495769, #496689, #497164, #499703,
+  [#107398], #463865, #489782, #490624, #496734, #496795, #498922,
+  [#467490], #497102, #499868, #500804, #144269, #495124, and
+  [#501583]
+  + Updated translations.
+* Mon Dec 17 2007 - maw@suse.de
+- Remove mtime.patch, as it's upstreamed as of 2.12.1.
 * Wed Dec 12 2007 - schwab@suse.de
 - Fix invalid casts.
+* Fri Nov 23 2007 - maw@suse.de
+- Update to version 2.12.1:
+  + Bugs (bugzilla.gnome.org) fixed: #472965, #460194, #478803,
+  [#480123], #483223, #476342, #484008, #327243, #465380, #467269,
+  [#476686], #478173, #478371, #482089, #482504, #482841, #483563,
+  [#483730], #484650, #484730, #486360, #389358, #448343, #477447,
+  [#482034], #482837, #478637, #484132, #486636, #455284, #478377,
+  [#485301], #485437, #486155, #339877, #456137, #456676, #352643,
+  [#477280], #477704, and #476920
+  + Updated translations
+- Remove gtk2-swt-tooltips.patch, which has been upstreamed
+- Respin gtk2-303869-disable-icon-cache-validation.diff.
 * Fri Sep 28 2007 - btimothy@suse.de
 - Added gtk2-swt-tooltips.patch (bugzilla.gnome.org #460194) to
   fix bugzilla.novell.com #326059, a crash when mousing over

mtime.patch

@@ -1,42 +0,0 @@
---- gtk/gtkfilechooserdefault.c
-+++ gtk/gtkfilechooserdefault.c
-@@ -11010,7 +11010,7 @@ list_mtime_data_func (GtkTreeViewColumn 
- 		      gpointer           data)
- {
-   GtkFileChooserDefault *impl;
--  GtkFileTime time_mtime;
-+  time_t time_mtime;
-   gchar *date_str = NULL;
-   gboolean sensitive = TRUE;
- 
-@@ -11050,7 +11050,7 @@ list_mtime_data_func (GtkTreeViewColumn 
-                           -1);
- 
-       if (info)
--        time_mtime = (GtkFileTime) gtk_recent_info_get_modified (info);
-+        time_mtime = gtk_recent_info_get_modified (info);
-       else
-         time_mtime = 0;
- 
-@@ -11091,10 +11091,10 @@ list_mtime_data_func (GtkTreeViewColumn 
-       gchar buf[256];
- 
- #ifdef HAVE_LOCALTIME_R
--      localtime_r ((time_t *) &time_mtime, &tm_mtime);
-+      localtime_r (&time_mtime, &tm_mtime);
- #else
-       {
--        struct tm *ptm = localtime ((time_t *) &time_mtime);
-+        struct tm *ptm = localtime (&time_mtime);
- 
-         if (!ptm)
-           {
-@@ -11107,7 +11107,7 @@ list_mtime_data_func (GtkTreeViewColumn 
-             return;
-           }
-         else
--          memcpy ((void *) &tm_mtime, (void *) ptm, sizeof (struct tm));
-+          tm_mtime = *ptm;
-       }
- #endif /* HAVE_LOCALTIME_R */
-