Explicitely include string.h for memcpy() since libpng16 no longer does it for us.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 39 insertions, 26 deletions

diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog
index 21743e78abd8..583233c1d3a6 100644
--- a/x11-misc/fireflies/ChangeLog
+++ b/x11-misc/fireflies/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/fireflies
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.28 2013/01/12 11:46:27 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.29 2013/11/25 10:24:34 ssuominen Exp $
+
+  25 Nov 2013; Samuli Suominen <ssuominen@gentoo.org>
+  +files/fireflies-2.07-libgfx-libpng16.patch, fireflies-2.07-r1.ebuild:
+  Explicitely include string.h for memcpy() since libpng16 no longer does it for
+  us.
 
   23 Dec 2012; Ulrich Müller <ulm@gentoo.org> fireflies-2.07.ebuild,
   fireflies-2.07-r1.ebuild:
@@ -102,4 +107,3 @@
   files/fireflies-2.06-Make.include.in.patch,
   files/fireflies-2.06-configure.patch:
   Initial commit; #33738
-
diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest
index 817f20087c8c..820077def3dc 100644
--- a/x11-misc/fireflies/Manifest
+++ b/x11-misc/fireflies/Manifest
@@ -7,25 +7,20 @@ AUX fireflies-2.07-build_system.patch 1920 SHA256 096cfd6ce9c2183799930ea8bdb64e
 AUX fireflies-2.07-gcc43.patch 330 SHA256 8a17ccace374dbc5c1683051080ea39bac49443061977bde726731e4dcaf749c SHA512 8ee85a92b6f5af495c2484df496627d8af5c3f70e18d10ea3463d8cc6fa1f35005532fcc2eb197e6f48ffe6865223cc78ebf0fc60290441cde4425572e2fe444 WHIRLPOOL d995991c9e96d6f216bc625ad463b9f7686270288bfa477b896f009502851037b4d8d0ff68b51bdd64fe65654a9898f9cb43b1bf2b1b87204cecb10602c6e489
 AUX fireflies-2.07-gcc44.patch 390 SHA256 3d9cca98813125a881614d0c027d8251db211ea7c0c6e2fc35e53a4fbeff72b6 SHA512 aa6a1b987efe983678b6a2a2b2a5cb91699a54587ef34c3b5c5ed9208a8689e6ae6f1ef4ff6328286f631856fbb406d0c026ef39ad6518fc1378a401f881a292 WHIRLPOOL d62935c116c46e47b3fd03526954c89939884e9a03145f34903cefbc558d1b5d8be242e7767ae039ddd64c60dc7bd5fa9d75e7e59a420bbbc34ea0363392bb7b
 AUX fireflies-2.07-libgfx-libpng15.patch 590 SHA256 1c3f88c0a99ccb58ef35ff0f4a4239ee0d5d521eb053ff9019f30377b5ad29ed SHA512 d096c33979bbc910445e3f62ee137bc37a76ffbe42924d348789f65177d650656c52249dc62e7f596aba1283283414d9fad12ad1d71c55f29a9fc60ac32e1bf0 WHIRLPOOL c17426f0fc0c6b7b4a2f3d4ab81de0af9f5fa75533bb7c35488c6715405c57332944d8a09498f563e642c9e672a9e6b929844e13bb8d2727e90f9007bb2e81c9
+AUX fireflies-2.07-libgfx-libpng16.patch 457 SHA256 754801780d56aaf7970d74b0ff05c08a4ea9357824ca8bfca82a631c31896c32 SHA512 69ee2b4fb48ba340c4e31b7847ee9aafcb54ae5f9533af2594d99434acba7c251490511b039756ea018dbe4e242a9a9690f3f8f57c733509c21e7a9fe1fed643 WHIRLPOOL 6ed4dc9e1880f9e72ae113da2917015d45b49d5a2616f6636fbbfe7b15a75dd178dc09dbd0e6201ab61e78490b20cf7795a9049bdfe6e5c43940201602367998
 DIST fireflies-2.07.tar.gz 199917 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648 SHA512 d8d478c3ff7705eb2e2f04f490d37ea8d7edcac2fcdc99e06f9bad09c0f1b678d62f09b3d965734f230b2aa3d804c81ad3d15429ede7cb8e951213716f61666a WHIRLPOOL c7714c4f1d694a9b832594ee0627324dc6a3606d62d1a5e83ba05fb1ccfdc3a1cc7e86c8c3634cd008f70e6e443e668c3c41e795941d59af3370f1c5b0562509
-EBUILD fireflies-2.07-r1.ebuild 1082 SHA256 40f1b0b975b7c4031e0eea38b7fa8d7071dada3c74249b52d6ef1f6da7ad1b2c SHA512 f472b940d4ee5601a80044ace44f18d6e49b7fe04ab4bb8c974b13bac80bafccf7912549552a8ee5cc1feb7b4a30963d265645240d7e9c3176dca9ff3b99760f WHIRLPOOL 58b6867768bc848fd27e4df8d0b3bca0021a69eb93357736cd0a78c209cd73c22733d683d2d202fda0e6695bd0a2e2a4388ef9f53565aa2d05d63266852b2071
+EBUILD fireflies-2.07-r1.ebuild 1063 SHA256 05e798108bf53066c582dd99d68b6737f5790db059d2075bf6d6b557299d4514 SHA512 a13a536297291f1d86aec144fbf1added3217560862f11bca6f1ef7dab195e518ec364f76f6005d1eaf5e724d5550af9f2c63109aa6191d383261ffd47cbcab8 WHIRLPOOL 0d7d6705e8363d995e779bc213e7269c8cce60374ccbb2b98f7ad9c2f8050bf7c39f29b0ea58bbf4a35a4fffbd4779e089730444b32fa24037bfa938698e61a8
 EBUILD fireflies-2.07.ebuild 1154 SHA256 0d4ada6e604b3696b4334dacbb37d13bca9345019c470bf1351301aa011bf226 SHA512 c7602a30fef239b4ac3d515f2ad7aa054c0babc46dc70f1a049537b8e267a6e12ec999f5bf8e97cde3a2ad6760728044646b459eacc85e7de88befbfc11315cd WHIRLPOOL ae12ebd5e52847b6d74d5af472299c0d11ca47706995a302951845be5025fdd630d75e23621aa832f983c157ded0d3e9f610886f011648bd5dd89fc650fd5ba3
-MISC ChangeLog 3930 SHA256 5ef4ef2ca60b002559874406bfee2510595a5752f3f6852331bffa4e4608cb96 SHA512 7d1ce6631a0c0ff5cb8e44431f5afc8174661561378d9fe813d384e1acca98ff08b8b2573c14e3a1267ca56ef8e4c738ed17fe7880f12320984bf232d9457230 WHIRLPOOL efa81dcf0118d1ebcca9b66f7170539c8294f3ed40dc99b4011da20323c214b3dfe89b486cad21e64a72938d19a73c4ed6f6aeb5593d68fcbb2b5e4062d0d21a
+MISC ChangeLog 4150 SHA256 4136a08f4221e952d7fc0753024042c3c8e0996110fe8b8535ab0822a032c18c SHA512 726520ebed98506fa6595ced671f105c506d2d8699ef11b54d73446caef6dbdfe2dd20056d089fa9fa7b11b047631631f901c0e17e384bd849824fba0de53c5f WHIRLPOOL 3d8136c9ebb9ca9e70264dcd494ae73e026bcaeefb4c7d799d0caa06de6953c634d9262b52eb7df485c635fe2dc8856f0d14d58da7a11a6f19b329bc53243147
 MISC metadata.xml 173 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f SHA512 0f9f902a37286192de62589f1aace6bec3cfe2a8511ac95e98b55324a9da1a5e79b8f14316e1be0b818e90c0be0cec5fe16f75d9055301a774b241e1486f62c2 WHIRLPOOL 0d0c57c7890f2cdb7210d2d1d61d03d412478747414999bc7919d70b8243ddc66d7903df50158671e8cc454913b4d859f752bbe3709404aa15608e1f1234d717
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ8U24AAoJEDxpGckxwJCBsbwP/jgpT2U+iBzndZGj5XtLh3Cl
-l6r35h77BlwobsZPETo0A2VtqwKBo33OUDt85PUdU6RbGHcau1q6pf3IHLnzrmtK
-zkVZqHIr4CdMTwOkMrBeIxBkXZRqe6VZd0tW8vJOQ1dzN0Gu2FvEYsYatPu+Dlu3
-YUr64NtKJ4ToLNzx36DtKKn57VnevGTaujtYNLYep10XNM/bqqPc82Rbc0XTbLkK
-is3kkjZXem3iL8X7+60k6/HvE3SU/RrdwU/O6YN4eaWTgEn8g0riolI2h6gbv6Ty
-34HPSOcVUw199FjMHTxSo24GnYHCBHNtt7I8EQcAX+y7t2oswm+1KXGOp21mZ07h
-Wc4xhMBINAG19y3pLcSyBOWo/wDfQs92/uwGvBZ8lj/39kIhSefYB2fflTrq7u/M
-iXl2k12AtEWh8ed62+LtMzGQI7y9zN/GlyLWvD7GvL7IdrvfJSZ0AKKylo3ABAn2
-Zo3TcHgAp9MbU3Q+dOOTfUGf9jcY5ZDGlD9IyGlLeKP8cjvWfQUH+DWHVdaKWUsC
-CzJinAo7aUlz1VIWmwPmxBQ+LM1a6fItScBkU+mMsbXN+pxrfwvzZNr2vspHuQKK
-wwT9rV/oKIsLlOnNPedTBKleAMfvji7mswJWlmJwkWplP8aATtsU/HrnSSCKRmhu
-3VufmJ/2kSg39mFXjAwc
-=OTGN
+iQEcBAEBCAAGBQJSkyUJAAoJEEdUh39IaPFNZRoH/iEv1QlEzkAOzcUvO+geyKN5
+IdD27JOZAWHq8eYQBsp5dMK/btEnYaFfR3es2gzCGRWqdp7DMPxvmD1OEfQSmAfr
+gCiqplg8RI1cvEl52lcdtNn+Y9KJMLuT937bC8aa+BrVwPfxz7iP95WbK01gCZhM
+R77dDYumXmXJMb0XnyBwDyli8DsQgiWAegVHLYC4T5RAVbMWO2IeMeldESR90Z4h
+Cl99B89n6+wHZ5Q7aR6zNclHW56bT5DT3p3LxTC+qpNYQsB57cx3kcMtvRyMwNao
+EVG9SyF5/7NuYB9LSWh/475KtfgoVzE6Ksz00fS4oEYZ/NyNxWe5nwBtmdBA5/Q=
+=8rhN
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch
new file mode 100644
index 000000000000..b599cac4f80f
--- /dev/null
+++ b/x11-misc/fireflies/files/fireflies-2.07-libgfx-libpng16.patch
@@ -0,0 +1,15 @@
+raster-png.cxx: In function ‘ByteRaster* read_png_image(const char*)’:
+raster-png.cxx:104:47: error: ‘memcpy’ was not declared in this scope
+       memcpy(pixel, row_pointers[row], nbytes);
+                                              ^
+
+--- libgfx/src/raster-png.cxx
++++ libgfx/src/raster-png.cxx
+@@ -16,6 +16,7 @@
+ #ifdef HAVE_LIBPNG
+ 
+ #include <png.h>
++#include <string.h> /* memcpy() */
+ 
+ ByteRaster *read_png_image(const char *file_name)
+ {
diff --git a/x11-misc/fireflies/fireflies-2.07-r1.ebuild b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
index 8177015c2729..98b31c108c23 100644
--- a/x11-misc/fireflies/fireflies-2.07-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07-r1.ebuild,v 1.6 2013/01/12 11:46:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07-r1.ebuild,v 1.7 2013/11/25 10:24:34 ssuominen Exp $
 
-EAPI=4
+EAPI=5
 inherit autotools eutils multilib
 
 DESCRIPTION="Fireflies screensaver: Wicked cool eye candy"
@@ -30,9 +30,8 @@ src_unpack() {
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-build_system.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-gcc44.patch \
-		"${FILESDIR}"/${P}-libgfx-libpng15.patch
+		"${FILESDIR}"/${P}-gcc4{3,4}.patch \
+		"${FILESDIR}"/${P}-libgfx-libpng1{5,6}.patch
 
 	eautoreconf
 }
@@ -40,5 +39,5 @@ src_prepare() {
 src_configure() {
 	econf \
 		--with-confdir=/usr/share/xscreensaver/config \
-		--with-bindir=/usr/$(get_libdir)/misc/xscreensaver
+		--with-bindir="/usr/$(get_libdir)/misc/xscreensaver"
 }