Fix building against media-libs/giflib-4.2* (bug #546202).

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 23e386796c72e81de314e1182d7b7643a86bf4b0..d3e09da4f73249950e83ac1884e510ef2b4454f0 100644 (file)
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.126 2015/04/04 08:27:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.127 2015/05/09 13:25:56 jer Exp $
+
+  09 May 2015; Jeroen Roovers <jer@gentoo.org> fbida-2.10.ebuild,
+  +files/fbida-2.10-giflib-4.2.patch:
+  Fix building against media-libs/giflib-4.2* (bug #546202).
 
 *fbida-2.10 (04 Apr 2015)
 

diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 8c1db7b25077437f1ce6da1af08da332d834c68e..98fc56e0dddb121509cbca27a9dbb6726cd9eb9d 100644 (file)
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -3,19 +3,20 @@ Hash: SHA256
 
 AUX fbida-2.09-giflib.patch 2402 SHA256 e4ab03707e126f31bf39db9e24ab14c748b2dff1d098a33b4cecf23b4f6aea15 SHA512 65b7dc8ba5f984ca81bb4a9c52cc6da3e7f309be07f7a1862e2bb1b76d2127c7d252c6fb35369c0836855bb59dc9be0d47bc8cdaaf1b5bc2abafcc96d2704c0c WHIRLPOOL d1998a433c2dc54698527db23ff9097bf6cbd6dc7a5d522f6e7fdfb962dfeb5198e90d4a657c3c0c372f545c1149e1375834f15c2aed3da1e5a5d37824d2f89f
 AUX fbida-2.09-make.patch 994 SHA256 ac11e8f072de7e36e41d42b5760cd99dcea9e19a951ed93e13880a2c69868f67 SHA512 e4bd6f16fc9ab51529d32f5c200867cc44ed418d0eb63a2649e3cfc17cdf0fa0cdbbb12d1031e855b86fe021345c1656dd53a6455851baf3d4a986719eb6013d WHIRLPOOL 23e7c8d188e2804f4646b2f783db6c0c94d807aa92de942d90e50b7d02c7eb8e0c481ee6459ddb9524f246074991b839646088e3f99ac90c02c91ececec94136
+AUX fbida-2.10-giflib-4.2.patch 542 SHA256 1393afb3e73d132828a0b431a1e7ed93244250c265d54ee8d59841c6a26ec707 SHA512 7610721d965c3640c4524311626ba099501cac1aef6cea62d32158e8a7720cc23bdb0c83422795676de021f88a592c3d2f7d4d26d810dc06d959f7c85e91019e WHIRLPOOL c2e58369c704f6c92d0285ecea5bba81f59e73e9c4d972bc89a2b604ed403ad94dacf7e836082658641ea21ecc13c1e9b1adb6104d1e2cc4fa1f9ed487fb99fe
 AUX ida-desktop.patch 384 SHA256 68b73ebe6ebc04dd3c205ee328c61c9d0b523c9ba87dda9301f82eab306b9e57 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 WHIRLPOOL 5ff72a36831f60b2965964e53b105121c0de042e18abfc19d348c35496dada17c466d2e0d1cbeb778238a62380a4a2d7e3998e15565accf3b69dc19f80aa0e32
 DIST fbida-2.09-jpeg-9a.patch.bz2 29392 SHA256 d0979bb7b33b34c2b01f0fe14825812319b0ec08f00f0de6cf9a0533a5f6dba8 SHA512 f644f464231967589a2f1ad0fdc9025d60348a9de20d468fc6abdf3dc0cbf07522e3f71a94930df3c54055fc445df035b4b007efa7e6a3f7acbec90e28dc86c8 WHIRLPOOL 372aa56e698f82ff9dd8adacb5de9347e40849653553d810e4f5c0fca731ca8e863f8a20658db071ca11ed8d6bc8794c36ec5fd8c0a2426d8e500389703f2e95
 DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b
 DIST fbida-2.10.tar.gz 283490 SHA256 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 SHA512 b7371c19d68cc7219faca4bbfa464c85df2eb22c7bd737d4f0a6fb3de481497862ca22832801d29bab57285d5a8d7d0b0009e14426efdce2759d47340f5eca6d WHIRLPOOL 78c5dc34a9f050e560ada960718a9f43e6d8c95fe4c91c052a70c93350de80eebd3e8e9b6c26361ecd8361efe96824e78b2af7a2b2e27430a11e712bb9a02ee0
 DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be
 EBUILD fbida-2.09-r4.ebuild 2652 SHA256 8a2db57df7bcc5ecaa88a3da2bda437629e21b6e47f1f1c7e7dc9bb01da5e47f SHA512 46f456e99119473fcaf431f00dfab66b9ba4dff87e8dc9491d8e41858dea0e8a374e1c97bef030f82615995eaa8c2233453bf9b2deeb2caaffcbf00cb8832426 WHIRLPOOL 9250f3a8501fc2f96cbfbde40f6f73f0ee0d621126c77a70018aa0bcdd68707bc4234fabe872e3571405458886a34280c4bed31cf406513a9e3c99e368f962b3
-EBUILD fbida-2.10.ebuild 2216 SHA256 05c01e300cfdd6c7b3613812fcee2d31aaf7e4ad7df2c5b381d3f22aa2d273d3 SHA512 de485263b97e59d874adf8b99be568ce90708c41d5666ae436d05c212cbeb8245fd64d57771956e377e99627408719c22b54fe6c7b5e96c7ef3ec4b2972faadd WHIRLPOOL 9d1e775e3050ca328b3a15f2ec1d22138bc2641ce25f79655551339390f503283e486da916ee3768026b90ee379ec7b49b65446714f170667a9905ba60291898
-MISC ChangeLog 15778 SHA256 28304ec521aeca0ab26a037f444aa2e38fe30d53c317895c2b35f406001ef874 SHA512 35da238cc7aab0a81b7347929e62aa9b477286d7cf85a049be3389ec86d3b9683eb0e7d6cc7f742cd6177359ff3077788af4e50c56f145ebce437847864c5798 WHIRLPOOL 782c8f42a5dc7c3a5d665ab2681f2e04b7554424a55d14bed9e228033e5ce0c086b9340d2a95ece6b7b38c6a63408ed5223e871909ad1daf7d9599d21e78f515
+EBUILD fbida-2.10.ebuild 2266 SHA256 d1475201d61c9392417239fe09edf7bdf6e347e67d16f93caf7fa1a872fe7bf2 SHA512 54e5448f6a27228565c153429ce289da711b511a67f997f54bddd1363f195fe56262eba1fa8bbe5a936341ee5d1d28325b3dc1be492a2c81319e4a818f865b05 WHIRLPOOL ab7dc5121dc7a955fa07238b8991dc7b3f964d350d539330622e05b389887b2bcab398f65ffd026ef57e8100ddec9543260c0aac1d1e9b9dc4839da3f6cfe6d9
+MISC ChangeLog 15944 SHA256 62ad8ee6b45997090ac005083c261f04e068435a2076ea3ca7755c127f310d28 SHA512 175cefddf8d2d8dbfbdca48d42ac00f520099f49aca072d84109b9d37235799ecae85d6686eb29c217a785f33b19764861591a3fa5e648aaa17cb8692473ceae WHIRLPOOL 5087a5348e7c622aab3452badb81cefc09dba9a4abd29e7a9ecc495f4467a3201beaeaf961df9584ca80513493d4d4b444c91599585e49277019918c91bf67d2
 MISC metadata.xml 409 SHA256 30adb8b77b731331a7981157faa6d76bb71beba7311635639ebfaf0d545af0c0 SHA512 48ddfb184fb23a70a73dcf9e3d5441fb0bf28956afea3eb69cacc1c4bf211a2571afdda83426c6be003b86ac9632acf14b87e9b518d0ed76e89a0b0a037b221e WHIRLPOOL cc8c6349745adb96e88a5e325ee37c170bee9055a3b2628ba2885cc53eb3e97f5dd3ae8b745c9385a0fbf37c219cc179cadb9ba80f3c1849c601b4e783ea8c3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUfoJAACgkQVWmRsqeSphMpRwCdGzdTic5HsuS6KVKeZl8kjVxz
-/hkAmgNkdSlOpIOedZUc5cgLVL5Ap0Wy
-=DJ5r
+iEYEAREIAAYFAlVOCuUACgkQVWmRsqeSphOv3wCfaFUnufncyIWx5n2onsoyx6/B
+vB4An0mudaLbE9uwoB77wqNB5of0GfJ2
+=luT9
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/fbida/fbida-2.10.ebuild b/media-gfx/fbida/fbida-2.10.ebuild
index 48789ffb4b49843c76159d34930d2c36cd56bdfb..d22f31b923bca6fe1c8425ac6d1f82c52a148d48 100644 (file)
--- a/media-gfx/fbida/fbida-2.10.ebuild
+++ b/media-gfx/fbida/fbida-2.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.10.ebuild,v 1.1 2015/04/04 08:27:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.10.ebuild,v 1.2 2015/05/09 13:25:56 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -48,7 +48,9 @@ DEPEND="
 "
 
 src_prepare() {
-       epatch "${FILESDIR}"/ida-desktop.patch
+       epatch \
+               "${FILESDIR}"/ida-desktop.patch \
+               "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
 
        tc-export CC CPP
 }

diff --git a/media-gfx/fbida/files/fbida-2.10-giflib-4.2.patch b/media-gfx/fbida/files/fbida-2.10-giflib-4.2.patch
new file mode 100644 (file)
index 0000000..1e21b8a
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.10-giflib-4.2.patch
@@ -0,0 +1,17 @@
+--- a/rd/read-gif.c
++++ b/rd/read-gif.c
+@@ -14,6 +14,14 @@
+ }
+ #else
+ #define GIF5DATA(x)
++// v4.2 removed PrintGifError in favor of GifErrorString, but with a different
++// prototype than v5
++#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && (GIFLIB_MAJOR == 4) && (GIFLIB_MINOR == 2)
++static void PrintGifError()
++{
++    fprintf(stderr, "GIF library error: %s\n", GifErrorString());
++}
++#endif
+ #define PrintGifError(e)      PrintGifError()
+ #define DGifOpenFileHandle(x,e)       DGifOpenFileHandle(x)
+ #define DGifCloseFile(x,e)    DGifCloseFile(x)