Respect LDFLAGS, bug #334571; build with libpng-1.5, bug #378199 thank Diego Elio Pettenò for reporting both. Drop old.

(Portage version: 2.1.10.10/cvs/Linux x86_64)

4 files changed, 62 insertions, 15 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 0943690271b9..3b6a7e17a0a3 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.62 2011/07/09 15:50:35 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.63 2011/08/09 19:18:58 pva Exp $
+
+*tuxpaint-0.9.21-r1 (09 Aug 2011)
+
+  09 Aug 2011; Peter Volkov <pva@gentoo.org> -tuxpaint-0.9.20-r1.ebuild,
+  +tuxpaint-0.9.21-r1.ebuild, +files/tuxpaint-0.9.21-LDFLAGS.patch,
+  +files/tuxpaint-0.9.21-libpng1.5.patch:
+  Respect LDFLAGS, bug #334571; build with libpng-1.5, bug #378199 thank Diego
+  Elio Pettenò for reporting both. Drop old.
 
   09 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> tuxpaint-0.9.21.ebuild:
   ppc stable wrt #367323
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
new file mode 100644
index 000000000000..3370d6725d58
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
@@ -0,0 +1,22 @@
+=== modified file 'Makefile'
+--- Makefile	2011-08-09 15:19:01 +0000
++++ Makefile	2011-08-09 15:19:43 +0000
+@@ -871,7 +871,7 @@
+ 		$(ARCH_LIBS)
+ 	@echo
+ 	@echo "...Linking Tux Paint..."
+-	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
+ 		-o tuxpaint $^ \
+ 		$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
+ 	@$(RSRC_CMD)
+@@ -1043,7 +1043,7 @@
+ MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
+ 
+ $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c  
+-	$(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
++	$(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
+ # Probably should separate the various flags like the following:
+ #	$(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)
+ 
+
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
new file mode 100644
index 000000000000..25e80cd2a488
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
@@ -0,0 +1,19 @@
+http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
+No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
+
+--- src/tuxpaint.c	2011/07/29 21:27:39	1.828
++++ src/tuxpaint.c	2011/08/08 17:59:12	1.829
+@@ -13425,12 +13425,7 @@
+       {
+ 	png_init_io(png_ptr, fi);
+ 
+-	info_ptr->width = surf->w;
+-	info_ptr->height = surf->h;
+-	info_ptr->bit_depth = 8;
+-	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-	info_ptr->interlace_type = 1;
+-	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
++        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+ 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+ 				   PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.20-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild
index 3ec0676295be..d5616fd5c4ad 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.20-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.20-r1.ebuild,v 1.4 2010/01/31 18:12:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild,v 1.1 2011/08/09 19:18:58 pva Exp $
 
 EAPI="2"
 
@@ -12,12 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="nls"
 
 DEPEND="
 	app-text/libpaper
+	dev-libs/fribidi
 	gnome-base/librsvg
 	>=media-libs/libpng-1.2
 	>=media-libs/freetype-2
@@ -31,7 +32,10 @@ DEPEND="
 
 src_prepare() {
 	# Sanitize the Makefile and correct a few other issues.
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-0.9.20-gentoo.patch"
+	epatch "${FILESDIR}/${P}-libpng1.5.patch" #378199
+	epatch "${FILESDIR}/${P}-LDFLAGS.patch" #334571
+
 	sed -i \
 		-e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
 		-e "s:/lib/:/$(get_libdir)/:" \
@@ -40,20 +44,14 @@ src_prepare() {
 }
 
 src_compile() {
-	local myopts=""
-
-	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
-
 	# emake may break things
-	make CC="$(tc-getCC)" ${myopts} || die "Compilation failed"
+	make CC="$(tc-getCC)" \
+		$(use nls && echo ENABLE_GETTEXT=1) || die "Compilation failed"
 }
 
 src_install () {
-	local myopts=""
-
-	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
-
-	make PKG_ROOT="${D}" ${myopts} install || die "Installation failed"
+	make PKG_ROOT="${D}" \
+		$(use nls && echo ENABLE_GETTEXT=1) install || die "Installation failed"
 
 	rm -f docs/COPYING.txt docs/INSTALL.txt
 	dodoc docs/*.txt