summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVianney le Clément de Saint-Marcq2011-07-28 17:56:49 +0200
committerVianney le Clément de Saint-Marcq2015-06-11 20:37:51 +0200
commit17a734ba081e2641250e1169c613d179b9fe370d (patch)
treedd2bc614fccde6f1fde0e738a7c5c0f5d458d0ed
parent82e751ceaa45610ddd0dbf68809d4f929351e6d1 (diff)
downloadaur-17a734ba081e2641250e1169c613d179b9fe370d.tar.gz
Leptonica patch has been merged upstream
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--leptonica-1.68.patch12
3 files changed, 2 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2877754ae644..bec1e0921128 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = jbig2enc-git
pkgdesc = A JBIG2 image encoder
- pkgver = 20110412
+ pkgver = 20110728
pkgrel = 1
url = https://github.com/agl/jbig2enc
arch = i686
@@ -12,8 +12,6 @@ pkgbase = jbig2enc-git
depends = libpng
depends = libjpeg
depends = libtiff
- source = leptonica-1.68.patch
- md5sums = 1cf0013d040b9682a977960023c2680b
pkgname = jbig2enc-git
diff --git a/PKGBUILD b/PKGBUILD
index 6d302c8946da..d3b1df8bbe6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Vianney le Clément <vleclement AT gmail·com>
pkgname=jbig2enc-git
-pkgver=20110412
+pkgver=20110728
pkgrel=1
pkgdesc="A JBIG2 image encoder"
arch=('i686' 'x86_64')
@@ -8,8 +8,6 @@ url="https://github.com/agl/jbig2enc"
license=('Apache')
depends=('gcc-libs' 'leptonica>=1.68' 'libpng' 'libjpeg' 'libtiff')
makedepends=('git')
-source=('leptonica-1.68.patch')
-md5sums=('1cf0013d040b9682a977960023c2680b')
_gitroot="https://github.com/agl/jbig2enc.git"
_gitname="jbig2enc"
@@ -34,7 +32,6 @@ build() {
msg "Patching sources..."
sed -i 's@-I${LEPTONICA}/src@-I/usr/include/leptonica@' Makefile
sed -i 's@${LEPTONICA}/src/.libs/liblept.a@-llept@' Makefile
- patch -p1 < ../leptonica-1.68.patch
msg "Starting make..."
make
diff --git a/leptonica-1.68.patch b/leptonica-1.68.patch
deleted file mode 100644
index 8ac04b2a7d94..000000000000
--- a/leptonica-1.68.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN jbig2enc/jbig2.cc jbig2enc.new/jbig2.cc
---- jbig2enc/jbig2.cc 2011-04-12 15:13:55.112243731 +0200
-+++ jbig2enc.new/jbig2.cc 2011-04-12 15:17:26.123135262 +0200
-@@ -349,7 +349,7 @@
- return 1;
- }
- l_int32 filetype;
-- findFileFormat(fp, &filetype);
-+ findFileFormatStream(fp, &filetype);
- if (filetype==IFF_TIFF && tiffGetCount(fp, &numsubimages)) {
- return 1;
- }