diff -u exult-1.2/debian/changelog exult-1.2/debian/changelog --- exult-1.2/debian/changelog +++ exult-1.2/debian/changelog @@ -1,3 +1,9 @@ +exult (1.2-15.1+libpng151) unstable; urgency=low + + * Build with libpng15. + + -- Nobuhiro Iwamatsu Thu, 15 Mar 2012 15:08:59 +0900 + exult (1.2-15.1) unstable; urgency=low * Non-maintainer upload to fix l10n and one RC bug diff -u exult-1.2/debian/control exult-1.2/debian/control --- exult-1.2/debian/control +++ exult-1.2/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 5), quilt (>= 0.40), flex, bison, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.1), libsdl-mixer1.2-dev, libx11-dev, libgimp2.0-dev (>= 2.2.8-11), libglade2-dev, zlib1g-dev, - libpng12-dev, autoconf (>= 2.58), automake1.9, libtool, libfreetype6-dev + libpng-dev (>= 1.5), autoconf (>= 2.58), automake1.9, libtool, libfreetype6-dev Standards-Version: 3.8.4 Homepage: http://exult.sourceforge.net/ Vcs-Git: git://git.debian.org/git/users/jorda-guest/pkg/exult.git only in patch2: unchanged: --- exult-1.2.orig/shapes/pngio.cc +++ exult-1.2/shapes/pngio.cc @@ -79,7 +79,11 @@ } // Allocate info. structure. png_infop info = png_create_info_struct(png); +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 + if (setjmp(png_jmpbuf((png)))) // Handle errors. +#else if (setjmp(png->jmpbuf)) // Handle errors. +#endif { png_destroy_read_struct(&png, &info, 0); fclose(fp); @@ -89,7 +93,11 @@ // Indicate we already read something. png_set_sig_bytes(png, sizeof(sigbuf)); png_read_info(png, info); // Read in image info. +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 + png_uint_32 w, h; +#else unsigned long w, h; +#endif int depth, color, interlace; png_get_IHDR(png, info, &w, &h, &depth, &color, &interlace, 0, 0); @@ -208,7 +216,11 @@ } // Allocate info. structure. png_infop info = png_create_info_struct(png); +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 + if (setjmp(png_jmpbuf((png)))) // Handle errors. +#else if (setjmp(png->jmpbuf)) // Handle errors. +#endif { png_destroy_write_struct(&png, &info); fclose(fp); @@ -306,7 +318,11 @@ } // Allocate info. structure. png_infop info = png_create_info_struct(png); +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 + if (setjmp(png_jmpbuf((png)))) // Handle errors. +#else if (setjmp(png->jmpbuf)) // Handle errors. +#endif { png_destroy_read_struct(&png, &info, 0); fclose(fp); @@ -316,7 +332,11 @@ // Indicate we already read something. png_set_sig_bytes(png, sizeof(sigbuf)); png_read_info(png, info); // Read in image info. +#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 + png_uint_32 w, h; +#else unsigned long w, h; +#endif int depth, color, interlace; png_get_IHDR(png, info, &w, &h, &depth, &color, &interlace, 0, 0);