Update to 2.33

3 files changed, 42 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a40867b7f5ba..30fce5a47cb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,29 @@
 pkgbase = k2pdfopt
 	pkgdesc = A tool that optimizes PDF files for viewing on mobile readers
-	pkgver = 2.32
-	pkgrel = 3
+	pkgver = 2.33
+	pkgrel = 1
 	url = http://www.willus.com/k2pdfopt/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	depends = mupdf>=1.6
+	depends = mupdf>=1.7_a
 	depends = djvulibre>=3.5.25.3
 	depends = netpbm>=10.61.02
 	depends = leptonica>=1.69
-	source = k2pdfopt_v2.32_src.zip::https://drive.google.com/uc?export=download&id=0B0iwSdCKGAZYQmZjRGtwX3NaMmc
-	source = http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz
+	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
 	source = http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz
-	source = https://openjpeg.googlecode.com/files/openjpeg-2.0.0.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 = facfb12519a0a0b5db63acdac37844d7
-	md5sums = 8d69db41ae9e0b6807b76bb6ed70dc2f
+	md5sums = c2a67f7e8386808c9d5717dffa8860c0
+	md5sums = 319fda2cc5301bb3ec2e1d82c3329986
 	md5sums = 26adc8154f0e815053816825dde246e6
 	md5sums = 4e527bc4bdd97c2be15fdd818857507f
-	md5sums = d9be274bddc0f47f268e484bdcaaa6c5
-	md5sums = 07a0f2d3776733ccd0149845816ad4f5
+	md5sums = f6419fcc233df84f9a81eb36633c6db6
+	md5sums = 82d4856430c32fd9a0194401662afd71
 	md5sums = 0e85e48aed62771dfc090787c079359d
 
 pkgname = k2pdfopt
diff --git a/PKGBUILD b/PKGBUILD
index 37f5f63509be..2ec85f61bde9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,38 @@
 # Maintainer: Facundo Tuesca <facutuesca at gmail dot com>
 
 pkgname=k2pdfopt
-pkgver=2.32
-pkgrel=3
+pkgver=2.33
+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.6'
+depends=('mupdf>=1.7_a'
 	'djvulibre>=3.5.25.3'
 	'netpbm>=10.61.02'
 	'leptonica>=1.69')
-source=("${pkgname}_v${pkgver}_src.zip::https://drive.google.com/uc?export=download&id=0B0iwSdCKGAZYQmZjRGtwX3NaMmc"
-    "http://www.mupdf.com/downloads/archive/mupdf-1.6-source.tar.gz"
+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-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz"
-    "https://openjpeg.googlecode.com/files/openjpeg-2.0.0.tar.gz"
+    "http://downloads.sourceforge.net/project/openjpeg.mirror/2.1.0/openjpeg-2.1.0.tar.gz"
 	"k2pdfopt.patch"
 	"tesseract.patch")
-md5sums=('facfb12519a0a0b5db63acdac37844d7'
-         '8d69db41ae9e0b6807b76bb6ed70dc2f'
+md5sums=('c2a67f7e8386808c9d5717dffa8860c0'
+         '319fda2cc5301bb3ec2e1d82c3329986'
          '26adc8154f0e815053816825dde246e6'
          '4e527bc4bdd97c2be15fdd818857507f'
-         'd9be274bddc0f47f268e484bdcaaa6c5'
-         '07a0f2d3776733ccd0149845816ad4f5'
+         'f6419fcc233df84f9a81eb36633c6db6'
+         '82d4856430c32fd9a0194401662afd71'
          '0e85e48aed62771dfc090787c079359d')
 
 prepare() {
 	cd "${srcdir}/${pkgname}_v${pkgver}"
 	rm -f "include_mod/gocr.h"
-	cp mupdf_mod/font.c mupdf_mod/string.c "${srcdir}/mupdf-1.6-source/source/fitz/"
-	cp mupdf_mod/pdf-* "${srcdir}/mupdf-1.6-source/source/pdf/"
-	rm -rf ${srcdir}/mupdf-1.6-source/thirdparty/{curl,freetype,jpeg,zlib}
+	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/"
@@ -45,7 +45,7 @@ prepare() {
 }
 
 build() {
-	cd "${srcdir}/mupdf-1.6-source/"
+	cd "${srcdir}/mupdf-1.7a-source/"
 	make prefix="${srcdir}/patched_libraries" install
         install -Dm644 build/debug/libmujs.a "${srcdir}/patched_libraries/lib/"
 	cd "${srcdir}/tesseract-ocr/"
@@ -58,7 +58,7 @@ build() {
 	cp include/config.h "${srcdir}/patched_libraries/include"
 	make libs
 	cp src/libPgm2asc.a "${srcdir}/patched_libraries/lib"
-    cd "${srcdir}/openjpeg-2.0.0/"
+    cd "${srcdir}/openjpeg-2.1.0/"
     cmake -D BUILD_SHARED_LIBS:bool=off .
     make openjp2
     cp bin/libopenjp2.a "${srcdir}/patched_libraries/lib"
diff --git a/k2pdfopt.patch b/k2pdfopt.patch
index 803299c0f17c..4f72522c854a 100644
--- a/k2pdfopt.patch
+++ b/k2pdfopt.patch
@@ -1,6 +1,6 @@
-diff -aur k2_old/k2pdfopt_v2.32/willuslib/array.c k2_new/k2pdfopt_v2.32/willuslib/array.c
---- k2_old/k2pdfopt_v2.32/willuslib/array.c	2014-12-01 13:24:25.000000000 -0300
-+++ k2_new/k2pdfopt_v2.32/willuslib/array.c	2015-03-07 09:18:58.602126050 -0300
+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
 @@ -1072,7 +1072,7 @@
  void arrayf_sort(float *a,int n)
  
@@ -10,9 +10,9 @@ diff -aur k2_old/k2pdfopt_v2.32/willuslib/array.c k2_new/k2pdfopt_v2.32/willusli
      }
  
  
-diff -aur k2_old/k2pdfopt_v2.32/willuslib/math.c k2_new/k2pdfopt_v2.32/willuslib/math.c
---- k2_old/k2pdfopt_v2.32/willuslib/math.c	2013-08-15 21:33:50.000000000 -0300
-+++ k2_new/k2pdfopt_v2.32/willuslib/math.c	2015-03-07 09:18:58.611126050 -0300
+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
 @@ -532,7 +532,7 @@
  
  
@@ -22,9 +22,9 @@ diff -aur k2_old/k2pdfopt_v2.32/willuslib/math.c k2_new/k2pdfopt_v2.32/willuslib
  
      {
      int top,n1;
-diff -aur k2_old/k2pdfopt_v2.32/willuslib/ocrjocr.c k2_new/k2pdfopt_v2.32/willuslib/ocrjocr.c
---- k2_old/k2pdfopt_v2.32/willuslib/ocrjocr.c	2012-11-12 13:09:42.000000000 -0300
-+++ k2_new/k2pdfopt_v2.32/willuslib/ocrjocr.c	2015-03-07 09:18:58.629126048 -0300
+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
 @@ -29,6 +29,8 @@
  #ifdef HAVE_GOCR_LIB
  #include <gocr.h>
@@ -42,9 +42,9 @@ diff -aur k2_old/k2pdfopt_v2.32/willuslib/ocrjocr.c k2_new/k2pdfopt_v2.32/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.32/willuslib/string.c k2_new/k2pdfopt_v2.32/willuslib/string.c
---- k2_old/k2pdfopt_v2.32/willuslib/string.c	2014-12-05 11:52:04.000000000 -0300
-+++ k2_new/k2pdfopt_v2.32/willuslib/string.c	2015-03-07 09:18:58.620126049 -0300
+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
 @@ -81,7 +81,7 @@
  ** Returns NULL if EOF, otherwise returns pointer to the string.
  **
@@ -54,9 +54,9 @@ diff -aur k2_old/k2pdfopt_v2.32/willuslib/string.c k2_new/k2pdfopt_v2.32/willusl
  
      {
      int     i;
-diff -aur k2_old/k2pdfopt_v2.32/willuslib/willus.h k2_new/k2pdfopt_v2.32/willuslib/willus.h
---- k2_old/k2pdfopt_v2.32/willuslib/willus.h	2015-03-06 09:38:28.000000000 -0300
-+++ k2_new/k2pdfopt_v2.32/willuslib/willus.h	2015-03-07 09:18:58.594126051 -0300
+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
 @@ -227,9 +227,6 @@
  ** CMAKE handles the defines, not this source
  ** (Mod from Dirk Thierbach, 31-Dec-2013)
@@ -76,7 +76,7 @@ diff -aur k2_old/k2pdfopt_v2.32/willuslib/willus.h k2_new/k2pdfopt_v2.32/willusl
  /*
  ** Consistency check
  */
-@@ -551,7 +548,7 @@
+@@ -553,7 +550,7 @@
                        int *n,FILE *err);
  int    readxyz_ex    (char *filename,double **x,double **y,double **z,
                        int *n,FILE *err,int ignore_after_semicolon);
@@ -85,7 +85,7 @@ diff -aur k2_old/k2pdfopt_v2.32/willuslib/willus.h k2_new/k2pdfopt_v2.32/willusl
  void   sortd         (double *x,int n);
  void   sorti         (int *x,int n);
  void   sortxy        (float *x,float *y,int n);
-@@ -620,7 +617,7 @@
+@@ -622,7 +619,7 @@
  /* string.c */
  void   clean_line    (char *buf);
  void   clean_line_end(char *buf);