diff options
author | Facundo Tuesca | 2018-04-11 22:56:23 -0300 |
---|---|---|
committer | Facundo Tuesca | 2018-04-11 22:56:23 -0300 |
commit | 049e44833bd038d5bcbb0c460633c650cff0716a (patch) | |
tree | f1991810a23ea902725eb9a8bf431a285c475e93 | |
parent | 26cad88d0a28cd64840ff9862f8eba3137aef257 (diff) | |
download | aur-049e44833bd038d5bcbb0c460633c650cff0716a.tar.gz |
Update to v2.42
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 44 | ||||
-rw-r--r-- | k2pdfopt.patch | 30 | ||||
-rw-r--r-- | mupdf.patch | 12 |
4 files changed, 47 insertions, 59 deletions
@@ -1,34 +1,32 @@ pkgbase = k2pdfopt pkgdesc = A tool that optimizes PDF files for viewing on mobile readers - pkgver = 2.41 - pkgrel = 2 + pkgver = 2.42 + pkgrel = 1 url = http://www.willus.com/k2pdfopt/ arch = i686 arch = x86_64 license = GPL3 makedepends = cmake - depends = mupdf>=1.8 + depends = mupdf>=1.10 depends = djvulibre>=3.5.25.3 depends = netpbm>=10.61.02 - depends = leptonica>=1.72 - source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.41_src.zip + depends = leptonica>=1.74.1 + source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.42_src.zip source = http://www.mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz source = https://github.com/tesseract-ocr/tesseract/archive/3.05.00.tar.gz source = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.50.tar.gz source = http://downloads.sourceforge.net/project/openjpeg.mirror/2.1.0/openjpeg-2.1.0.tar.gz + source = leptonica-1.74.1.tar.gz::https://github.com/DanBloomberg/leptonica/archive/1.74.1.tar.gz source = k2pdfopt.patch source = tesseract.patch - source = mupdf.patch - source = libraries_mod.zip - md5sums = 549644b44b560b26ae1e634fcb2bbe59 + md5sums = e3a62a25d9ab310f8b7ab218df8dd8df md5sums = f80fbba2524d1d52f6ed09237d382411 md5sums = 478ba26e8e7ea8f6f466d4dfc2332d34 md5sums = 553ea40c2b3a1a0b03a30675d0e0aba1 md5sums = f6419fcc233df84f9a81eb36633c6db6 - md5sums = b9fa8483bbb76f2a58e1145c252eef9a + md5sums = b3de9ae35976fd4fc3f6dae5a4368bca + md5sums = 1c34ef8378dc52f29d9d97714c899e90 md5sums = 3db9d9cd3b7745af036c968dfe0ba376 - md5sums = eb18b03abd7376a3de75824c31bd7f1a - md5sums = db04c31970a3f35492253f0f0e339a2f pkgname = k2pdfopt @@ -4,51 +4,45 @@ _mupdf_version=1.10a _tesseract_version=3.05.00 _gocr_version=0.50 _openjpeg_version=2.1.0 +_leptonica_version=1.74.1 pkgname=k2pdfopt -pkgver=2.41 -pkgrel=2 +pkgver=2.42 +pkgrel=1 pkgdesc="A tool that optimizes PDF files for viewing on mobile readers" arch=('i686' 'x86_64') url="http://www.willus.com/k2pdfopt/" license=('GPL3') makedepends=('cmake') -depends=('mupdf>=1.8' +depends=('mupdf>=1.10' 'djvulibre>=3.5.25.3' 'netpbm>=10.61.02' - 'leptonica>=1.72') + 'leptonica>=1.74.1') source=("http://www.willus.com/k2pdfopt/src/${pkgname}_v${pkgver}_src.zip" "http://www.mupdf.com/downloads/archive/mupdf-${_mupdf_version}-source.tar.gz" "https://github.com/tesseract-ocr/tesseract/archive/${_tesseract_version}.tar.gz" "http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-${_gocr_version}.tar.gz" "http://downloads.sourceforge.net/project/openjpeg.mirror/${_openjpeg_version}/openjpeg-${_openjpeg_version}.tar.gz" + "leptonica-${_leptonica_version}.tar.gz::https://github.com/DanBloomberg/leptonica/archive/${_leptonica_version}.tar.gz" "k2pdfopt.patch" - "tesseract.patch" - "mupdf.patch" - "libraries_mod.zip") -md5sums=('549644b44b560b26ae1e634fcb2bbe59' + "tesseract.patch") +md5sums=('e3a62a25d9ab310f8b7ab218df8dd8df' 'f80fbba2524d1d52f6ed09237d382411' '478ba26e8e7ea8f6f466d4dfc2332d34' '553ea40c2b3a1a0b03a30675d0e0aba1' 'f6419fcc233df84f9a81eb36633c6db6' - 'b9fa8483bbb76f2a58e1145c252eef9a' - '3db9d9cd3b7745af036c968dfe0ba376' - 'eb18b03abd7376a3de75824c31bd7f1a' - 'db04c31970a3f35492253f0f0e339a2f') + 'b3de9ae35976fd4fc3f6dae5a4368bca' + '1c34ef8378dc52f29d9d97714c899e90' + '3db9d9cd3b7745af036c968dfe0ba376') prepare() { -#Needed to replace mupdfmod files with last version - rm -rf "${srcdir}/${pkgname}_v${pkgver}/mupdf_mod" - cp -r mupdf110a_mod/ "${srcdir}/${pkgname}_v${pkgver}/mupdf_mod" -#Needed to add tesscapi.cpp missing from v2.41 source - cp -r tesseract_mod/tesscapi.cpp "${srcdir}/${pkgname}_v${pkgver}/tesseract_mod/" -# cd "${srcdir}/${pkgname}_v${pkgver}" rm -f "include_mod/gocr.h" cp mupdf_mod/font.c mupdf_mod/font-win32.c mupdf_mod/string.c mupdf_mod/stext-device.c "${srcdir}/mupdf-${_mupdf_version}-source/source/fitz/" cp mupdf_mod/pdf-* "${srcdir}/mupdf-${_mupdf_version}-source/source/pdf/" cp "${srcdir}/mupdf-${_mupdf_version}-source/source/fitz/font-imp.h" "${srcdir}/mupdf-${_mupdf_version}-source/source/pdf/" cp "${srcdir}/mupdf-${_mupdf_version}-source/source/fitz/colorspace-imp.h" "${srcdir}/mupdf-${_mupdf_version}-source/source/pdf/" + cp "${srcdir}/mupdf-${_mupdf_version}-source/source/fitz/colorspace-imp.h" "${srcdir}/mupdf-${_mupdf_version}-source/source/pdf/" rm -rf ${srcdir}/mupdf-${_mupdf_version}-source/thirdparty/{curl,freetype,harfbuzz,jpeg,zlib,openjpeg} # this does not build with openssl 1.1.0, so disable checks sed -i 's/pkg-config --exists \(libcrypto\|openssl\)/false/' "${srcdir}/mupdf-${_mupdf_version}-source/Makerules" @@ -59,9 +53,10 @@ prepare() { cp tesseract_mod/openclwrapper.h "${srcdir}/tesseract-${_tesseract_version}/opencl/" cp tesseract_mod/tess_lang_mod_edge.h "${srcdir}/tesseract-${_tesseract_version}/cube/" cp include_mod/tesseract.h include_mod/leptonica.h tesseract_mod/tesscapi.cpp "${srcdir}/tesseract-${_tesseract_version}/api/" + cp tesseract_mod/config_auto.h "${srcdir}/tesseract-${_tesseract_version}/" + cp leptonica_mod/allheaders.h leptonica_mod/dewarp2.c "${srcdir}/leptonica-${_leptonica_version}/src/" cd "${srcdir}" patch -p0 -i "${srcdir}/tesseract.patch" - patch -p0 -i "${srcdir}/mupdf.patch" patch -p1 -i "${srcdir}/k2pdfopt.patch" mkdir -p "patched_libraries/lib" } @@ -71,11 +66,18 @@ build() { cmake -D BUILD_SHARED_LIBS:bool=off . make openjp2 cp bin/libopenjp2.a "${srcdir}/patched_libraries/lib/" + mkdir -p "${srcdir}/patched_libraries/include/openjpeg-2.1/" + cp src/lib/openjp2/{opj_stdint.h,opj_config.h,openjpeg.h} "${srcdir}/patched_libraries/include/openjpeg-2.1/" cd "${srcdir}/mupdf-${_mupdf_version}-source/" #Use the same openjpeg2 libraries as mupdf + make SYS_OPENJPEG_LIBS=-L/${srcdir}/patched_libraries/lib\ -lopenjp2 prefix="${srcdir}/patched_libraries" generate make SYS_OPENJPEG_LIBS=-L/${srcdir}/patched_libraries/lib\ -lopenjp2 prefix="${srcdir}/patched_libraries" install -# install -Dm644 build/debug/libmujs.a "${srcdir}/patched_libraries/lib/" + + cd "${srcdir}/leptonica-${_leptonica_version}/" + ./autobuild + ./configure --without-libopenjpeg --prefix="${srcdir}/patched_libraries" --disable-shared + make install cd "${srcdir}/tesseract-${_tesseract_version}/" ./autogen.sh @@ -102,7 +104,7 @@ build() { -I ${srcdir}/patched_libraries/include -L ${srcdir}/patched_libraries/lib/ \ -L willuslib/ -L k2pdfoptlib/ -lk2pdfopt -lwillus -ldjvulibre -lz -lmupdf \ -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread \ - -lPgm2asc -llept -ltesseract -lcrypto -lharfbuzz + -lPgm2asc -llept -ltesseract -lcrypto -lharfbuzz -ltiff -lgif -lwebp } diff --git a/k2pdfopt.patch b/k2pdfopt.patch index 2c7c700f6a0c..0f7848e81cef 100644 --- a/k2pdfopt.patch +++ b/k2pdfopt.patch @@ -1,6 +1,6 @@ -diff -aur k2_old/k2pdfopt_v2.41/willuslib/array.c k2_new/k2pdfopt_v2.41/willuslib/array.c ---- k2_old/k2pdfopt_v2.41/willuslib/array.c 2014-12-01 13:24:26.000000000 -0300 -+++ k2_new/k2pdfopt_v2.41/willuslib/array.c 2017-05-08 23:15:48.847205604 -0300 +diff -aur k2_old/k2pdfopt_v2.42/willuslib/array.c k2_new/k2pdfopt_v2.42/willuslib/array.c +--- k2_old/k2pdfopt_v2.42/willuslib/array.c 2014-12-01 13:24:26.000000000 -0300 ++++ k2_new/k2pdfopt_v2.42/willuslib/array.c 2018-04-11 20:27:23.402395756 -0300 @@ -1072,7 +1072,7 @@ void arrayf_sort(float *a,int n) @@ -10,9 +10,9 @@ diff -aur k2_old/k2pdfopt_v2.41/willuslib/array.c k2_new/k2pdfopt_v2.41/willusli } -diff -aur k2_old/k2pdfopt_v2.41/willuslib/math.c k2_new/k2pdfopt_v2.41/willuslib/math.c ---- k2_old/k2pdfopt_v2.41/willuslib/math.c 2013-08-15 20:33:50.000000000 -0300 -+++ k2_new/k2pdfopt_v2.41/willuslib/math.c 2017-05-08 23:15:48.870538937 -0300 +diff -aur k2_old/k2pdfopt_v2.42/willuslib/math.c k2_new/k2pdfopt_v2.42/willuslib/math.c +--- k2_old/k2pdfopt_v2.42/willuslib/math.c 2013-08-15 20:33:50.000000000 -0300 ++++ k2_new/k2pdfopt_v2.42/willuslib/math.c 2018-04-11 20:27:23.405395790 -0300 @@ -532,7 +532,7 @@ @@ -22,9 +22,9 @@ diff -aur k2_old/k2pdfopt_v2.41/willuslib/math.c k2_new/k2pdfopt_v2.41/willuslib { int top,n1; -diff -aur k2_old/k2pdfopt_v2.41/willuslib/ocrgocr.c k2_new/k2pdfopt_v2.41/willuslib/ocrgocr.c ---- k2_old/k2pdfopt_v2.41/willuslib/ocrgocr.c 2016-10-29 15:12:25.000000000 -0300 -+++ k2_new/k2pdfopt_v2.41/willuslib/ocrgocr.c 2017-05-08 23:15:48.913872272 -0300 +diff -aur k2_old/k2pdfopt_v2.42/willuslib/ocrgocr.c k2_new/k2pdfopt_v2.42/willuslib/ocrgocr.c +--- k2_old/k2pdfopt_v2.42/willuslib/ocrgocr.c 2016-10-29 15:12:25.000000000 -0300 ++++ k2_new/k2pdfopt_v2.42/willuslib/ocrgocr.c 2018-04-11 20:27:23.411395858 -0300 @@ -29,6 +29,8 @@ #ifdef HAVE_GOCR_LIB #include <gocr.h> @@ -42,9 +42,9 @@ diff -aur k2_old/k2pdfopt_v2.41/willuslib/ocrgocr.c k2_new/k2pdfopt_v2.41/willus job_init(job); job_init_image(job); // willus_mem_alloc_warn((void **)&job->src.p.p,w*h,funcname,10); -diff -aur k2_old/k2pdfopt_v2.41/willuslib/string.c k2_new/k2pdfopt_v2.41/willuslib/string.c ---- k2_old/k2pdfopt_v2.41/willuslib/string.c 2016-03-19 13:19:33.000000000 -0300 -+++ k2_new/k2pdfopt_v2.41/willuslib/string.c 2017-05-08 23:15:48.890538938 -0300 +diff -aur k2_old/k2pdfopt_v2.42/willuslib/string.c k2_new/k2pdfopt_v2.42/willuslib/string.c +--- k2_old/k2pdfopt_v2.42/willuslib/string.c 2016-03-19 13:19:33.000000000 -0300 ++++ k2_new/k2pdfopt_v2.42/willuslib/string.c 2018-04-11 20:27:23.408395824 -0300 @@ -81,7 +81,7 @@ ** Returns NULL if EOF, otherwise returns pointer to the string. ** @@ -54,9 +54,9 @@ diff -aur k2_old/k2pdfopt_v2.41/willuslib/string.c k2_new/k2pdfopt_v2.41/willusl { int i; -diff -aur k2_old/k2pdfopt_v2.41/willuslib/willus.h k2_new/k2pdfopt_v2.41/willuslib/willus.h ---- k2_old/k2pdfopt_v2.41/willuslib/willus.h 2017-02-25 05:26:34.000000000 -0300 -+++ k2_new/k2pdfopt_v2.41/willuslib/willus.h 2017-05-08 23:15:48.830538936 -0300 +diff -aur k2_old/k2pdfopt_v2.42/willuslib/willus.h k2_new/k2pdfopt_v2.42/willuslib/willus.h +--- k2_old/k2pdfopt_v2.42/willuslib/willus.h 2017-05-20 19:12:16.000000000 -0300 ++++ k2_new/k2pdfopt_v2.42/willuslib/willus.h 2018-04-11 20:27:23.400395734 -0300 @@ -227,9 +227,6 @@ ** CMAKE handles the defines, not this source ** (Mod from Dirk Thierbach, 31-Dec-2013) diff --git a/mupdf.patch b/mupdf.patch deleted file mode 100644 index b8ca04982483..000000000000 --- a/mupdf.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur mupdf-1.10a-source/Makefile mupdf-1.10a-source.new/Makefile ---- mupdf-1.10a-source/Makefile 2016-11-28 10:34:04.000000000 -0300 -+++ mupdf-1.10a-source.new/Makefile 2017-05-08 21:29:22.913691598 -0300 -@@ -78,7 +78,7 @@ - ALL_DIR += $(OUT)/platform/gl - ALL_DIR += $(OUT)/fonts - --FITZ_HDR := include/mupdf/fitz.h $(wildcard include/mupdf/fitz/*.h) -+FITZ_HDR := include/mupdf/fitz.h include/mupdf/pdf.h $(wildcard include/mupdf/fitz/*.h) - PDF_HDR := include/mupdf/pdf.h $(wildcard include/mupdf/pdf/*.h) - SVG_HDR := include/mupdf/svg.h - HTML_HDR := include/mupdf/html.h |