Fix building with libpng16 which doesn't implicitly pull in string.h through png.h anymore wrt #471460 by F. Delente

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

4 files changed, 41 insertions, 20 deletions

diff --git a/x11-misc/piedock/ChangeLog b/x11-misc/piedock/ChangeLog
index 4c60eb0d7baf..4bb6c1a622da 100644
--- a/x11-misc/piedock/ChangeLog
+++ b/x11-misc/piedock/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/piedock
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/ChangeLog,v 1.19 2013/03/02 23:50:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/ChangeLog,v 1.20 2013/06/01 15:29:46 ssuominen Exp $
+
+  01 Jun 2013; Samuli Suominen <ssuominen@gentoo.org> piedock-1.6.1.ebuild,
+  +files/piedock-1.6.1-mem.patch:
+  Fix building with libpng16 which doesn't implicitly pull in string.h through
+  png.h anymore wrt #471460 by F. Delente
 
   02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> piedock-1.6.1.ebuild:
   Move Qt dependencies to the new category
diff --git a/x11-misc/piedock/Manifest b/x11-misc/piedock/Manifest
index f48775310c21..1360d2b99d47 100644
--- a/x11-misc/piedock/Manifest
+++ b/x11-misc/piedock/Manifest
@@ -2,29 +2,22 @@
 Hash: SHA256
 
 AUX piedock-1.6.1-gcc47.patch 583 SHA256 39f2bac09a0d245c237a8f4ecb355d2a6723915d0142db65a13e824344fd139a SHA512 8233efb13cfa974e596b0ea3d4d3c2c2dbe6b1023c789e1a3714cfd6a04b28780cd1629e634f6b82ed93cdb654a0b1e23aa6110f0f5d8d1a87a5b0536ec23dea WHIRLPOOL 846ecc1f9c8d9beb8390f9e644ca65281c19e8a436197d7a050484f28bd7c9eb372f358160c7182a7f5a33ec0f0b46021082d5364d70247bc4674ac5886999a0
+AUX piedock-1.6.1-mem.patch 388 SHA256 43e8ceb3cb6dc9926369bcb37c0dabfd74dd6050622a227ae2414e7c5c3a3c7d SHA512 2eee85779d55a6834ef4b582d2ce65ce582414dcf9603387fe49c36c98a1c072c90b2d06c1503b2f22ecc9c982d9f9c02a7e6668ba5d2ae4d47e2d56b677faf6 WHIRLPOOL 4456c88bb27f7acb00585e4295c0de28c8fdfc3d822d7fdf425c12df4da5400b8ff6b0d960be09dc05329da2c7182f75239d50bcf843da966eafab63e78c96c3
 AUX piedock-1.6.1-signals.patch 173 SHA256 9b06e34119ed255c7ab5bfcfafb2d4f0408de5c71b88143b4ee7484c29682f47 SHA512 c98aa7e22ce78fc60d778861e5bef12545553723c28bfa599b6a2d8b30c572b8d480f167b8730d84dad9c06c16cfb45f9e69665187f3e5c66053a0d4b35684fe WHIRLPOOL 8929c8410edc4e38d9a17e310996232c8691811cdd48c3582342f3803fc0004ef4144eb6d4ce65eee972ef8f5faec0d11760a75481e71d9bf525d87e0c540adc
 DIST piedock-1.6.0.tar.bz2 251505 SHA256 21ae1144db75a87bfd6bc0987316ad2197b5bfbc46e04f6fdcc04119545b02c7 SHA512 bf9699310d8d049d4c98decd858107c6f17a1f7ce6886fcf8526855734ac67953dcca5f304b2b9960636da701823ba4236344bfbbc55b7c40d65c955e8b22845 WHIRLPOOL 67b2d872912592d122069c04a1eecedf0e8699c5eaea4fe2e47fc806610c2f459e9ca45fe350c723ae418a440ac947b8f64f770d464a05589fe347d4dc4ddc28
 DIST piedock-1.6.1.tar.bz2 251927 SHA256 541f3ac514fca44e3f2ff96200c4b343ba37288e5770188ebde0c1fba64f8093 SHA512 e956497411d55005e369a405191a208874779c87651fa7d02f7db84cf209e87f22c89aaa259a35d2a9a558ede2999925a05b65322717088400e8bbd15c4e1060 WHIRLPOOL b4a672fa2c8eed3fcf9e2b659b22d2aa3a065c6736e720f2d4aac71ae1aeba85a02a20a97a3b8b211937668e5a976de1ec773555ecc08c886eeaf253eefd2582
 EBUILD piedock-1.6.0.ebuild 695 SHA256 3a1615f02aeddd3f9b5d621399f24113a3201e938ec80f60ad94351b8b264826 SHA512 0cb6e3d36f7275b7cd65a1651784f949de37201bf39e10955271a21d197e07ec00110cfa074dd5c37340a1af94b47c6f84b75da19731c4748b61f6eec84cf844 WHIRLPOOL f4660544d55ca6c81585e5e902a37cafa085b14a620164f7aa9f6a4b77400651e29099f3c1c32ee48eae79728cf8ab6920318cc07f882aa88d37386e3556df7f
-EBUILD piedock-1.6.1.ebuild 1068 SHA256 ca938a77c5af58399492bbce8176ea5ba14ff572ae58111b8995282c5f82c619 SHA512 b1215f83a06308778f41ab7b3cbfaa0da9b2a4746a5b5ec9b22d60c536d4215d1817781c2acb863a216510b81594d75e6a8d387e4729ec4a300605c79555d437 WHIRLPOOL 17854cbdbe4f4815e52771e433bbc0f8a9bdc4579b1005bb893a7e2e5deed4e6ce5e7629db9c21ef18fdfa20bf414838d5f4525feb64eb0a4d773ed8910bb2b2
-MISC ChangeLog 3013 SHA256 1d0d30df15331ac968774194215f536aa26e17ed39e7cbf7b072e80040128691 SHA512 3e43c2402a076afdb1c2586452ca25707c6abe592203ddd2b0d165c575b24815ac4374f2b3703b87de52b7fccb9e834f13f9a68472207bafc93446a086534ebe WHIRLPOOL 5411214730fa025ca755ca6ccfccddf5506a1e5c252fd9d057a2bef924beb381cfdc667952369407458888c9611dc439d9d66101d822452e77d0f28172677d71
+EBUILD piedock-1.6.1.ebuild 1106 SHA256 56df7a7490fb6daf0859dfcc5e1254e826b55eb45d91d1c4b6b37d7a04b80c96 SHA512 e8295fea061e175a3aa0c9a076955fef5e721923da9f842d9889572725f999d41cc0b9b9d3260727e9f9533c5fa35a80a6a6a76e786ab9caeea91d18d023b0f3 WHIRLPOOL 24b6fc4a0c841da633383d48a637f603ccf961f70f807d55fe14f2b5497fb491e755838cd44852d74ec2bef6d6048cd8c7578ef7bfde106466f4061afcd9e58b
+MISC ChangeLog 3246 SHA256 dc1bcfb98c182c6a84e68c4b5c9e68d703c842294d89aaa53e90432f2100113b SHA512 52c731f5b07f5120fd8d7d31ff7b413a957b0e295d4a0ae6ccd03082cee973c677f9c95d3c965c64394e5d10e3f891a94b33cf3c2d350b8fe6a159d2230b5166 WHIRLPOOL 66e8657534de0581ce72edd9d070b5329aa12e70b5fceb083c2e9f21055995a489829bcb7f6acd453ff852af775bbaccfe13da9d9902e88b4dac1e3058c07fc6
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMpBaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88758P/0SNfNuq149BYpmjpDe5COA/
-XIuVAVGfPpeFmHCEOO698T4WREzH/80aidG1Gwqu7QgJSsFhcNJQtifYgIL0Kz4s
-h6o0PPbHq93+psi8q6TkA/bB3W47wVaLgbQOgmepRVz0/y9LdKF5IQb3pLlPmKju
-1tuia0f+NSUSf103PpTwIbQVGMzCsWvWpwGMGTnw1ImDr+kgeY3UitGaL7N8zyKp
-tgxfHCMc5n4oDvyJgcro2vHyNyk6LiMB73F67/DQ5P7FwKIXfJEsqg2IC4yMoNKc
-+540Kzr7IymwRtLZLs/DRHTnS9efWYJfQRW6nV5gQKvEnAFzTGtzwOlCYbmbODF1
-ouJ6wTYHRI1pjPh+CCf3U+AMehSVPLzmGvAe6If+Amff5mx2r8iJU/eXemcFy4hW
-LPf5PA24FAoKklsONbhbH8nI+J6Taz3RCgsQWuLyJ5XpVtOyhC8Z6QaheffxB9C4
-TqknzNbtpF8g3HwQR5kkIn9SUMob2kPQFMm2DDWA6aQU6TQjtUFnSSnj0qWCywN5
-1YQ4+5N+ie6sVKMfQqOaRCY4Ieol6jggmVaiR+tlNpQW7He7VsQRKy2DfqyEKXhB
-hRDwN3vQ0tKypyXVewPK8FThxAfPjVzRiEUReHt5C8n9clFS+j35KpS0rSCKbpJn
-NPuoHAbv/qS5/xr5FuLC
-=qJaz
+iQEcBAEBCAAGBQJRqhMBAAoJEEdUh39IaPFN9NgH/A3rso1vSvWIcmWtque4ztWQ
+Lv1fca6mye7UfgIVtGWWoSyKkbRgOE/Xg8kfeXn1D9P/N1lGVcF/Rl/KNnAP5Zaq
+qbyc4b4BJSaPVrJDjd1Vhnqu+7WY+qWvLu4A94dYZldCsjoAyrRF5osCOX5t7f+J
+yI00e9whCG4H70LIufM+sqEDn2QKk+YereQo9WGwSiYK/o56mkuzkJt2Ud71uhjx
+gTIoE2SZfhQris0WErDf8KcmbcHZSTDqZ4BYlgoPyz2aKCZ5KgARlP8lOgF1/+gU
+VWn3zwelIWduTYE3ThtyK5O2eUa4F8r6f5SmfPhew4i0vCILy+I7yLHB+ZCuuBA=
+=WukJ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/piedock/files/piedock-1.6.1-mem.patch b/x11-misc/piedock/files/piedock-1.6.1-mem.patch
new file mode 100644
index 000000000000..7d0c92ac0dcd
--- /dev/null
+++ b/x11-misc/piedock/files/piedock-1.6.1-mem.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/471460
+
+--- src/IconMap.cpp
++++ src/IconMap.cpp
+@@ -15,6 +15,7 @@
+ #include "WildcardCompare.h"
+ #include "Png.h"
+ 
++#include <string.h> /* memset */
+ #include <algorithm>
+ #include <sstream>
+ #include <fstream>
+--- src/Png.cpp
++++ src/Png.cpp
+@@ -13,6 +13,7 @@
+  */
+ #include "Png.h"
+ 
++#include <string.h> /* memcpy */
+ #include <fstream>
+ #include <stdexcept>
+ 
diff --git a/x11-misc/piedock/piedock-1.6.1.ebuild b/x11-misc/piedock/piedock-1.6.1.ebuild
index 9f7cc5b70537..07746885adab 100644
--- a/x11-misc/piedock/piedock-1.6.1.ebuild
+++ b/x11-misc/piedock/piedock-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/piedock-1.6.1.ebuild,v 1.4 2013/03/02 23:50:51 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/piedock/piedock-1.6.1.ebuild,v 1.5 2013/06/01 15:29:46 ssuominen Exp $
 
 EAPI=4
 inherit eutils
@@ -39,6 +39,7 @@ DOCS=( res/${PN}rc.sample AUTHORS ChangeLog NEWS )
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-signals.patch
 	epatch "${FILESDIR}"/${P}-gcc47.patch
+	epatch "${FILESDIR}"/${P}-mem.patch
 }
 
 src_configure() {