Update to v2.34a

4 files changed, 61 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 37e454b544c5..acca462ddd8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,34 @@
+# Generated by mksrcinfo v8
+# Mon Mar 21 02:02:45 UTC 2016
 pkgbase = k2pdfopt
 	pkgdesc = A tool that optimizes PDF files for viewing on mobile readers
-	pkgver = 2.33
-	pkgrel = 2
+	pkgver = 2.34a
+	pkgrel = 1
 	url = http://www.willus.com/k2pdfopt/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	depends = mupdf>=1.7
+	depends = mupdf>=1.8
 	depends = djvulibre>=3.5.25.3
 	depends = netpbm>=10.61.02
-	depends = leptonica>=1.69
-	source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.33_src.zip
-	source = http://www.mupdf.com/downloads/archive/mupdf-1.7a-source.tar.gz
-	source = http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar.gz
+	depends = leptonica>=1.72
+	source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.34a_src.zip
+	source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.34_src.zip
+	source = http://www.mupdf.com/downloads/archive/mupdf-1.8-source.tar.gz
+	source = https://github.com/tesseract-ocr/tesseract/archive/3.04.01.tar.gz
 	source = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz
 	source = http://downloads.sourceforge.net/project/openjpeg.mirror/2.1.0/openjpeg-2.1.0.tar.gz
 	source = k2pdfopt.patch
 	source = tesseract.patch
-	md5sums = c2a67f7e8386808c9d5717dffa8860c0
-	md5sums = 319fda2cc5301bb3ec2e1d82c3329986
-	md5sums = 26adc8154f0e815053816825dde246e6
+	md5sums = 907484805a16d4961be58f06f49bc0c7
+	md5sums = bdca1b23bb81d23e515faf5260c44599
+	md5sums = 3205256d78d8524d67dd2a47c7a345fa
+	md5sums = 645a21effcf2825a3473849d72a7fd90
 	md5sums = 4e527bc4bdd97c2be15fdd818857507f
 	md5sums = f6419fcc233df84f9a81eb36633c6db6
-	md5sums = 82d4856430c32fd9a0194401662afd71
-	md5sums = 0e85e48aed62771dfc090787c079359d
+	md5sums = 75dcbbac103eafe5374e14120ff591aa
+	md5sums = 3442e31f2f6302cf17dcc3a4a8cef40a
 
 pkgname = k2pdfopt
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c2f5fc41dd5..04f6f8129235 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,46 @@
 # Maintainer: Facundo Tuesca <facutuesca at gmail dot com>
 
 pkgname=k2pdfopt
-pkgver=2.33
-pkgrel=2
+pkgver=2.34a
+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.7'
+depends=('mupdf>=1.8'
 	'djvulibre>=3.5.25.3'
 	'netpbm>=10.61.02'
-	'leptonica>=1.69')
+	'leptonica>=1.72')
 source=("http://www.willus.com/k2pdfopt/src/${pkgname}_v${pkgver}_src.zip"
-    "http://www.mupdf.com/downloads/archive/mupdf-1.7a-source.tar.gz"
-	"http://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02.tar.gz"
+    "http://www.willus.com/k2pdfopt/src/${pkgname}_v2.34_src.zip"
+    "http://www.mupdf.com/downloads/archive/mupdf-1.8-source.tar.gz"
+	"https://github.com/tesseract-ocr/tesseract/archive/3.04.01.tar.gz"
 	"http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"
     "http://downloads.sourceforge.net/project/openjpeg.mirror/2.1.0/openjpeg-2.1.0.tar.gz"
 	"k2pdfopt.patch"
 	"tesseract.patch")
-md5sums=('c2a67f7e8386808c9d5717dffa8860c0'
-         '319fda2cc5301bb3ec2e1d82c3329986'
-         '26adc8154f0e815053816825dde246e6'
+md5sums=('907484805a16d4961be58f06f49bc0c7'
+         'bdca1b23bb81d23e515faf5260c44599'
+         '3205256d78d8524d67dd2a47c7a345fa'
+         '645a21effcf2825a3473849d72a7fd90'
          '4e527bc4bdd97c2be15fdd818857507f'
          'f6419fcc233df84f9a81eb36633c6db6'
-         '82d4856430c32fd9a0194401662afd71'
-         '0e85e48aed62771dfc090787c079359d')
+         '75dcbbac103eafe5374e14120ff591aa'
+         '3442e31f2f6302cf17dcc3a4a8cef40a')
 
 prepare() {
+    cp -r ${srcdir}/${pkgname}_v2.34/* "${srcdir}/${pkgname}_v${pkgver}"
 	cd "${srcdir}/${pkgname}_v${pkgver}"
 	rm -f "include_mod/gocr.h"
-	cp mupdf_mod/font.c mupdf_mod/string.c mupdf_mod/filter-dct.c mupdf_mod/load-* mupdf_mod/time.c "${srcdir}/mupdf-1.7a-source/source/fitz/"
-	cp mupdf_mod/pdf-* "${srcdir}/mupdf-1.7a-source/source/pdf/"
-	rm -rf ${srcdir}/mupdf-1.7a-source/thirdparty/{curl,freetype,jpeg,zlib,openjpeg}
-	cp tesseract_mod/dawg.cpp "${srcdir}/tesseract-ocr/dict/"
-	cp tesseract_mod/tessdatamanager.cpp "${srcdir}/tesseract-ocr/ccutil/"
-	cp tesseract_mod/tessedit.cpp "${srcdir}/tesseract-ocr/ccmain/"
-	cp tesseract_mod/tesscapi.cpp "${srcdir}/tesseract-ocr/api"
-	cp include_mod/tesseract.h include_mod/leptonica.h "${srcdir}/tesseract-ocr/api/"
+	cp mupdf_mod/font.c mupdf_mod/string.c mupdf_mod/filter-dct.c mupdf_mod/load-* "${srcdir}/mupdf-1.8-source/source/fitz/"
+	cp mupdf_mod/pdf-* "${srcdir}/mupdf-1.8-source/source/pdf/"
+	rm -rf ${srcdir}/mupdf-1.8-source/thirdparty/{curl,freetype,jpeg,zlib,openjpeg}
+	cp tesseract_mod/dawg.cpp "${srcdir}/tesseract-3.04.01/dict/"
+	cp tesseract_mod/tessdatamanager.cpp "${srcdir}/tesseract-3.04.01/ccutil/"
+	cp tesseract_mod/tessedit.cpp "${srcdir}/tesseract-3.04.01/ccmain/"
+	cp tesseract_mod/tesscapi.cpp "${srcdir}/tesseract-3.04.01/api"
+	cp include_mod/tesseract.h include_mod/leptonica.h "${srcdir}/tesseract-3.04.01/api/"
 	cd "${srcdir}"
 	patch -p0 -i "${srcdir}/tesseract.patch"
 	patch -p1 -i "${srcdir}/k2pdfopt.patch"
@@ -45,10 +48,10 @@ prepare() {
 }
 
 build() {
-	cd "${srcdir}/mupdf-1.7a-source/"
+	cd "${srcdir}/mupdf-1.8-source/"
 	make prefix="${srcdir}/patched_libraries" install
         install -Dm644 build/debug/libmujs.a "${srcdir}/patched_libraries/lib/"
-	cd "${srcdir}/tesseract-ocr/"
+	cd "${srcdir}/tesseract-3.04.01/"
 	./autogen.sh
 	./configure --prefix="${srcdir}/patched_libraries" --disable-shared
 	make install
diff --git a/k2pdfopt.patch b/k2pdfopt.patch
index 4f72522c854a..c56d7d3aa121 100644
--- a/k2pdfopt.patch
+++ b/k2pdfopt.patch
@@ -1,6 +1,6 @@
-diff -aur k2_old/k2pdfopt_v2.33/willuslib/array.c k2_new/k2pdfopt_v2.33/willuslib/array.c
---- k2_old/k2pdfopt_v2.33/willuslib/array.c	2014-12-01 13:24:25.000000000 -0300
-+++ k2_new/k2pdfopt_v2.33/willuslib/array.c	2015-10-13 16:15:48.231007819 -0300
+diff -aur k2_old/k2pdfopt_v2.34a/willuslib/array.c k2_new/k2pdfopt_v2.34a/willuslib/array.c
+--- k2_old/k2pdfopt_v2.34a/willuslib/array.c	2016-03-20 22:55:26.000000000 -0300
++++ k2_new/k2pdfopt_v2.34a/willuslib/array.c	2016-03-20 22:56:07.839690928 -0300
 @@ -1072,7 +1072,7 @@
  void arrayf_sort(float *a,int n)
  
@@ -10,9 +10,9 @@ diff -aur k2_old/k2pdfopt_v2.33/willuslib/array.c k2_new/k2pdfopt_v2.33/willusli
      }
  
  
-diff -aur k2_old/k2pdfopt_v2.33/willuslib/math.c k2_new/k2pdfopt_v2.33/willuslib/math.c
---- k2_old/k2pdfopt_v2.33/willuslib/math.c	2013-08-15 21:33:50.000000000 -0300
-+++ k2_new/k2pdfopt_v2.33/willuslib/math.c	2015-10-13 16:15:48.237007819 -0300
+diff -aur k2_old/k2pdfopt_v2.34a/willuslib/math.c k2_new/k2pdfopt_v2.34a/willuslib/math.c
+--- k2_old/k2pdfopt_v2.34a/willuslib/math.c	2016-03-20 22:55:26.000000000 -0300
++++ k2_new/k2pdfopt_v2.34a/willuslib/math.c	2016-03-20 22:56:07.848690927 -0300
 @@ -532,7 +532,7 @@
  
  
@@ -22,9 +22,9 @@ diff -aur k2_old/k2pdfopt_v2.33/willuslib/math.c k2_new/k2pdfopt_v2.33/willuslib
  
      {
      int top,n1;
-diff -aur k2_old/k2pdfopt_v2.33/willuslib/ocrjocr.c k2_new/k2pdfopt_v2.33/willuslib/ocrjocr.c
---- k2_old/k2pdfopt_v2.33/willuslib/ocrjocr.c	2012-11-12 13:09:42.000000000 -0300
-+++ k2_new/k2pdfopt_v2.33/willuslib/ocrjocr.c	2015-10-13 16:15:48.247007818 -0300
+diff -aur k2_old/k2pdfopt_v2.34a/willuslib/ocrjocr.c k2_new/k2pdfopt_v2.34a/willuslib/ocrjocr.c
+--- k2_old/k2pdfopt_v2.34a/willuslib/ocrjocr.c	2016-03-20 22:55:26.000000000 -0300
++++ k2_new/k2pdfopt_v2.34a/willuslib/ocrjocr.c	2016-03-20 22:56:07.861690926 -0300
 @@ -29,6 +29,8 @@
  #ifdef HAVE_GOCR_LIB
  #include <gocr.h>
@@ -42,9 +42,9 @@ diff -aur k2_old/k2pdfopt_v2.33/willuslib/ocrjocr.c k2_new/k2pdfopt_v2.33/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.33/willuslib/string.c k2_new/k2pdfopt_v2.33/willuslib/string.c
---- k2_old/k2pdfopt_v2.33/willuslib/string.c	2014-12-05 11:52:04.000000000 -0300
-+++ k2_new/k2pdfopt_v2.33/willuslib/string.c	2015-10-13 16:15:48.242007819 -0300
+diff -aur k2_old/k2pdfopt_v2.34a/willuslib/string.c k2_new/k2pdfopt_v2.34a/willuslib/string.c
+--- k2_old/k2pdfopt_v2.34a/willuslib/string.c	2016-03-20 22:55:26.000000000 -0300
++++ k2_new/k2pdfopt_v2.34a/willuslib/string.c	2016-03-20 22:56:07.854690927 -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.33/willuslib/string.c k2_new/k2pdfopt_v2.33/willusl
  
      {
      int     i;
-diff -aur k2_old/k2pdfopt_v2.33/willuslib/willus.h k2_new/k2pdfopt_v2.33/willuslib/willus.h
---- k2_old/k2pdfopt_v2.33/willuslib/willus.h	2015-09-26 23:26:35.000000000 -0300
-+++ k2_new/k2pdfopt_v2.33/willuslib/willus.h	2015-10-13 16:15:48.226007820 -0300
+diff -aur k2_old/k2pdfopt_v2.34a/willuslib/willus.h k2_new/k2pdfopt_v2.34a/willuslib/willus.h
+--- k2_old/k2pdfopt_v2.34a/willuslib/willus.h	2016-03-20 22:55:26.000000000 -0300
++++ k2_new/k2pdfopt_v2.34a/willuslib/willus.h	2016-03-20 22:56:07.834690928 -0300
 @@ -227,9 +227,6 @@
  ** CMAKE handles the defines, not this source
  ** (Mod from Dirk Thierbach, 31-Dec-2013)
diff --git a/tesseract.patch b/tesseract.patch
index 5cb6e0fe3176..c3772ebb013e 100644
--- a/tesseract.patch
+++ b/tesseract.patch
@@ -1,12 +1,12 @@
-diff -aur tesseract-ocr/api/Makefile.am tesseract-ocr.new/api/Makefile.am
---- tesseract-ocr/api/Makefile.am	2012-10-09 14:18:39.000000000 -0300
-+++ tesseract-ocr.new/api/Makefile.am	2014-03-20 18:43:13.926030341 -0300
-@@ -36,7 +36,7 @@
+diff -aur tesseract-3.04.01/api/Makefile.am tesseract-3.04.01.new/api/Makefile.am
+--- tesseract-3.04.01/api/Makefile.am	2016-02-16 18:27:01.000000000 -0300
++++ tesseract-3.04.01.new/api/Makefile.am	2016-03-20 22:04:24.928955673 -0300
+@@ -42,7 +42,7 @@
  if VISIBILITY
  libtesseract_api_la_CPPFLAGS += -DTESS_EXPORTS
  endif
--libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp
-+libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp tesscapi.cpp
+-libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp
++libtesseract_api_la_SOURCES = baseapi.cpp capi.cpp renderer.cpp pdfrenderer.cpp tesscapi.cpp
  
  lib_LTLIBRARIES += libtesseract.la
  libtesseract_la_LDFLAGS =