diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-26 09:19:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-26 09:19:56 +0000 |
| commit | 1e80a18f43dd721573bbb5c12e715fb810be08cf (patch) | |
| tree | b25a428154697de7acd548d34ea93de81246bfd2 /xfce-extra | |
| parent | Require <zlib-1.2.4, bug #311241 thank Kristian for report. (diff) | |
| download | historical-1e80a18f43dd721573bbb5c12e715fb810be08cf.tar.gz historical-1e80a18f43dd721573bbb5c12e715fb810be08cf.tar.bz2 historical-1e80a18f43dd721573bbb5c12e715fb810be08cf.zip | |
Fix building with libpng14.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'xfce-extra')
| -rw-r--r-- | xfce-extra/thunar-vfs/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-extra/thunar-vfs/Manifest | 5 | ||||
| -rw-r--r-- | xfce-extra/thunar-vfs/files/thunar-vfs-libpng14.patch | 11 | ||||
| -rw-r--r-- | xfce-extra/thunar-vfs/thunar-vfs-0_p20100324.ebuild | 4 |
4 files changed, 22 insertions, 4 deletions
diff --git a/xfce-extra/thunar-vfs/ChangeLog b/xfce-extra/thunar-vfs/ChangeLog index 39611ea54a74..a00cdfb80893 100644 --- a/xfce-extra/thunar-vfs/ChangeLog +++ b/xfce-extra/thunar-vfs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-extra/thunar-vfs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-vfs/ChangeLog,v 1.2 2010/03/25 11:31:34 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-vfs/ChangeLog,v 1.3 2010/03/26 09:19:56 ssuominen Exp $ + + 26 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + +files/thunar-vfs-libpng14.patch, thunar-vfs-0_p20100324.ebuild: + Fix building with libpng14. *thunar-vfs-0_p20100324 (24 Mar 2010) diff --git a/xfce-extra/thunar-vfs/Manifest b/xfce-extra/thunar-vfs/Manifest index ba151f93ad5c..08b173fbe275 100644 --- a/xfce-extra/thunar-vfs/Manifest +++ b/xfce-extra/thunar-vfs/Manifest @@ -1,4 +1,5 @@ +AUX thunar-vfs-libpng14.patch 342 RMD160 d1b9bdaad18b38cb050486d860d60b2e18986275 SHA1 94a89a1e58fce3a59183a171319ba13ab16fbd4b SHA256 17a4e836ccf14c7116f26101a376dc5937e3069545bfaad70ed9a358347c038e DIST thunar-vfs-0_p20100324.tar.bz2 2839956 RMD160 b0911f5e8d0dec869479519cb678c34e9179e30d SHA1 0a89123d7043cad29988021b4de9e2653129c6bc SHA256 94bad0b091cba6999b30e3f9471a7895907a7d48a7311ba9282c25a34baf032b -EBUILD thunar-vfs-0_p20100324.ebuild 1656 RMD160 78af9181791844ee0be3277ae3b4094584d61528 SHA1 dbccd50570b1b6c0a3abecbe44cb3c0b023772d9 SHA256 befaa0dd3203904660756e9c7be33668b5b97580f518f0124701f9cb65c29924 -MISC ChangeLog 364 RMD160 224e44fa486df8d889cabd0687c7b63dd42964c8 SHA1 1450595633ed4a6d22600e8a2a1cf547d524678d SHA256 ab7ec117b8fd137bcfcd031a605e8d430fcb0e98a60478f7f98fb45a7c15bcf4 +EBUILD thunar-vfs-0_p20100324.ebuild 1705 RMD160 c5360ac54a211a06682a096bfc92a5971af90886 SHA1 e21ec39c610efb5f98eac89f098189545d83a858 SHA256 2dd3229f15f8adc69840a296d5f25e1f91d920c704b92b1f491bba867b5269b5 +MISC ChangeLog 516 RMD160 09a90dc5874d5ed383eb6e124939a1b0aa739617 SHA1 9e156b3685658c2c50d7b76724717bb8bc52dfc0 SHA256 32f0e59f35ab865f7d96f2b18a8718502af210089baa2562e7f02977ceb97465 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 diff --git a/xfce-extra/thunar-vfs/files/thunar-vfs-libpng14.patch b/xfce-extra/thunar-vfs/files/thunar-vfs-libpng14.patch new file mode 100644 index 000000000000..63a6659ca7ae --- /dev/null +++ b/xfce-extra/thunar-vfs/files/thunar-vfs-libpng14.patch @@ -0,0 +1,11 @@ +--- 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-extra/thunar-vfs/thunar-vfs-0_p20100324.ebuild b/xfce-extra/thunar-vfs/thunar-vfs-0_p20100324.ebuild index 022c2ed3d383..e6f0ebbe0b3a 100644 --- a/xfce-extra/thunar-vfs/thunar-vfs-0_p20100324.ebuild +++ b/xfce-extra/thunar-vfs/thunar-vfs-0_p20100324.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-extra/thunar-vfs/thunar-vfs-0_p20100324.ebuild,v 1.3 2010/03/25 11:32:47 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/thunar-vfs/thunar-vfs-0_p20100324.ebuild,v 1.4 2010/03/26 09:19:56 ssuominen Exp $ EAPI=2 EAUTORECONF=yes @@ -53,6 +53,8 @@ pkg_setup() { else XFCONF="${XFCONF} --with-volume-manager=none" fi + + PATCHES=( "${FILESDIR}/${PN}-libpng14.patch" ) } src_prepare() { |