diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-06-01 15:29:46 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-06-01 15:29:46 +0000 |
| commit | 051c547c1697d2ad266c77b850c2f886ed64629f (patch) | |
| tree | 2b120d9b0b1eff34d8336384906eeaa3c489f4c0 /x11-misc/piedock | |
| parent | Add snapshot of upstream repository masked by keywords (diff) | |
| download | gentoo-2-051c547c1697d2ad266c77b850c2f886ed64629f.tar.gz gentoo-2-051c547c1697d2ad266c77b850c2f886ed64629f.tar.bz2 gentoo-2-051c547c1697d2ad266c77b850c2f886ed64629f.zip | |
Fix building with libpng16 which doesn't implicitly pull in string.h through png.h anymore wrt #471460 by F. Delente
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'x11-misc/piedock')
| -rw-r--r-- | x11-misc/piedock/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/piedock/files/piedock-1.6.1-mem.patch | 22 | ||||
| -rw-r--r-- | x11-misc/piedock/piedock-1.6.1.ebuild | 3 |
3 files changed, 30 insertions, 2 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/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() { |