upd package following debian, still very buggy

author: gilcu3 2024-05-19 11:18:37 +0200
committer: gilcu3 2024-05-19 11:26:59 +0200
commit: a3c691fab9eae8d51b400f4f8525c806e85fa93b (patch)
tree: f91b4b9061efc2ccc2c28ce93a54d6f55d15858d
parent: b0e8bf3872ed48860644a5aaae66b925a7531972 (diff)
download: aur-a3c691fab9eae8d51b400f4f8525c806e85fa93b.tar.gz
9 files changed, 131 insertions, 295 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 630a7cda6ad2..50cd48e89f95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = k2pdfopt
 	pkgdesc = Tool for optimizing PDF/DJVU files for mobile e-readers and smartphones.
-	pkgver = 2.53
+	pkgver = 2.55
 	pkgrel = 1
 	url = http://www.willus.com/k2pdfopt
 	arch = i686
@@ -14,13 +14,39 @@ pkgbase = k2pdfopt
 	optdepends = jasper: JPEG 2000 bitmap support
 	optdepends = gsl: polynomial fit for spline interpolation feature
 	optdepends = leptonica: OCR support
-	source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.53_src.zip
-	source = CMakeLists.txt.patch
-	source = k2pdfoptlib.patch
-	source = willuslib.patch
-	sha256sums = 58c1b0647be5237570c110b0bb77eb78fab384282a2648edb59eac673070959b
-	sha256sums = 6569d3f15c288f1297ebc0f239a5d58bd3040e0521a22981a176d86b376cb6e3
-	sha256sums = 32db8cf1012b3626d397023c7ecd08b711136700bca9f37b18e056f4c367e392
-	sha256sums = c0ae18681871385ab4b10a0c129661cf7318e2d86837c2d092c77fe362cb9512
+	source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.55_src.zip
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0001-CMakeLists.txt-add-missing-install-command.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0002-CMakeLists.txt-no-mupdf.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0003-CMakeLists.txt-do-not-detect-ghostscript-at-compile-.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0004-willuslib-CMakeLists.txt-typo.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0005-willuslib-use-system-leptonica.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0006-k2pdfopt.h-dst_ocr_visibility_flags-workaround.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0007-k2pdfoptlib-k2ocr.c-conditionally-enable-tesseract-r.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0008-willuslib-gslpolyfit.c-use-system-gsl.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0009-CMakeLists.txt-use-system-gocr.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0010-willuslib-use-system-djvu.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0011-willuslib-pdfwrite.c-workaround-buggy-PDF-page-count.patch
+	source = https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches//0012-willuslib-CMakeLists.txt-conditionally-add-source-fi.patch
+	source = jasper_header_path.patch
+	source = disable_tesseract.patch
+	source = fix_jasper_lib.patch
+	source = fix_ocrtess.patch
+	sha256sums = 3e78b4c7dd6227fde12138fd2468dd13c0c45b5251592a4f0aac67fd139ab953
+	sha256sums = 6d1990072a2a2a01fcaaba57f74c04ebc6a9fed39f25747a5115670d73449967
+	sha256sums = 5944aac480e760d2fad22809b359a43c42adf2efcc9ab13750bf3a6c2ded20db
+	sha256sums = b2bc0adf903f27952b8dfe31d452bf7d447950346eb33c6f5f8ea54bad0da078
+	sha256sums = a0be0e8f03346a57ef20d532e782fd57bdf95bbb2296096cbabed8bea547bc6b
+	sha256sums = 0905388d455b928a40e798b5c584382f48f6789c9556fe70ac9dac0885252179
+	sha256sums = 6349e5c69356169afcd57d7477737111e621d4cb95f3030f2cfbe00ba7a3fcae
+	sha256sums = 9eccab9a016c53dba4eeacea045c59ea0bfed8aec715303dc1d49fdcd74120cc
+	sha256sums = 041394dd4da0a9c166e34ca0b9aea7288b10874c89937b0f62ba6c69a1ba0159
+	sha256sums = b98a65ffb2d68582e2c0741f5889fe319f8d41584334d7691c7ef56e98034fed
+	sha256sums = 1b39c0cbddd6997948af302bcbed34e75ef2e6c5946a1b961c3e3a558a22115d
+	sha256sums = dcf8e7aebebdb43aea371b951b46c04cca87f23f9b920d275e5aec419d9ef313
+	sha256sums = e8b44fd98554a568ddd41fc5eed9c4f7b907c3386293e98e49e5654673812c0d
+	sha256sums = 707a56d36c2e2468e0c0543d32bad5b631c248a429f206f24793432cc6a4e05c
+	sha256sums = ad9e3c00339f8a241af1b84a7776fb4beb9dfe15bda139c30972bc030a98cb68
+	sha256sums = d7b9a9881a5ef9533195c03e6ae08fb383bbdc5eca7f413c8ac127ac1800f6f2
+	sha256sums = f0e60da8d3f335ea3a0c6fcf3814325ed3eec136dcd1fd2886e6fb98f8384069
 
 pkgname = k2pdfopt
diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch
deleted file mode 100644
index dc54011d8790..000000000000
--- a/CMakeLists.txt.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- src.orig/k2pdfopt_v2.53/CMakeLists.txt	2020-05-31 15:34:34.000000000 -0700
-+++ src.changes/CMakeLists.txt	2021-12-27 16:31:35.514052382 -0800
-@@ -57,6 +57,7 @@
- include(FindJasper)
- if(JASPER_FOUND)
-   set(HAVE_JASPER_LIB 1)
-+  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})
- endif(JASPER_FOUND)
- 
- # paths from willuslib/wgs.c
-@@ -73,21 +74,27 @@
- 
- # willus.h
- # HAVE_GSL_LIB
--
-+pkg_check_modules(GSL gsl)
-+if(GSL_FOUND)
-+  set(HAVE_GSL_LIB 1)
-+  include_directories(SYSTEM ${GSL_INCLUDEDIR})
-+  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
-+endif(GSL_FOUND)
- 
- # libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
- # MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ...
- 
--pkg_check_modules(MUPDF mupdf)
--if(MUPDF_FOUND)
--  set(HAVE_MUPDF_LIB 1) 
--  # (includes jbig2dec, openjpeg, freetype)
--  include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
--  message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
--  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} 
--    -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
--  )
--endif(MUPDF_FOUND)
-+# DISABLE MUPDF
-+#pkg_check_modules(MUPDF mupdf)
-+#if(MUPDF_FOUND)
-+#  set(HAVE_MUPDF_LIB 1) 
-+#  # (includes jbig2dec, openjpeg, freetype)
-+#  include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
-+#  message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
-+#  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS} 
-+#    -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
-+#  )
-+#endif(MUPDF_FOUND)
- 
- pkg_check_modules(DJVU ddjvuapi)
- if(DJVU_FOUND)
-@@ -105,12 +112,13 @@
-   include_directories(SYSTEM ${LEPT_INCLUDEDIR})
- endif(LEPT_FOUND)
- 
--pkg_check_modules(TESSERACT tesseract)
--if(TESSERACT_FOUND)
--  set(HAVE_TESSERACT_LIB 1)
--  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS})
--  include_directories(SYSTEM ${TESSERACT_INCLUDEDIR})
--endif(TESSERACT_FOUND)
-+# DISABLE TESSERACT
-+#pkg_check_modules(TESSERACT tesseract)
-+#if(TESSERACT_FOUND)
-+#  set(HAVE_TESSERACT_LIB 1)
-+#  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${TESSERACT_LDFLAGS})
-+#  include_directories(SYSTEM ${TESSERACT_INCLUDEDIR})
-+#endif(TESSERACT_FOUND)
- 
- # ---- Describe project
- 
-@@ -129,7 +137,7 @@
- # ms
- add_executable(k2pdfopt k2pdfopt.c)
- target_link_libraries (k2pdfopt k2pdfoptlib willuslib ${K2PDFOPT_LIB} pthread)
--
-+install(TARGETS k2pdfopt RUNTIME)
- 
- message("")
- message("-- Summary --")
diff --git a/PKGBUILD b/PKGBUILD
index b7f7a1db948a..3ceef7a0c58b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
+# Maintainer: gilcu3
 # Contributor: Eric Fung <loseurmarbles[AT]gmail[DOT]com>
 # Contributor: Jose Riha <jose 1711 gmail com>
 # Contributor: Facundo Tuesca <facutuesca at gmail dot com>
 
 pkgname=k2pdfopt
-pkgver=2.53
+pkgver=2.55
 pkgrel=1
 pkgdesc='Tool for optimizing PDF/DJVU files for mobile e-readers and smartphones.'
 arch=('i686' 'x86_64')
@@ -15,20 +16,54 @@ optdepends=('ghostscript: PostScript support'
             'jasper: JPEG 2000 bitmap support'
             'gsl: polynomial fit for spline interpolation feature'
             'leptonica: OCR support')
+debian_2_55v2_patches='https://salsa.debian.org/yangfl-guest/k2pdfopt/-/raw/06d32c78ad4e816f08cf9054aab09773a6f984a4/debian/patches/'
 source=("${url}/src/${pkgname}_v${pkgver}_src.zip"
-        'CMakeLists.txt.patch'
-        'k2pdfoptlib.patch'
-        'willuslib.patch')
-sha256sums=('58c1b0647be5237570c110b0bb77eb78fab384282a2648edb59eac673070959b'
-            '6569d3f15c288f1297ebc0f239a5d58bd3040e0521a22981a176d86b376cb6e3'
-            '32db8cf1012b3626d397023c7ecd08b711136700bca9f37b18e056f4c367e392'
-            'c0ae18681871385ab4b10a0c129661cf7318e2d86837c2d092c77fe362cb9512')
+        "${debian_2_55v2_patches}/0001-CMakeLists.txt-add-missing-install-command.patch"
+        "${debian_2_55v2_patches}/0002-CMakeLists.txt-no-mupdf.patch"
+        "${debian_2_55v2_patches}/0003-CMakeLists.txt-do-not-detect-ghostscript-at-compile-.patch"
+        "${debian_2_55v2_patches}/0004-willuslib-CMakeLists.txt-typo.patch"
+        "${debian_2_55v2_patches}/0005-willuslib-use-system-leptonica.patch"
+        "${debian_2_55v2_patches}/0006-k2pdfopt.h-dst_ocr_visibility_flags-workaround.patch"
+        "${debian_2_55v2_patches}/0007-k2pdfoptlib-k2ocr.c-conditionally-enable-tesseract-r.patch"
+        "${debian_2_55v2_patches}/0008-willuslib-gslpolyfit.c-use-system-gsl.patch"
+        "${debian_2_55v2_patches}/0009-CMakeLists.txt-use-system-gocr.patch"
+        "${debian_2_55v2_patches}/0010-willuslib-use-system-djvu.patch"
+        "${debian_2_55v2_patches}/0011-willuslib-pdfwrite.c-workaround-buggy-PDF-page-count.patch"
+        "${debian_2_55v2_patches}/0012-willuslib-CMakeLists.txt-conditionally-add-source-fi.patch"
+        "jasper_header_path.patch"
+        "disable_tesseract.patch"
+        "fix_jasper_lib.patch"
+        "fix_ocrtess.patch"
+)
+
+sha256sums=('3e78b4c7dd6227fde12138fd2468dd13c0c45b5251592a4f0aac67fd139ab953'
+            '6d1990072a2a2a01fcaaba57f74c04ebc6a9fed39f25747a5115670d73449967'
+            '5944aac480e760d2fad22809b359a43c42adf2efcc9ab13750bf3a6c2ded20db'
+            'b2bc0adf903f27952b8dfe31d452bf7d447950346eb33c6f5f8ea54bad0da078'
+            'a0be0e8f03346a57ef20d532e782fd57bdf95bbb2296096cbabed8bea547bc6b'
+            '0905388d455b928a40e798b5c584382f48f6789c9556fe70ac9dac0885252179'
+            '6349e5c69356169afcd57d7477737111e621d4cb95f3030f2cfbe00ba7a3fcae'
+            '9eccab9a016c53dba4eeacea045c59ea0bfed8aec715303dc1d49fdcd74120cc'
+            '041394dd4da0a9c166e34ca0b9aea7288b10874c89937b0f62ba6c69a1ba0159'
+            'b98a65ffb2d68582e2c0741f5889fe319f8d41584334d7691c7ef56e98034fed'
+            '1b39c0cbddd6997948af302bcbed34e75ef2e6c5946a1b961c3e3a558a22115d'
+            'dcf8e7aebebdb43aea371b951b46c04cca87f23f9b920d275e5aec419d9ef313'
+            'e8b44fd98554a568ddd41fc5eed9c4f7b907c3386293e98e49e5654673812c0d'
+            '707a56d36c2e2468e0c0543d32bad5b631c248a429f206f24793432cc6a4e05c'
+            'ad9e3c00339f8a241af1b84a7776fb4beb9dfe15bda139c30972bc030a98cb68'
+            'd7b9a9881a5ef9533195c03e6ae08fb383bbdc5eca7f413c8ac127ac1800f6f2'
+            'f0e60da8d3f335ea3a0c6fcf3814325ed3eec136dcd1fd2886e6fb98f8384069')
+
 
 prepare() {
     cd "${srcdir}/${pkgname}_v${pkgver}"
-    patch < ../CMakeLists.txt.patch
-    patch -p2 < ../k2pdfoptlib.patch
-    patch -p2 < ../willuslib.patch
+    for p in ../00*.patch; do
+       patch -p1 <  "$p"
+    done
+    patch -p1 < ../jasper_header_path.patch
+    patch -p1 < ../disable_tesseract.patch
+    patch -p1 < ../fix_jasper_lib.patch
+    patch -p1 < ../fix_ocrtess.patch
 }
 
 build() {
diff --git a/disable_tesseract.patch b/disable_tesseract.patch
new file mode 100644
index 000000000000..11e287f8db39
--- /dev/null
+++ b/disable_tesseract.patch
@@ -0,0 +1,12 @@
+diff --git a/config.h.in b/config.h.in
+index 896c651..64f8500 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -13,6 +13,6 @@
+ #cmakedefine HAVE_DJVU_LIB
+ #cmakedefine HAVE_GOCR_LIB
+ #cmakedefine HAVE_LEPTONICA_LIB
+-#cmakedefine HAVE_TESSERACT_LIB
++//#cmakedefine HAVE_TESSERACT_LIB
+ 
+ #endif
diff --git a/fix_jasper_lib.patch b/fix_jasper_lib.patch
new file mode 100644
index 000000000000..2cd574554a9f
--- /dev/null
+++ b/fix_jasper_lib.patch
@@ -0,0 +1,10 @@
+--- a/CMakeLists.txt	2024-05-19 10:05:26.694477650 +0200
++++ b/CMakeLists.txt	2024-05-19 09:25:07.083370696 +0200
+@@ -57,6 +57,7 @@
+ include(FindJasper)
+ if(JASPER_FOUND)
+   set(HAVE_JASPER_LIB 1)
++  set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})
+ endif(JASPER_FOUND)
+ 
+ set(HAVE_GHOSTSCRIPT 1)
diff --git a/fix_ocrtess.patch b/fix_ocrtess.patch
new file mode 100644
index 000000000000..2be7a6a2650c
--- /dev/null
+++ b/fix_ocrtess.patch
@@ -0,0 +1,15 @@
+--- a/willuslib/CMakeLists.txt	2024-05-19 11:18:59.620084018 +0200
++++ b/willuslib/CMakeLists.txt	2024-05-19 11:21:26.688802928 +0200
+@@ -26,9 +26,9 @@
+   set(WILLUSLIB_SRC ${WILLUSLIB_SRC} ocrgocr.c)
+ endif(GOCR_FOUND)
+ 
+-if(TESSERACT_FOUND)
+-  set(WILLUSLIB_SRC ${WILLUSLIB_SRC} ocrtess.c)
+-endif(TESSERACT_FOUND)
++#if(TESSERACT_FOUND)
++#  set(WILLUSLIB_SRC ${WILLUSLIB_SRC} ocrtess.c)
++#endif(TESSERACT_FOUND)
+ 
+ if(DJVU_FOUND)
+   set(WILLUSLIB_SRC ${WILLUSLIB_SRC} bmpdjvu.c)
diff --git a/jasper_header_path.patch b/jasper_header_path.patch
new file mode 100644
index 000000000000..ee5020d0948b
--- /dev/null
+++ b/jasper_header_path.patch
@@ -0,0 +1,13 @@
+diff --git a/willuslib/bmp.c b/willuslib/bmp.c
+index cc79ab3..fb7f6ee 100644
+--- a/willuslib/bmp.c
++++ b/willuslib/bmp.c
+@@ -37,7 +37,7 @@
+ #include <jpeglib.h>
+ #endif
+ #ifdef HAVE_JASPER_LIB
+-#include <jasper.h>
++#include <jasper/jasper.h>
+ #endif
+ 
+ #define BOUND(x,xmin,xmax)  if ((x)<(xmin)) (x)=(xmin); else { if ((x)>(xmax)) (x)=(xmax); }
diff --git a/k2pdfopt.patch b/k2pdfopt.patch
deleted file mode 100644
index 0f7848e81cef..000000000000
--- a/k2pdfopt.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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)
- 
-     {
--    sort(a,(long)n);
-+    willus_sort(a,(long)n);
-     }
- 
- 
-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 @@
- 
- 
- 
--void sort(float *x,int n)
-+void willus_sort(float *x,int n)
- 
-     {
-     int top,n1;
-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>
- 
-+job_t *OCR_JOB;
-+
- /*
- ** bmp8 must be grayscale
- ** (x1,y1) and (x2,y2) from top left of bitmap
-@@ -63,6 +65,7 @@
-     h=y2-y1+1;
-     dh=h+bw*2;
-     job=&_job;
-+    OCR_JOB=job;
-     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.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.
- **
- */
--char *get_line(char *buf,int max,FILE *f)
-+char *willus_get_line(char *buf,int max,FILE *f)
- 
-     {
-     int     i;
-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)
- */
--#ifdef USE_CMAKE
--#include "config.h"
--#else /* USE_CMAKE */
- 
- #ifndef HAVE_Z_LIB
- #define HAVE_Z_LIB
-@@ -281,7 +278,7 @@
- #undef HAVE_GSL_LIB
- #endif
- 
--#endif /* USE_CMAKE */
-+
- /*
- ** Consistency check
- */
-@@ -556,7 +553,7 @@
-                       int *n,FILE *err);
- int    readxyz_ex    (char *filename,double **x,double **y,double **z,
-                       int *n,FILE *err,int ignore_after_semicolon);
--void   sort          (float *x,int n);
-+void willus_sort (float *x,int n);
- void   sortd         (double *x,int n);
- void   sorti         (int *x,int n);
- void   sortxy        (float *x,float *y,int n);
-@@ -625,7 +622,7 @@
- /* string.c */
- void   clean_line    (char *buf);
- void   clean_line_end(char *buf);
--char  *get_line      (char *buf,int max,FILE *f);
-+char *willus_get_line (char *buf,int max,FILE *f);
- char  *get_line_cf   (char *buf,int max,FILE *f);
- int   mem_get_line_cf(char *buf,int maxlen,char *cptr,long *cindex,long csize);
- int    in_string     (char *buffer,char *pattern);
diff --git a/k2pdfoptlib.patch b/k2pdfoptlib.patch
deleted file mode 100644
index b8838e54edb8..000000000000
--- a/k2pdfoptlib.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: bmpregion.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: CMakeLists.txt
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: devprofile.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2bmp.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2file.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2files.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2gui.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2gui_cbox.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2gui_osdep.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2gui_overlay.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2mark.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2master.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2mem.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2menu.c
-diff -ua src.orig/k2pdfopt_v2.53/k2pdfoptlib/k2ocr.c src.changes/k2pdfoptlib/k2ocr.c
---- src.orig/k2pdfopt_v2.53/k2pdfoptlib/k2ocr.c	2020-07-10 13:41:00.000000000 -0700
-+++ src.changes/k2pdfoptlib/k2ocr.c	2021-12-25 03:22:59.757055543 -0800
-@@ -41,16 +41,16 @@
-     int ni;
-     char initstr[256];
-     } OCRTESSINITINFO;
--#endif
- static void k2ocr_show_envvar(char *buf,char *color,char *var);
- static void k2ocr_status_line(char *buf,char *color,char *label,char *string);
- static void k2ocr_tesslang_init(char *lang,int assume_yes);
-+#endif
- static void k2ocr_ocrwords_add_subregion_to_queue(MASTERINFO *masterinfo,OCRWORDS *words,
-                                         BMPREGION *region,K2PDFOPT_SETTINGS *k2settings);
- #endif /* HAVE_OCR_LIB */
- 
- /* Functions to support extracting text from PDF using MuPDF lib */
--#ifdef HAVE_MUPDF_LIB
-+#if (defined(HAVE_MUPDF_LIB) || defined(HAVE_DJVU_LIB))
- static void k2ocr_ocrwords_get_from_ocrlayer(MASTERINFO *masterinfo,OCRWORDS *words,
-                                              BMPREGION *region,K2PDFOPT_SETTINGS *k2settings);
- static int ocrword_map_to_bitmap(OCRWORD *word,MASTERINFO *masterinfo,BMPREGION *region,
-@@ -425,6 +425,7 @@
- void k2ocr_showlog(void)
- 
-     {
-+#ifdef HAVE_TESSERACT_LIB
-     static char *funcname="k2ocr_showlog";
- 
-     if (k2ocr_tess_status<0 && k2ocr_logfile!=NULL && wfile_status(k2ocr_logfile)==1
-@@ -468,6 +469,7 @@
-         k2printf(header,divider,"End","\n");
-         willus_mem_free((double **)&bigbuf,funcname);
-         }
-+#endif
-     }
-             
- 
-@@ -724,9 +726,11 @@
- void k2ocr_multithreaded_ocr(OCRWORDS *words,K2PDFOPT_SETTINGS *k2settings)
- 
-     {
-+#ifdef HAS_TESSERACT_LIB
-     ocr_cpu_time_secs += ocrwords_multithreaded_ocr(words,ocrtess_api,maxthreads,
-                                                     k2settings->dst_ocr,
-                                                     k2settings->ocr_dpi);
-+#endif
-     }
- 
- 
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2parsecmd.c
-diff -ua src.orig/k2pdfopt_v2.53/k2pdfoptlib/k2pdfopt.h src.changes/k2pdfoptlib/k2pdfopt.h
---- src.orig/k2pdfopt_v2.53/k2pdfoptlib/k2pdfopt.h	2020-07-11 12:00:19.000000000 -0700
-+++ src.changes/k2pdfoptlib/k2pdfopt.h	2021-12-25 23:01:30.732238720 -0800
-@@ -107,7 +107,7 @@
- #endif
- */
- 
--#if (defined(HAVE_MUPDF) || defined(HAVE_GOCR_LIB) || defined(HAVE_TESSERACT_LIB) || defined(HAVE_DJVU_LIB))
-+#if (defined(HAVE_MUPDF_LIB) || defined(HAVE_GOCR_LIB) || defined(HAVE_TESSERACT_LIB) || defined(HAVE_DJVU_LIB))
- #if (!defined(HAVE_OCR_LIB))
- #define HAVE_OCR_LIB
- #endif
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2proc.c
-diff -ua src.orig/k2pdfopt_v2.53/k2pdfoptlib/k2publish.c src.changes/k2pdfoptlib/k2publish.c
---- src.orig/k2pdfopt_v2.53/k2pdfoptlib/k2publish.c	2020-07-11 06:45:32.000000000 -0700
-+++ src.changes/k2pdfoptlib/k2publish.c	2021-12-23 04:37:28.275383328 -0800
-@@ -104,7 +104,7 @@
- #else
-     ocrwords=NULL;
-     nocr=0;
--    queue_page=0;
-+    queue_pages_only=0;
- #endif
- #if (WILLUSDEBUGX2==3)
- aprintf(ANSI_GREEN "\n   SRC PAGE %d, nocr=%d, queue=%d, threads=%d\n\n" ANSI_NORMAL,masterinfo->pageinfo.srcpage,nocr,queue_pages_only,k2ocr_max_threads());
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2settings2cmd.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2settings.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2sys.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2usage.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: k2version.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: pagelist.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: pageregions.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: textrows.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: textwords.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: userinput.c
-Only in src.orig/k2pdfopt_v2.53/k2pdfoptlib/: wrapbmp.c
author	gilcu3	2024-05-19 11:18:37 +0200
committer	gilcu3	2024-05-19 11:26:59 +0200
commit	a3c691fab9eae8d51b400f4f8525c806e85fa93b (patch)
tree	f91b4b9061efc2ccc2c28ce93a54d6f55d15858d
parent	b0e8bf3872ed48860644a5aaae66b925a7531972 (diff)
download	aur-a3c691fab9eae8d51b400f4f8525c806e85fa93b.tar.gz