diff options
| author |   Julian Ospald <hasufell@gentoo.org> | 2013-10-26 19:50:45 +0000 |
|---|---|---|
| committer | Julian Ospald <hasufell@gentoo.org> | 2013-10-26 19:50:45 +0000 |
| commit | 7cc32c2545c6f59785f75f3fe05a7f3ae577801f (patch) | |
| tree | 2cdbde9cd1a4a052a5938ba24ae6f7b6c65c6757 /media-gfx | |
| parent | Version bump (diff) | |
| download | gentoo-2-7cc32c2545c6f59785f75f3fe05a7f3ae577801f.tar.gz gentoo-2-7cc32c2545c6f59785f75f3fe05a7f3ae577801f.tar.bz2 gentoo-2-7cc32c2545c6f59785f75f3fe05a7f3ae577801f.zip | |
fix underlinking wrt #484434
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/tuxpaint/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch | 17 | ||||
| -rw-r--r-- | media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild | 5 |
3 files changed, 25 insertions, 3 deletions
diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog index a1c2fb316185..67ef19525b2f 100644 --- a/media-gfx/tuxpaint/ChangeLog +++ b/media-gfx/tuxpaint/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/tuxpaint # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.68 2013/02/16 12:43:36 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.69 2013/10/26 19:50:45 hasufell Exp $ + + 26 Oct 2013; Julian Ospald <hasufell@gentoo.org> tuxpaint-0.9.21-r1.ebuild, + +files/tuxpaint-0.9.21-underlinking.patch: + fix underlinking wrt #484434 16 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml: Cleanup due bug #96436 diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch new file mode 100644 index 000000000000..295684918f50 --- /dev/null +++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch @@ -0,0 +1,17 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sat Oct 26 19:16:54 UTC 2013 +Subject: fix underlinking + +https://bugs.gentoo.org/show_bug.cgi?id=484434 + +--- tuxpaint-0.9.21/Makefile ++++ tuxpaint-0.9.21/Makefile +@@ -80,7 +80,7 @@ + windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB) + osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) + beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)" +-linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB) ++linux_ARCH_LINKS:=$(PAPER_LIB) $(PNG) $(FRIBIDI_LIB) + ARCH_LINKS:=$($(OS)_ARCH_LINKS) + + # Install a launcher icon for the Nokia 770. diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild index c845af8e2ad9..6273a2f57842 100644 --- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild +++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild,v 1.4 2011/10/15 14:46:32 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild,v 1.5 2013/10/26 19:50:45 hasufell Exp $ EAPI="2" @@ -38,6 +38,7 @@ src_prepare() { epatch "${FILESDIR}/${PN}-0.9.20-gentoo.patch" epatch "${FILESDIR}/${P}-libpng1.5.patch" #378199 epatch "${FILESDIR}/${P}-LDFLAGS.patch" #334571 + epatch "${FILESDIR}/${P}-underlinking.patch" #484434 sed -i \ -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \ |