Fix building with libpng14.

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog
index 23343f1c17b63e880db5114c2b61dcfbea211512..98b85e622d93b752afceee7b720f693762177d6e 100644 (file)
--- a/xfce-base/thunar/ChangeLog
+++ b/xfce-base/thunar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/thunar
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.86 2010/02/09 10:23:09 mduft Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.87 2010/03/09 10:41:19 ssuominen Exp $
+
+  09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> thunar-1.0.1.ebuild,
+  +files/thunar-1.0.1-libpng14.patch:
+  Fix building with libpng14.
 
   09 Feb 2010; Markus Duft <mduft@gentoo.org> thunar-1.1.0.ebuild:
   fix build for all prefix platforms, EPREFIX was missing

diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest
index abe129098a8e015d40dc74f9fd1dea61d5cf32c5..e738b651b08499c8f7a1fe6b35241442611bd72c 100644 (file)
--- a/xfce-base/thunar/Manifest
+++ b/xfce-base/thunar/Manifest
@@ -1,6 +1,7 @@
+AUX thunar-1.0.1-libpng14.patch 414 RMD160 e9c44d88bf3d995379c89d40283271cae2392684 SHA1 1e24009ec9162bf7ca22827e944d7745cb339a89 SHA256 907c5cfc2e56bffece40e04a580a1557c160162d700d1c0ca817c22e6a6b2ac4
 DIST Thunar-1.0.1.tar.bz2 8802672 RMD160 203690b9eb05ca8e5248bb026f98b8e3e6881f2c SHA1 2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064 SHA256 7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
 DIST Thunar-1.1.0.tar.bz2 4008889 RMD160 32dd24f9ebb9c72aba8b206777cdef3048ef07d8 SHA1 b768ee32f360353e4fc70c640da8fd4ee065483b SHA256 6b1f91dd7de661e5cf46db4e487fce536172116660ea7be20edb2fa8cdddfd28
-EBUILD thunar-1.0.1.ebuild 2114 RMD160 7109dab8a66986bb6e048c29636864e1eb1954e5 SHA1 1178ed28db751a1cfc66cfd79be5c006ab9f0753 SHA256 3dd4b19799e203973f0506ad740ff22b78b6f4b9ae8badbc785d616f39d3ce5d
+EBUILD thunar-1.0.1.ebuild 2161 RMD160 a0723ae4174834a381253d70ec14bea55753aa72 SHA1 be904a5630ef6ce2a4733d966a70602ded943f90 SHA256 bd881bcb24c9d0aec404fcfb428a938dddc3cf8d661e373dc0764d8fde80373b
 EBUILD thunar-1.1.0.ebuild 1875 RMD160 50f5bd5ce6ac0a1a18b0d3984337ff33e6312bbe SHA1 3257a0c3d39191a35ebb880baab4ff1a2402e299 SHA256 88381274cc1a0489ed3676bcd21610bd333ac19eb19f19287f7fd1ce3444ef86
-MISC ChangeLog 11578 RMD160 45205406471c6bc7f0d20b790e3e65f4fdbe8396 SHA1 769e34366862d24c5a28e580febfd2aca3cf10a7 SHA256 8d12a97d643d6c0bb1196b63559209a8357d1e768f6b12f3d0d7d1b59c53dcfb
+MISC ChangeLog 11726 RMD160 e0ed82154e294446d05d332934a69f22de7087a2 SHA1 8ddac469bf3ba80e88a6b56e698e486da6fc24b0 SHA256 7970987ca4a867002b257da0c57cf5454d6ce00f3790643d057db589a50b416a
 MISC metadata.xml 234 RMD160 5cf371faf236f472c7d98a92d7103c5a96c4d95a SHA1 f028da2a6c812a70d5a6c159a450899a5c8f29a2 SHA256 acb3aa4d6a184bbefb0ae06cbb0ed0416ecd1b87d01cae543365cfc0e330d8cb

diff --git a/xfce-base/thunar/files/thunar-1.0.1-libpng14.patch b/xfce-base/thunar/files/thunar-1.0.1-libpng14.patch
new file mode 100644 (file)
index 0000000..cc43d12
--- /dev/null
+++ b/xfce-base/thunar/files/thunar-1.0.1-libpng14.patch
@@ -0,0 +1,13 @@
+http://repos.archlinux.org/wsvn/packages/thunar/trunk/libpng-1.4.patch
+
+--- thunar-vfs/thunar-vfs-thumb.c
++++ thunar-vfs/thunar-vfs-thumb.c
+@@ -1169,7 +1169,7 @@
+     goto done0;
+ 
+   /* verify the png signature */
+-  if (G_LIKELY (png_check_sig ((png_bytep) signature, sizeof (signature))))
++  if (G_LIKELY (!png_sig_cmp ((png_bytep) signature, 0, sizeof (signature))))
+     rewind (fp);
+   else
+     goto done0;

diff --git a/xfce-base/thunar/thunar-1.0.1.ebuild b/xfce-base/thunar/thunar-1.0.1.ebuild
index 211a218f738bc20e143009fe2488ebfa15925207..1e290b34581b3e9cfbd1c8677740c722ad08bc34 100644 (file)
--- a/xfce-base/thunar/thunar-1.0.1.ebuild
+++ b/xfce-base/thunar/thunar-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.0.1.ebuild,v 1.16 2010/01/22 16:48:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.0.1.ebuild,v 1.17 2010/03/09 10:41:19 ssuominen Exp $
 
 EAPI=2
 MY_P=${P/t/T}
@@ -43,6 +43,7 @@ DEPEND="${RDEPEND}
        doc? ( dev-libs/libxslt )"
 
 pkg_setup() {
+       PATCHES=( "${FILESDIR}/${P}-libpng14.patch" )
        XFCONF="--disable-dependency-tracking
                $(use_enable dbus)
                $(use_enable gnome gnome-thumbnailers)