Update to v2.42

1 files changed, 23 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8547592762ea..281ed3ef650e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
 	
 }