From 4c4df67d638c8682355081633dff9c16defd8cdf Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Tue, 9 Aug 2011 19:18:58 +0000 Subject: [PATCH] =?utf8?q?Respect=20LDFLAGS,=20bug=20#334571;=20build=20wi?= =?utf8?q?th=20libpng-1.5,=20bug=20#378199=20thank=20Diego=20Elio=20Petten?= =?utf8?q?=C3=B2=20for=20reporting=20both.=20Drop=20old.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.1.10.10/cvs/Linux x86_64 --- media-gfx/tuxpaint/ChangeLog | 10 ++++++- media-gfx/tuxpaint/Manifest | 19 +++----------- .../files/tuxpaint-0.9.21-LDFLAGS.patch | 22 ++++++++++++++++ .../files/tuxpaint-0.9.21-libpng1.5.patch | 19 ++++++++++++++ ...20-r1.ebuild => tuxpaint-0.9.21-r1.ebuild} | 26 +++++++++---------- 5 files changed, 66 insertions(+), 30 deletions(-) create mode 100644 media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch create mode 100644 media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch rename media-gfx/tuxpaint/{tuxpaint-0.9.20-r1.ebuild => tuxpaint-0.9.21-r1.ebuild} (71%) 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 -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 tuxpaint-0.9.21.ebuild: ppc stable wrt #367323 diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest index 01b830ca6ddd..21a4bd82f35b 100644 --- a/media-gfx/tuxpaint/Manifest +++ b/media-gfx/tuxpaint/Manifest @@ -1,19 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX tuxpaint-0.9.20-gentoo.patch 6029 RMD160 0dacd2fc3acf6e32b9720b79bf749f5d391558e2 SHA1 ae80519d61934a7d4102223eff8b72fae0a62421 SHA256 c17748627036785a00cb2a0058653736b5c0754981311e2ba6a15231ee57f527 -DIST tuxpaint-0.9.20.tar.gz 8622291 RMD160 876616232cc8d78f597df59124eaa0293a3db020 SHA1 059593dcaeb0aa0b403322567d7d482d2abf0a6c SHA256 02daec451bf0ad2a6f32b5077e337df3a15df83b00df5943cfb10067896210bc +AUX tuxpaint-0.9.21-LDFLAGS.patch 849 RMD160 f5cee50bac553a48de5e140edb8c226f8a5bb849 SHA1 6aae0d49cbbdaa87ccb62becfceef44a2193fa62 SHA256 9378c4e6864ac87125e3e5014a99f88d99a9f7d5cb319d0f26fad123a8b2d2de +AUX tuxpaint-0.9.21-libpng1.5.patch 834 RMD160 7b7a56b44ddab8e635a1244c938f4e914c6bdf46 SHA1 5595a65ebabc46bebd2d0670589effc8dbdd4e0c SHA256 6d572467fce710c9323ba53bb3309eb7ed1401b4fee2c1f56533e871558a7f20 DIST tuxpaint-0.9.21.tar.gz 9543034 RMD160 0c6892341c2e6c3abad7cf28caefdb2f8dc6d74d SHA1 082a179a3cb44ee17af47421bc92125a890846e4 SHA256 6d4f2b981643b5c937708e5e6cdaf318ae7b5562375327b4b1cb84611e65ede9 -EBUILD tuxpaint-0.9.20-r1.ebuild 1594 RMD160 45e5a1ecc06d83b6a2a845aba82e2236f1c0e32c SHA1 bda4e8ae976f76864160da6e7808275a3ff7c423 SHA256 146cac7a1917ffac95269536f868a2807bf1c8d88a234de04a0f13474c45c9c3 +EBUILD tuxpaint-0.9.21-r1.ebuild 1645 RMD160 7b4276acc047f8c65c90d4b4f7b9656f6089ae98 SHA1 15780dfb0db7da46003b6f5995b674a4a0614a1e SHA256 db494f9c0b36f474667d2a711682139b12a77a20575e07ff8d99c6faf264aa90 EBUILD tuxpaint-0.9.21.ebuild 1545 RMD160 b0c44d7719d3c6c7f13cf20f533f2a7fb291b364 SHA1 eb85fc0224bf90037ae8580bda2ef4db6905664c SHA256 96380797e4b396e0319f54871d083ec363cf1e1b12997f54f2f57dec0e75a2aa -MISC ChangeLog 9552 RMD160 2c0df4ffca9c76899d83ee026e8d480857c89a86 SHA1 06ace6c231181bb925a4d7d5e0d29a82e035644c SHA256 5c4fd29d65509bbd99a500f035a67e338746b6d6d160fa166d339683380f5b4d +MISC ChangeLog 9889 RMD160 850cd9e430b3ea86e6e1e59ff420eae57e71c1d8 SHA1 d05164b373b3fda95c647c694074bf2b88e8b458 SHA256 4cbbc311fc0dc8ee1fa36fd8c7cae51a39b91bc901538ccf840b40e43a1d3226 MISC metadata.xml 612 RMD160 42645014f0c242edb604ecb9be83b570244f0236 SHA1 3b0cd8d916478b7cae49c069e7a7bdd334ede465 SHA256 8fd117ade8a9ab31142a4751dfaa0baed78f7687c19cae907e0e09d2d10e22b3 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iJwEAQECAAYFAk4YeNQACgkQIiMqcbOVdxSaSAP/Ro0EQsqqqeX6xTH5B5pFI/Qe -MCPH15nUag8QWWH4AS0DtjpRAU+R1lm0Rf9Fi3xH1kNjjGbBP2l8XNgEsp4tiqRy -9jX1hDqVigds8UM6BTrz+Dg0xKKhu61KaZWKkksY3OupPEysa4b+6k2qCmap+Kxe -dg3WNIesTa92enCMURM= -=ztDv ------END PGP SIGNATURE----- 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 similarity index 71% rename from media-gfx/tuxpaint/tuxpaint-0.9.20-r1.ebuild rename to 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 -- 2.26.2