diff --git a/srcpkgs/jbig2dec/patches/jbig2dec-0.11-libpng15.patch b/srcpkgs/jbig2dec/patches/jbig2dec-0.11-libpng15.patch deleted file mode 100644 index c18ccb7af60..00000000000 --- a/srcpkgs/jbig2dec/patches/jbig2dec-0.11-libpng15.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- configure.ac -+++ configure.ac -@@ -45,7 +45,7 @@ - fi - dnl libpng requires pow() which may be in libm - AC_SEARCH_LIBS([pow], [m]) -- AC_CHECK_LIB([png], [png_check_sig], [ -+ AC_CHECK_LIB([png], [png_sig_cmp], [ - AC_CHECK_LIB([z], [deflate], [ - AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)]) - LIBS="-lpng -lz $LIBS" ---- jbig2_image_png.c -+++ jbig2_image_png.c -@@ -33,7 +33,7 @@ - { - png_size_t check; - -- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr); -+ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr)); - if (check != length) { - png_error(png_ptr, "Write Error"); - } -@@ -43,7 +43,7 @@ - jbig2_png_flush(png_structp png_ptr) - { - png_FILE_p io_ptr; -- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr)); -+ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr); - if (io_ptr != NULL) - fflush(io_ptr); - } diff --git a/srcpkgs/jbig2dec/template b/srcpkgs/jbig2dec/template index 14230ee468a..9d80632e7c9 100644 --- a/srcpkgs/jbig2dec/template +++ b/srcpkgs/jbig2dec/template @@ -1,33 +1,28 @@ # Template file for 'jbig2dec' pkgname=jbig2dec -version=0.11 -revision=2 +version=0.13 +revision=1 build_style=gnu-configure -hostmakedepends="automake libtool pkg-config" makedepends="libpng-devel" short_desc="Decoder implementation of the JBIG2 image compression format" maintainer="Juan RP " -license="GPL-3" -homepage="http://jbig2dec.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=7e2d8330b36f2765da22043d174827bee0f30db8d78c330904f363275c7dd0b9 - -pre_configure() { - autoreconf -fi -} +license="AGPL-3" +homepage="http://www.ghostscript.com/jbig2dec.html" +distfiles="http://downloads.ghostscript.com/public/jbig2dec/jbig2dec-${version}.tar.gz" +checksum=5aaca0070992cc2e971e3bb2338ee749495613dcecab4c868fc547b4148f5311 jbig2dec-devel_package() { short_desc+=" - development files" depends="libjbig2dec>=${version}_${revision}" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" + vmove usr/lib/*.a + vmove usr/lib/*.so } } libjbig2dec_package() { short_desc+=" - runtime library" pkg_install() { - vmove "usr/lib/*.so.*" + vmove usr/lib/*.so.* } }