[arch-commits] Commit in gtk2/trunk (PKGBUILD revert_64bit_fix.patch)

[Ionut Biru]

    Date: Tuesday, May 4, 2010 @ 16:23:20
  Author: ibiru
Revision: 79610

upgpkg: gtk2 2.20.1-2
revert that 64bit fix since is only work when using libpng 1.2. Is fixing glib allocation memory

Added:
  gtk2/trunk/revert_64bit_fix.patch
Modified:
  gtk2/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    9 ++++++---
 revert_64bit_fix.patch |   31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-04 19:16:45 UTC (rev 79609)
+++ PKGBUILD	2010-05-04 20:23:20 UTC (rev 79610)
@@ -3,7 +3,7 @@
 
 pkgname=gtk2
 pkgver=2.20.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v2)"
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -17,13 +17,16 @@
 backup=(etc/gtk-2.0/gtkrc)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.20/gtk+-${pkgver}.tar.bz2
-        xid-collision-debug.patch)
+        xid-collision-debug.patch
+	revert_64bit_fix.patch)
 sha256sums=('0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65'
-            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
+            'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558'
+	    '20f3a03760f765b68b85b614810e5df4a689b609da1ae200aa30072475121b4c')
 
 build() {
   cd "${srcdir}/gtk+-${pkgver}"
   patch -Np1 -i "${srcdir}/xid-collision-debug.patch" || return 1
+  patch -RNp1 -i ${srcdir}/revert_64bit_fix.patch || retun 1
 
   CXX=/bin/false ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --with-xinput=yes \

Added: revert_64bit_fix.patch
===================================================================
--- revert_64bit_fix.patch	                        (rev 0)
+++ revert_64bit_fix.patch	2010-05-04 20:23:20 UTC (rev 79610)
@@ -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