[arch-commits] Commit in jbig2dec/trunk (PKGBUILD libpng.patch)

[Gaëtan Bisson]

    Date: Tuesday, September 27, 2016 @ 19:44:17
  Author: bisson
Revision: 277132

upstream update

Modified:
  jbig2dec/trunk/PKGBUILD
Deleted:
  jbig2dec/trunk/libpng.patch

--------------+
 PKGBUILD     |   15 ++++-----------
 libpng.patch |   31 -------------------------------
 2 files changed, 4 insertions(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-27 19:43:51 UTC (rev 277131)
+++ PKGBUILD	2016-09-27 19:44:17 UTC (rev 277132)
@@ -4,23 +4,16 @@
 # Contributor: Stefan Husmann <stefan-husmann at t-online.de>
 
 pkgname=jbig2dec
-pkgver=0.12
-pkgrel=2
+pkgver=0.13
+pkgrel=1
 pkgdesc='Decoder implementation of the JBIG2 image compression format'
 url='http://www.ghostscript.com/jbig2dec.html'
 arch=('x86_64' 'i686')
 license=('GPL3')
 depends=('libpng')
-source=("http://downloads.ghostscript.com/public/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'libpng.patch')
-sha1sums=('b543d1c73267bc029f0fc57f468f8fcac27dd20f'
-          '96ce78085af547d0563af75fd8ac78eebb0402f5')
+source=("http://downloads.ghostscript.com/public/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('d7b07ef308e95dc44a83f2193ca4f445630e6355')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../libpng.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	./autogen.sh --prefix=/usr

Deleted: libpng.patch
===================================================================
--- libpng.patch	2016-09-27 19:43:51 UTC (rev 277131)
+++ libpng.patch	2016-09-27 19:44:17 UTC (rev 277132)
@@ -1,31 +0,0 @@
-diff -aur old/jbig2_image_png.c new/jbig2_image_png.c
---- old/jbig2_image_png.c	2014-10-31 03:30:04.000000000 -1000
-+++ new/jbig2_image_png.c	2015-04-08 12:15:31.535949306 -1000
-@@ -25,8 +25,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <png.h>
--#include <pngstruct.h>
-+#include <libpng16/png.h>
- #define CVT_PTR(ptr) (ptr)
- 
- #include "jbig2.h"
-@@ -40,7 +39,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");
-     }
-@@ -50,7 +49,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);
- }