Fix update to 2.34a

2 files changed, 29 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 518df91e0ec6..7cfb317397d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Mar 21 12:06:19 UTC 2016
+# Tue Mar 22 12:56:17 UTC 2016
 pkgbase = k2pdfopt
 	pkgdesc = A tool that optimizes PDF files for viewing on mobile readers
 	pkgver = 2.34a
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.willus.com/k2pdfopt/
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index f5cd973f3d8e..a35ec7b79195 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,13 @@
 # Maintainer: Facundo Tuesca <facutuesca at gmail dot com>
 
+_mupdf_version=1.8
+_tesseract_version=3.04.01
+_gocr_version=0.49
+_openjpeg_version=2.1.0
+
 pkgname=k2pdfopt
 pkgver=2.34a
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool that optimizes PDF files for viewing on mobile readers"
 arch=('i686' 'x86_64')
 url="http://www.willus.com/k2pdfopt/"
@@ -14,10 +19,10 @@ depends=('mupdf>=1.8'
 	'leptonica>=1.72')
 source=("http://www.willus.com/k2pdfopt/src/${pkgname}_v${pkgver}_src.zip"
     "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"
+    "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"
 	"k2pdfopt.patch"
 	"tesseract.patch")
 md5sums=('4c074b9588d714cb7bfc7b58f22d8d0a'
@@ -30,17 +35,21 @@ md5sums=('4c074b9588d714cb7bfc7b58f22d8d0a'
          '3442e31f2f6302cf17dcc3a4a8cef40a')
 
 prepare() {
-    cp -r ${srcdir}/${pkgname}_v2.34/* "${srcdir}/${pkgname}_v${pkgver}"
+#needed for update 2.34a
+    cp -r ${srcdir}/${pkgname}_v${pkgver}/* "${srcdir}/${pkgname}_v2.34/"
+    rm -r "${srcdir}/${pkgname}_v${pkgver}"
+    mv "${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-* "${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/"
+	cp mupdf_mod/font.c mupdf_mod/string.c mupdf_mod/filter-dct.c mupdf_mod/load-* "${srcdir}/mupdf-${_mupdf_version}-source/source/fitz/"
+	cp mupdf_mod/pdf-* "${srcdir}/mupdf-${_mupdf_version}-source/source/pdf/"
+	rm -rf ${srcdir}/mupdf-${_mupdf_version}-source/thirdparty/{curl,freetype,jpeg,zlib,openjpeg}
+	cp tesseract_mod/dawg.cpp "${srcdir}/tesseract-${_tesseract_version}/dict/"
+	cp tesseract_mod/tessdatamanager.cpp "${srcdir}/tesseract-${_tesseract_version}/ccutil/"
+	cp tesseract_mod/tessedit.cpp "${srcdir}/tesseract-${_tesseract_version}/ccmain/"
+	cp tesseract_mod/tesscapi.cpp "${srcdir}/tesseract-${_tesseract_version}/api"
+	cp include_mod/tesseract.h include_mod/leptonica.h "${srcdir}/tesseract-${_tesseract_version}/api/"
 	cd "${srcdir}"
 	patch -p0 -i "${srcdir}/tesseract.patch"
 	patch -p1 -i "${srcdir}/k2pdfopt.patch"
@@ -48,20 +57,20 @@ prepare() {
 }
 
 build() {
-	cd "${srcdir}/mupdf-1.8-source/"
+	cd "${srcdir}/mupdf-${_mupdf_version}-source/"
 	make prefix="${srcdir}/patched_libraries" install
         install -Dm644 build/debug/libmujs.a "${srcdir}/patched_libraries/lib/"
-	cd "${srcdir}/tesseract-3.04.01/"
+	cd "${srcdir}/tesseract-${_tesseract_version}/"
 	./autogen.sh
 	./configure --prefix="${srcdir}/patched_libraries" --disable-shared
 	make install
-	cd "${srcdir}/gocr-0.49/"
+	cd "${srcdir}/gocr-${_gocr_version}/"
 	./configure 
 	cp src/{gocr.h,pnm.h,unicode.h,list.h} "${srcdir}/patched_libraries/include"
 	cp include/config.h "${srcdir}/patched_libraries/include"
 	make libs
 	cp src/libPgm2asc.a "${srcdir}/patched_libraries/lib"
-    cd "${srcdir}/openjpeg-2.1.0/"
+    cd "${srcdir}/openjpeg-${_openjpeg_version}/"
     cmake -D BUILD_SHARED_LIBS:bool=off .
     make openjp2
     cp bin/libopenjp2.a "${srcdir}/patched_libraries/lib"