Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3f2e88d9f3495ea39f2cce56351d291f8186421b
commit 3f2e88d9f3495ea39f2cce56351d291f8186421b
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Jul 26 11:18:51 2010 +0200
gtk+2-2.20.1-3-i686
* Fix the png image loader on x86_64.
diff --git a/source/xlib/gtk+2/FrugalBuild b/source/xlib/gtk+2/FrugalBuild
index 71fc570..f73dac8 100644
--- a/source/xlib/gtk+2/FrugalBuild
+++ b/source/xlib/gtk+2/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=gtk+2
_F_gnome_name=gtk+
pkgver=2.20.1
-pkgrel=2
+pkgrel=3
pkgdesc="The GTK+ Toolkit (2.x series)"
depends=('libxext' 'libxfixes' 'cairo>=1.8.10-2' 'libgcc' 'libjpeg>=8a'
'libtiff' 'libcups>=1.3.11-4' 'openssl>=1.0.0')
rodepends=('gnome-icon-theme' 'shared-mime-info')
@@ -14,7 +14,9 @@ archs=('i686' 'x86_64' 'ppc')
Finclude gnome
url="http://www.gtk.org/";
_F_cd_path="gtk+-$pkgver"
-sha1sums=('a80953b4e81c6a5bc2a986852f7fe60c8704cc02')
+source=("${sour...@]}" 'gtk+-2.20.1-x86_64_pngfix.patch')
+sha1sums=('a80953b4e81c6a5bc2a986852f7fe60c8704cc02' \
+ '280dc769fd9aff20c9a3a50e5b0bc573e419da0c')
subpkgs=("${subpk...@]}" "$pkgname-libs")
subdescs=("${subdes...@]}" "GTK+2 core libraries.")
diff --git a/source/xlib/gtk+2/gtk+-2.20.1-x86_64_pngfix.patch
b/source/xlib/gtk+2/gtk+-2.20.1-x86_64_pngfix.patch
new file mode 100644
index 0000000..7f7bec7
--- /dev/null
+++ b/source/xlib/gtk+2/gtk+-2.20.1-x86_64_pngfix.patch
@@ -0,0 +1,52 @@
+From 02d8976176fb25633bcdc1cffe842538ab6e2188 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mcla...@redhat.com>
+Date: Wed, 12 May 2010 19:02:02 +0000
+Subject: Another attempt to handle pngs changing int types
+
+(cherry picked from commit 006d5718fa927d9d3509fca1a1c1ca6522110b57)
+---
+diff --git a/gdk-pixbuf/io-png.c b/gdk-pixbuf/io-png.c
+index 43db70a..844064a 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;
+- gulong icc_profile_size;
++ png_uint_32 icc_profile_size;
+ guint32 retval;
+ gint compression_type;
+
+@@ -344,7 +344,7 @@ gdk_pixbuf__png_image_load (FILE *f, GError **error)
+ (png_charpp) &icc_profile_title,
&compression_type,
+ (png_charpp) &icc_profile, (png_uint_32*)
&icc_profile_size);
+ if (retval != 0) {
+- icc_profile_base64 = g_base64_encode ((const guchar *)
icc_profile, icc_profile_size);
++ icc_profile_base64 = g_base64_encode ((const guchar *)
icc_profile, (gsize)icc_profile_size);
+ gdk_pixbuf_set_option (pixbuf, "icc-profile",
icc_profile_base64);
+ g_free (icc_profile_base64);
+ }
+@@ -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;
+- gulong icc_profile_size;
++ png_uint_32 icc_profile_size;
+ guint32 retval;
+ gint compression_type;
+
+@@ -679,9 +679,9 @@ png_info_callback (png_structp png_read_ptr,
+ /* Extract embedded ICC profile */
+ retval = png_get_iCCP (png_read_ptr, png_info_ptr,
+ (png_charpp) &icc_profile_title,
&compression_type,
+- (png_charpp) &icc_profile, (png_uint_32*)
&icc_profile_size);
++ (png_charpp) &icc_profile, &icc_profile_size);
+ if (retval != 0) {
+- icc_profile_base64 = g_base64_encode ((const guchar *)
icc_profile, icc_profile_size);
++ icc_profile_base64 = g_base64_encode ((const guchar *)
icc_profile, (gsize)icc_profile_size);
+ gdk_pixbuf_set_option (lc->pixbuf, "icc-profile",
icc_profile_base64);
+ g_free (icc_profile_base64);
+ }
+--
+cgit v0.8.3.1
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
