diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 21:20:42 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-08 21:20:42 +0000 |
commit | d39400db9d255afa884e48366da9cab75e69399b (patch) | |
tree | 655c507a5d0558d6f0e0deefe5b9175c18555b3e /app-editors | |
parent | Todays python patches (diff) | |
download | historical-d39400db9d255afa884e48366da9cab75e69399b.tar.gz historical-d39400db9d255afa884e48366da9cab75e69399b.tar.bz2 historical-d39400db9d255afa884e48366da9cab75e69399b.zip |
Fix building with libpng14.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/ted/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/ted/Manifest | 5 | ||||
-rw-r--r-- | app-editors/ted/files/ted-2.20-libpng14.patch | 13 | ||||
-rw-r--r-- | app-editors/ted/ted-2.20.ebuild | 7 |
4 files changed, 26 insertions, 5 deletions
diff --git a/app-editors/ted/ChangeLog b/app-editors/ted/ChangeLog index 24f997515494..0c0c0128e59c 100644 --- a/app-editors/ted/ChangeLog +++ b/app-editors/ted/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/ted # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.29 2010/01/22 16:40:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ChangeLog,v 1.30 2010/03/08 21:20:40 ssuominen Exp $ + + 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> ted-2.20.ebuild, + +files/ted-2.20-libpng14.patch: + Fix building with libpng14. 22 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> ted-2.20.ebuild: Require SLOT="0" of media-libs/jpeg for headers. diff --git a/app-editors/ted/Manifest b/app-editors/ted/Manifest index 49ff2a3ae338..77c4a2ef9837 100644 --- a/app-editors/ted/Manifest +++ b/app-editors/ted/Manifest @@ -1,9 +1,10 @@ AUX ted-2.17-motif.patch 464 RMD160 0bfb4caeca81b7efe8e701e33cde84c43f8dc4af SHA1 9f2d6e4e8a5088eba85fd02db5e9618066567956 SHA256 1a3ea0199fac2bb03c729751e42a484a4c4d7166720a2416d9c32c6da5ab5014 +AUX ted-2.20-libpng14.patch 358 RMD160 3e09bd37e0a8c526ff0ac730dd412c035e24cf0f SHA1 a0151fa107b9f79a69268c28900418cec395eba7 SHA256 eb480afa89079204bf6f9c7bbe5d039b01a2b427284ffba69e5e7dceab5228ae DIST ted-2.12.src.tar.gz 2560159 RMD160 866c9191b5c873ff0cda366cbfe3d0225a9283ae SHA1 dac08f56b4cf3dba367ca20eec321baf9cb4c30f SHA256 801a299d3cbfd39eb9da32b612ee958bb1f422c74848ff38d272a5209a581a53 DIST ted-2.17.src.tar.gz 3000864 RMD160 9096f0ae9793757af56d66a5fca647dbe59d4ffa SHA1 9411976c9310592fb7dcb2fe6a29b8633161db9e SHA256 e080ef452173ec781feb60026b4b01f37343e06c1a0083ca8ccc899c97c2368a DIST ted-2.20.src.tar.gz 3903673 RMD160 e42fa339dcd8d7821c816bc2ed090617320dca70 SHA1 77f63421ca3e0472312febb39c9f2b1bf2a59a42 SHA256 5cc58ccb7bc38f7f0dacc1dfc836a43d35ac94a32cde54275b583b2e4d6f5335 EBUILD ted-2.12.ebuild 1820 RMD160 5edff78bb27a1975c4e7634c0e2ab32b4dd75877 SHA1 b4525287ebfe14abf91cfb10a3daded1bb4d4c04 SHA256 7e12d617234eecee5eb5131d51d198feb06db1b6d8cad366a4ca75ad6f4020c4 EBUILD ted-2.17-r1.ebuild 2170 RMD160 086746b0669fef1907874006423c5915ff9b563e SHA1 bd016a194705d76bafa92211062bd00791b05827 SHA256 1c86fe24663284616dbb3465458201bfc5a612ab61c5d45d93b1040dc13e6cc9 -EBUILD ted-2.20.ebuild 1148 RMD160 68999c4bc1a94c2e93a87ea1be0cb6f1681b1cf3 SHA1 ba03f05fbbad9450abf0e9d6c7f83a216b9889d2 SHA256 8d9c08a1200190443b4a7cc18d629efa6288642c2a3480b419c40b482552fa67 -MISC ChangeLog 3502 RMD160 90cdb8f3f977c31ddb01b84839a773ebd3223d42 SHA1 604760862d94e4482a6b1efc2163c8805b85bc69 SHA256 9981326b0cd1d22dfd059bb15e36f9dd5043df631cc09b24504542f0075ece2b +EBUILD ted-2.20.ebuild 1204 RMD160 aeb02f56d8adf0a374273ade89298436a18d1700 SHA1 383e4d6abc0981cbed853013596cb60c304e4422 SHA256 f8d427dba8ba67b874dc0cb1ae2613b3e97f0fd129216bc8a2ab0d9451c92b3d +MISC ChangeLog 3638 RMD160 d1bc36e351edea837fb6b0148b237a6956c57f79 SHA1 a9dc4732f5df230fca3250cbc7cf1a6c310af11f SHA256 11ccecc5699fa27655f2718205835e56369e609f80ab7539edfcc2da99b3c464 MISC metadata.xml 257 RMD160 a7bf9bf94a1d659ac937bb19d6af7ae2f9d6076b SHA1 4fa4a19920663c7ea62945dc5b3a8812fc85b649 SHA256 ec66c937fe9ae183942074cf995a6e3cffd4a6a3f57d8731a5bc1bcebafc6416 diff --git a/app-editors/ted/files/ted-2.20-libpng14.patch b/app-editors/ted/files/ted-2.20-libpng14.patch new file mode 100644 index 000000000000..34fd241f5018 --- /dev/null +++ b/app-editors/ted/files/ted-2.20-libpng14.patch @@ -0,0 +1,13 @@ +http://repos.archlinux.org/wsvn/community/ted/trunk/PKGBUILD + +--- bitmap/bmpng.c ++++ bitmap/bmpng.c +@@ -283,7 +283,7 @@ + static int bpPngiFromBitmap( png_info * pngi, + const BitmapDescription * bd ) + { +- png_info_init( pngi ); ++ png_create_info_struct( pngi ); + pngi->width= bd->bdPixelsWide; + pngi->height= bd->bdPixelsHigh; + diff --git a/app-editors/ted/ted-2.20.ebuild b/app-editors/ted/ted-2.20.ebuild index e8c6bf9cd6d0..8534d42e97e5 100644 --- a/app-editors/ted/ted-2.20.ebuild +++ b/app-editors/ted/ted-2.20.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.20.ebuild,v 1.2 2010/01/22 16:40:49 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.20.ebuild,v 1.3 2010/03/08 21:20:40 ssuominen Exp $ EAPI=2 +inherit eutils DESCRIPTION="X-based rich text editor" HOMEPAGE="http://www.nllgg.nl/Ted" @@ -19,9 +20,11 @@ DEPEND="x11-libs/gtk+ >=media-libs/libpng-1.2.3" RDEPEND="${DEPEND}" -S="${WORKDIR}/Ted-${PV}" +S=${WORKDIR}/Ted-${PV} src_prepare() { + epatch "${FILESDIR}"/${P}-libpng14.patch + sed -i -e 's|/Ted/|/share/Ted/|' \ "${S}"/appFrame/appFrameConfig.h.in \ "${S}"/Ted/tedConfig.h.in || die |