From f4033ff7321346ae226e08977be4085738ddd5d9 Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Wed, 25 Jan 2012 19:06:28 +0000 Subject: [PATCH] dev-games/renpy-modules: Version bump svn path=/sunrise/; revision=12701 --- dev-games/renpy-modules/ChangeLog | 7 ++++- dev-games/renpy-modules/Manifest | 7 +++-- .../files/renpy-modules-libpng15.patch | 26 ------------------- ...3.7.ebuild => renpy-modules-6.13.8.ebuild} | 8 +----- 4 files changed, 10 insertions(+), 38 deletions(-) delete mode 100755 dev-games/renpy-modules/files/renpy-modules-libpng15.patch rename dev-games/renpy-modules/{renpy-modules-6.13.7.ebuild => renpy-modules-6.13.8.ebuild} (79%) diff --git a/dev-games/renpy-modules/ChangeLog b/dev-games/renpy-modules/ChangeLog index 91fdc5bef..aa01caab3 100644 --- a/dev-games/renpy-modules/ChangeLog +++ b/dev-games/renpy-modules/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for dev-games/renpy-modules -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Jan 2012; Nao Nakashima (nao) + -renpy-modules-6.13.7.ebuild, -files/renpy-modules-libpng15.patch, + +renpy-modules-6.13.8.ebuild: + Version bump + 21 Oct 2011; James Broadhead (hangfire) -renpy-modules-6.12.2.ebuild, +renpy-modules-6.13.7.ebuild, +files/renpy-modules-libpng15.patch: diff --git a/dev-games/renpy-modules/Manifest b/dev-games/renpy-modules/Manifest index 958a4c90d..6fe7e028e 100644 --- a/dev-games/renpy-modules/Manifest +++ b/dev-games/renpy-modules/Manifest @@ -1,5 +1,4 @@ -AUX renpy-modules-libpng15.patch 789 RMD160 e4e68f4db8b3323b9931f81c9460679ee4437ac4 SHA1 c83725ac626143d716e87c5b159a7945535da7c7 SHA256 59a6dde9e0dd7448ec8701837d7ac506ce23660c0b0c494121ea5d9c1ccd88ac -DIST renpy-6.13.7-source.tar.bz2 9668093 RMD160 d02a43027a4a1bd9fbea0354daefea04e3ced93c SHA1 ed9a7b4717086ed3eb34b1a0c7e2d7ff542e8daa SHA256 984febaaaad0ac6b6c1516c2901f3f80831276df4202e2c5cfb53a609fc1415b -EBUILD renpy-modules-6.13.7.ebuild 909 RMD160 a4c21108c7a7b84cc79e18ce5d067e54860020b4 SHA1 1f298f46cba1b310017309c82eb528bc2bff6355 SHA256 67eab1212552858db89cc76c60ae0c3843ab880bd89d3d43469e668727df3cfd -MISC ChangeLog 2422 RMD160 bcfa585e7248c41fdbd00cfae2eb4b4d3f891e05 SHA1 cbe3cb717a8aae1adc4cb0720b705f3c882b7ba8 SHA256 427b2eb8f45a79194c7083c6e525057b1d19b07d35c354fde72c0c59ab3ecbf3 +DIST renpy-6.13.8-source.tar.bz2 9677686 RMD160 850c95445c155abe7c173a9ae6c35f7595aa7662 SHA1 359385ff0dc15f0260d8d9ff7cfcda516dfce91a SHA256 1d82e80b4017108d5acfaf2bd3cc40e1086884125997acca66e1298299e43179 +EBUILD renpy-modules-6.13.8.ebuild 766 RMD160 bc3c5a0bede441104948d4becf52c4e43af9791f SHA1 ae7ecbe29c00d22396d1af2e2150d06bc3ab785b SHA256 bd1e4934bc61b8e3b1e58a9dc09be1a09120ef67fb3e609562f89150c874993b +MISC ChangeLog 2600 RMD160 733586b93c01eea424264c895bba334d8988eace SHA1 e9dfc4440b6df8bf3b65c0f05b478384246e9b22 SHA256 d22012ffe0ee52566aa405a8619a7b93e760baf53a1faa6a07fb9ad5018b8a6c MISC metadata.xml 911 RMD160 4f10041efe2d1949de7bf357ea175edb6d773001 SHA1 dff1a0b91183a3fad3298c6f83bd24fe43470a12 SHA256 dfe648b430045aa7187f05b44626288bb181769c129f13f4a0e0fa94936201a5 diff --git a/dev-games/renpy-modules/files/renpy-modules-libpng15.patch b/dev-games/renpy-modules/files/renpy-modules-libpng15.patch deleted file mode 100755 index 2447ccbc3..000000000 --- a/dev-games/renpy-modules/files/renpy-modules-libpng15.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- renpy-6.13.7-unpatched/module/IMG_savepng.c 2009-04-02 02:44:53.000000000 +0100 -+++ renpy-6.13.7/module/IMG_savepng.c 2011-10-21 15:28:20.991437000 +0100 -@@ -28,8 +28,14 @@ - #include - #include - #include -+#include - #include "IMG_savepng.h" - -+// Backwards compat. with libpng-1.2 - libpng-1.4 -+#ifndef png_voidp -+ #define png_voidp voidp -+#endif -+ - int IMG_SavePNG(const char *file, SDL_Surface *surf,int compression){ - SDL_RWops *fp; - int ret; -@@ -84,7 +90,7 @@ - goto savedone; - } - /* setup custom writer functions */ -- png_set_write_fn(png_ptr,(voidp)src,png_write_data,NULL); -+ png_set_write_fn(png_ptr,(png_voidp)src,png_write_data,NULL); - - if (setjmp(png_jmpbuf(png_ptr))){ - SDL_SetError("Unknown error writing PNG"); diff --git a/dev-games/renpy-modules/renpy-modules-6.13.7.ebuild b/dev-games/renpy-modules/renpy-modules-6.13.8.ebuild similarity index 79% rename from dev-games/renpy-modules/renpy-modules-6.13.7.ebuild rename to dev-games/renpy-modules/renpy-modules-6.13.8.ebuild index 9af877925..8f1efd3ed 100644 --- a/dev-games/renpy-modules/renpy-modules-6.13.7.ebuild +++ b/dev-games/renpy-modules/renpy-modules-6.13.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -34,12 +34,6 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/${MY_P}/module" -src_prepare() { - # Fix building with libpng-1.5 - # https://bugs.launchpad.net/renpy/+bug/879474 - epatch "${FILESDIR}/${PN}-libpng15.patch" -} - src_compile() { export RENPY_DEPS_INSTALL="${ROOT}usr" distutils_src_compile -- 2.43.2