diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 14:57:48 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 14:57:48 +0000 |
| commit | f3b437512e5b2a4937e9797099530ab05da16eac (patch) | |
| tree | 7ce6459c7f31ee2662fc421d7227ed4698a92965 /x11-libs | |
| parent | Drop dvbhead argument, bug 307951 (diff) | |
| download | historical-f3b437512e5b2a4937e9797099530ab05da16eac.tar.gz historical-f3b437512e5b2a4937e9797099530ab05da16eac.tar.bz2 historical-f3b437512e5b2a4937e9797099530ab05da16eac.zip | |
Fix building with libpng14.
Package-Manager: portage-2.2_rc66/cvs/Linux x86_64
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libmatchbox/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/libmatchbox/Manifest | 5 | ||||
| -rw-r--r-- | x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch | 13 | ||||
| -rw-r--r-- | x11-libs/libmatchbox/libmatchbox-1.9.ebuild | 6 |
4 files changed, 25 insertions, 7 deletions
diff --git a/x11-libs/libmatchbox/ChangeLog b/x11-libs/libmatchbox/ChangeLog index a2553cbf2274..cfb26a1369ca 100644 --- a/x11-libs/libmatchbox/ChangeLog +++ b/x11-libs/libmatchbox/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/libmatchbox -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.12 2009/03/14 04:16:44 solar Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/ChangeLog,v 1.13 2010/03/09 14:57:48 ssuominen Exp $ + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + libmatchbox-1.9.ebuild, +files/libmatchbox-1.9-libpng14.patch: + Fix building with libpng14. 14 Mar 2009; <solar@gentoo.org> libmatchbox-1.9.ebuild: keyword ~amd64 diff --git a/x11-libs/libmatchbox/Manifest b/x11-libs/libmatchbox/Manifest index 51a4cdac0c0c..090b196c0142 100644 --- a/x11-libs/libmatchbox/Manifest +++ b/x11-libs/libmatchbox/Manifest @@ -1,6 +1,7 @@ +AUX libmatchbox-1.9-libpng14.patch 347 RMD160 dc588e79e0dc98171931c633331f7b8e16245fdf SHA1 312265812153179be79a26f5002ef2241a6f082e SHA256 26a75017798ea82ff27d88bf1460a506f4fbbaa2b56f3e8887e2d588dad7d518 DIST libmatchbox-1.8.tar.bz2 303304 RMD160 420158db32bd1b5968645b12faa9f333bee9e61e SHA1 e0422b2e3722134334bd80b4e3e064507459e8bc SHA256 a675f7b5b10dabf4d2951b629dd8d638219ec91078acd497aac4fcf2008a1c5b DIST libmatchbox-1.9.tar.bz2 316575 RMD160 5c72d1a86de1d6b4ffbe07b6a80ac705d2633fb3 SHA1 7820b2723581c20db92d8a36e1a75d4a0c57579a SHA256 db01e218e8d09540459c8f7c5698c159cd84c3d5b8caa9763bf0e5a35f6edf00 EBUILD libmatchbox-1.8.ebuild 1534 RMD160 e9789adddb1b9a5732a04ee28cd41ad86eefdd01 SHA1 f4bf8dad9a92ebfa8f9261f3447600637e348acf SHA256 e44a516a0a5f6153146a47bdfcef6ff17f260af0297c56d4950707ad1992b032 -EBUILD libmatchbox-1.9.ebuild 1546 RMD160 a72d23d6470c794127cc472c5178bd722d0bec11 SHA1 e363b4cca5567f6ce63ce26229d99fff7aeffbe3 SHA256 5e993cd87562a68d7e0096ee43eda59ca7cf0399c417c69b5dc1a01132237203 -MISC ChangeLog 1812 RMD160 99c2966d6034be667e3e405b2c5e593a83501d5b SHA1 5e26cfa6ad4c702076edf647599e8a2a267e9bb3 SHA256 ec537b0d589e5ff6da7e82bd8aeafb52b6c31cb7dfd05456590d51fa32bc9d4f +EBUILD libmatchbox-1.9.ebuild 1591 RMD160 a938575535056287c3deb49d331ef9207ee79c09 SHA1 b3c82dde483da9a9501ce110863d176ed2fa991a SHA256 4733dccddaabe26614d69a40b4b813e117275911da7865edf4064bc484a326aa +MISC ChangeLog 1966 RMD160 505cb6a22e9d4bcbe7e0b432e2188e7ee8818c13 SHA1 caaaf3c0119ec536edee5e66a0d498b500cc734d SHA256 d2b96e01b915ecf3bc37ad791cfe87ca29515010398323680dac4a85209fe540 MISC metadata.xml 413 RMD160 f5e5747505deb75f2af51d8f2c9ce571ddfa497e SHA1 7a9593a01566b4010552683107f4bb551903c220 SHA256 59b98562a4c53d3933bd84631651f38b7b9a1b761ab03b9e0e6a15fe058a7f51 diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch new file mode 100644 index 000000000000..4f87a9bb1b31 --- /dev/null +++ b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch @@ -0,0 +1,13 @@ +http://repos.archlinux.org/wsvn/community/libmatchbox/trunk/PKGBUILD + +--- libmb/mbpixbuf.c ++++ libmb/mbpixbuf.c +@@ -228,7 +228,7 @@ + if ((fd = fopen( file, "rb" )) == NULL) return NULL; + + fread( header, 1, 8, fd ); +- if ( ! png_check_sig( header, 8 ) ) ++ if ( ! png_sig_cmp( header, 0, 8 ) ) + { + fclose(fd); + return NULL; diff --git a/x11-libs/libmatchbox/libmatchbox-1.9.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild index 104ecafacbf6..f6d40dc9f739 100644 --- a/x11-libs/libmatchbox/libmatchbox-1.9.ebuild +++ b/x11-libs/libmatchbox/libmatchbox-1.9.ebuild @@ -1,6 +1,6 @@ -# Copyright 2006-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9.ebuild,v 1.7 2009/03/14 04:16:44 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libmatchbox/libmatchbox-1.9.ebuild,v 1.8 2010/03/09 14:57:48 ssuominen Exp $ inherit eutils libtool @@ -36,7 +36,7 @@ pkg_setup() { src_unpack() { unpack ${A} cd "${S}" - + epatch "${FILESDIR}"/${P}-libpng14.patch elibtoolize } |