[arch-commits] Commit in jbig2dec/repos (8 files)
Gaëtan Bisson
bisson at archlinux.org
Tue Sep 27 18:35:16 UTC 2016
Date: Tuesday, September 27, 2016 @ 18:35:16
Author: bisson
Revision: 277093
archrelease: copy trunk to extra-x86_64, extra-i686
Added:
jbig2dec/repos/extra-i686/PKGBUILD
(from rev 277092, jbig2dec/trunk/PKGBUILD)
jbig2dec/repos/extra-i686/libpng.patch
(from rev 277092, jbig2dec/trunk/libpng.patch)
jbig2dec/repos/extra-x86_64/PKGBUILD
(from rev 277092, jbig2dec/trunk/PKGBUILD)
jbig2dec/repos/extra-x86_64/libpng.patch
(from rev 277092, jbig2dec/trunk/libpng.patch)
Deleted:
jbig2dec/repos/extra-i686/PKGBUILD
jbig2dec/repos/extra-i686/libpng.patch
jbig2dec/repos/extra-x86_64/PKGBUILD
jbig2dec/repos/extra-x86_64/libpng.patch
---------------------------+
/PKGBUILD | 66 ++++++++++++++++++++++++++++++++++++++++++++
/libpng.patch | 62 +++++++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 33 ----------------------
extra-i686/libpng.patch | 31 --------------------
extra-x86_64/PKGBUILD | 33 ----------------------
extra-x86_64/libpng.patch | 31 --------------------
6 files changed, 128 insertions(+), 128 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-09-27 18:34:41 UTC (rev 277092)
+++ extra-i686/PKGBUILD 2016-09-27 18:35:16 UTC (rev 277093)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Bartłomiej Piotrowski
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-
-pkgname=jbig2dec
-pkgver=0.12
-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')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../libpng.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./autogen.sh --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: jbig2dec/repos/extra-i686/PKGBUILD (from rev 277092, jbig2dec/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-09-27 18:35:16 UTC (rev 277093)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Bartłomiej Piotrowski
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+
+pkgname=jbig2dec
+pkgver=0.12
+pkgrel=2
+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')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../libpng.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-i686/libpng.patch
===================================================================
--- extra-i686/libpng.patch 2016-09-27 18:34:41 UTC (rev 277092)
+++ extra-i686/libpng.patch 2016-09-27 18:35:16 UTC (rev 277093)
@@ -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);
- }
Copied: jbig2dec/repos/extra-i686/libpng.patch (from rev 277092, jbig2dec/trunk/libpng.patch)
===================================================================
--- extra-i686/libpng.patch (rev 0)
+++ extra-i686/libpng.patch 2016-09-27 18:35:16 UTC (rev 277093)
@@ -0,0 +1,31 @@
+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);
+ }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-09-27 18:34:41 UTC (rev 277092)
+++ extra-x86_64/PKGBUILD 2016-09-27 18:35:16 UTC (rev 277093)
@@ -1,33 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Bartłomiej Piotrowski
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-
-pkgname=jbig2dec
-pkgver=0.12
-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')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../libpng.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./autogen.sh --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: jbig2dec/repos/extra-x86_64/PKGBUILD (from rev 277092, jbig2dec/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-09-27 18:35:16 UTC (rev 277093)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Bartłomiej Piotrowski
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+
+pkgname=jbig2dec
+pkgver=0.12
+pkgrel=2
+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')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../libpng.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./autogen.sh --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: extra-x86_64/libpng.patch
===================================================================
--- extra-x86_64/libpng.patch 2016-09-27 18:34:41 UTC (rev 277092)
+++ extra-x86_64/libpng.patch 2016-09-27 18:35:16 UTC (rev 277093)
@@ -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);
- }
Copied: jbig2dec/repos/extra-x86_64/libpng.patch (from rev 277092, jbig2dec/trunk/libpng.patch)
===================================================================
--- extra-x86_64/libpng.patch (rev 0)
+++ extra-x86_64/libpng.patch 2016-09-27 18:35:16 UTC (rev 277093)
@@ -0,0 +1,31 @@
+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);
+ }
More information about the arch-commits
mailing list