tags 628501 + pending tags 636005 + pending thanks Dear maintainer,
I've prepared an NMU for ming (versioned as 1:0.4.3-1.2) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. diff -Nru ming-0.4.3/debian/changelog ming-0.4.3/debian/changelog --- ming-0.4.3/debian/changelog 2011-09-03 20:14:59.000000000 +0200 +++ ming-0.4.3/debian/changelog 2011-09-03 20:15:00.000000000 +0200 @@ -1,3 +1,17 @@ +ming (1:0.4.3-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Apply patch from Niko Tyni <[email protected]> to fix FTBFS with perl 5.14. + (Closes: #628501) + + new patch: 07-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch + * Apply patch from Nobuhiro Iwamatsu <[email protected]> to fix FTBFS + with libpng 1.5. (Closes: #636005) + + new patch: 08_libpng15.patch + * debian/rules: Make build-indep-stamp depend on build-arch-stamp as it uses + programs that are built there. + + -- Ansgar Burchardt <[email protected]> Sat, 03 Sep 2011 20:05:38 +0200 + ming (1:0.4.3-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru ming-0.4.3/debian/patches/07-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch ming-0.4.3/debian/patches/07-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch --- ming-0.4.3/debian/patches/07-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch 1970-01-01 01:00:00.000000000 +0100 +++ ming-0.4.3/debian/patches/07-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch 2011-09-03 20:15:00.000000000 +0200 @@ -0,0 +1,32 @@ +From: Niko Tyni <[email protected]> +Date: Sun, 10 Jul 2011 21:46:09 +0300 +Subject: [PATCH] GvCV() isn't an lvalue since Perl 5.13.10 +Bug-Debian: http://bugs.debian.org/628501 + +GvCV() can't be assigned to anymore with recent perls, so use the new +GvCV_set() macro when available or implement it the old way if it isn't. + +--- ming.orig/perl_ext/Exports.c ++++ ming/perl_ext/Exports.c +@@ -190,7 +190,7 @@ + SvPVX(caller), sub, SvPVX(class), sub); + #endif + gv = gv_fetchpv(form("%s::%s",SvPVX( caller), sub), TRUE, SVt_PVCV); +- GvCV(gv) = perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE); ++ GvCV_set(gv, perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE)); + GvIMPORTED_CV_on(gv); + GvMULTI_on(gv); + } +--- ming.orig/perl_ext/perl_swf.h ++++ ming/perl_ext/perl_swf.h +@@ -58,6 +58,10 @@ + #define aTHXo_ + #endif + ++#ifndef GvCV_set ++# define GvCV_set(G, C) (GvCV(G) = (C)) ++#endif ++ + #ifndef S_DEBUG + #define swf_debug 0 /* Should we get this from, say, $SWF::debug? */ + #define S_DEBUG(level,code) if (swf_debug >= level) { code; } diff -Nru ming-0.4.3/debian/patches/08_libpng15.patch ming-0.4.3/debian/patches/08_libpng15.patch --- ming-0.4.3/debian/patches/08_libpng15.patch 1970-01-01 01:00:00.000000000 +0100 +++ ming-0.4.3/debian/patches/08_libpng15.patch 2011-09-03 20:15:00.000000000 +0200 @@ -0,0 +1,48 @@ +From: Nobuhiro Iwamatsu <[email protected]> +Date: Sat, 30 Jul 2011 16:45:17 +0900 +Subject: FTBFS with libpng 1.5 +Bug-Debian: http://bugs.debian.org/636005 + +--- ming.orig/util/png2dbl.c ++++ ming/util/png2dbl.c +@@ -90,8 +90,11 @@ + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + error("Couldn't create end_info\n"); + } +- ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf((png_ptr)))) ++#else + if(setjmp(png_ptr->jmpbuf)) ++#endif + { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + fclose(fp); +--- ming.orig/src/blocks/pngdbl.c ++++ ming/src/blocks/pngdbl.c +@@ -61,7 +61,12 @@ + } + + static int pngReadFunc(png_structp png, unsigned char *buf, int len) +-{ SWFInput input = (SWFInput) png->io_ptr; ++{ ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ SWFInput input = png_get_io_ptr(png); ++#else ++ SWFInput input = (SWFInput) png->io_ptr; ++#endif + return SWFInput_read(input, buf, len); + } + +@@ -127,7 +132,11 @@ + return 0; + } + ++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if (setjmp(png_jmpbuf(png_ptr))) ++#else + if(setjmp(png_ptr->jmpbuf)) ++#endif + { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + return 0; diff -Nru ming-0.4.3/debian/patches/series ming-0.4.3/debian/patches/series --- ming-0.4.3/debian/patches/series 2011-09-03 20:14:59.000000000 +0200 +++ ming-0.4.3/debian/patches/series 2011-09-03 20:15:00.000000000 +0200 @@ -4,3 +4,5 @@ 04_PIC 05_shared_perl 06_ld_no_add_needed.diff +07-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch +08_libpng15.patch diff -Nru ming-0.4.3/debian/rules ming-0.4.3/debian/rules --- ming-0.4.3/debian/rules 2011-09-03 20:14:59.000000000 +0200 +++ ming-0.4.3/debian/rules 2011-09-03 20:15:00.000000000 +0200 @@ -74,7 +74,7 @@ touch build-arch-stamp build-indep: build-indep-stamp -build-indep-stamp: configure-stamp +build-indep-stamp: configure-stamp build-arch-stamp $(SHELL) debian/mkfontset ttf-dejavu #Move file name to be the same as in 0.3.0 for compatability -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
