packages: gtk+2/gtk+2.spec, gtk+2/revert_64bit_fix.patch (NEW) - revert the...

[patrys]

Author: patrys                       Date: Thu May  6 09:43:34 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert the 64-bit "fix" as it causes apps to crash
- rel 2

---- Files affected:
packages/gtk+2:
   gtk+2.spec (1.332 -> 1.333) , revert_64bit_fix.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gtk+2/gtk+2.spec
diff -u packages/gtk+2/gtk+2.spec:1.332 packages/gtk+2/gtk+2.spec:1.333
--- packages/gtk+2/gtk+2.spec:1.332	Tue May  4 11:14:41 2010
+++ packages/gtk+2/gtk+2.spec	Thu May  6 11:43:28 2010
@@ -21,13 +21,14 @@
 Summary(tr.UTF-8):	GIMP ToolKit arayüz kitaplığı
 Name:		gtk+2
 Version:	2.20.1
-Release:	1
+Release:	2
 Epoch:		2
 License:	LGPL v2+
 Group:		X11/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.20/gtk+-%{version}.tar.bz2
 # Source0-md5:	53e6f3a93bd22934878fc4a4a34c68aa
 Patch0:		%{name}-arch_confdir.patch
+Patch1:		revert_64bit_fix.patch
 URL:		http://www.gtk.org/
 BuildRequires:	atk-devel >= 1:1.30.0
 BuildRequires:	autoconf >= 2.62
@@ -43,7 +44,7 @@
 BuildRequires:	gtk-doc-automake >= 1.11
 BuildRequires:	jasper-devel
 BuildRequires:	libjpeg-devel
-BuildRequires:	libpng-devel
+BuildRequires:	libpng-devel >= 1.4.0
 BuildRequires:	libtiff-devel
 BuildRequires:	libtool >= 1:1.4.2-9
 BuildRequires:	libxml2-progs >= 1:2.6.31
@@ -229,6 +230,7 @@
 %prep
 %setup -q -n gtk+-%{version}
 %patch0 -p1
+%patch1 -p1 -R
 
 %build
 %{?with_apidocs:%{__gtkdocize}}
@@ -442,6 +444,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.333  2010/05/06 09:43:28  patrys
+- revert the 64-bit "fix" as it causes apps to crash
+- rel 2
+
 Revision 1.332  2010/05/04 09:14:41  lisu
 - 2.20.1
 

================================================================
Index: packages/gtk+2/revert_64bit_fix.patch
diff -u /dev/null packages/gtk+2/revert_64bit_fix.patch:1.1
--- /dev/null	Thu May  6 11:43:34 2010
+++ packages/gtk+2/revert_64bit_fix.patch	Thu May  6 11:43:29 2010
@@ -0,0 +1,31 @@
+From a0f23e1706b34bca6a65183040d1f1498cce2a50 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Thu, 25 Mar 2010 04:55:15 +0000
+Subject: Fix a 64bit issue
+
+Thank you libpng, for typedef unsigned long png_uint_32.
+---
+diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
+index c0374ca..43db70a 100644
+--- a/gdk-pixbuf/io-png.c
++++ b/gdk-pixbuf/io-png.c
+@@ -261,7 +261,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
+         gchar *icc_profile_base64;
+         const gchar *icc_profile_title;
+         const gchar *icc_profile;
+-        guint icc_profile_size;
++        gulong icc_profile_size;
+         guint32 retval;
+         gint compression_type;
+ 
+@@ -607,7 +607,7 @@ png_info_callback   (png_structp png_read_ptr,
+         gchar *icc_profile_base64;
+         const gchar *icc_profile_title;
+         const gchar *icc_profile;
+-        guint icc_profile_size;
++        gulong icc_profile_size;
+         guint32 retval;
+         gint compression_type;
+ 
+--
+cgit v0.8.3.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+2/gtk+2.spec?r1=1.332&r2=1.333&f=u