diff options
author | Eric Fung | 2021-12-27 21:30:17 -0800 |
---|---|---|
committer | Eric Fung | 2021-12-27 21:30:17 -0800 |
commit | b0e8bf3872ed48860644a5aaae66b925a7531972 (patch) | |
tree | 2f0ebbc375b5a4edac3f29b1e030bc879d75d27b | |
parent | c24f149ff4ca2cb26e1f6eba4efacfdf080ea7e2 (diff) | |
download | aur-b0e8bf3872ed48860644a5aaae66b925a7531972.tar.gz |
Updated to version 2.53; added new patches and dependency changes
-rw-r--r-- | .SRCINFO | 35 | ||||
-rw-r--r-- | CMakeLists.txt.patch | 78 | ||||
-rw-r--r-- | PKGBUILD | 63 | ||||
-rw-r--r-- | jasper.patch | 24 | ||||
-rw-r--r-- | k2pdfoptlib.patch | 101 | ||||
-rw-r--r-- | libraries_mod.zip | bin | 72309 -> 0 bytes | |||
-rw-r--r-- | willuslib.patch | 127 |
7 files changed, 356 insertions, 72 deletions
@@ -1,25 +1,26 @@ -# Generated by mksrcinfo v8 -# Sun Mar 24 21:00:03 UTC 2019 pkgbase = k2pdfopt - pkgdesc = A tool that optimizes PDF files for viewing on mobile readers - pkgver = 2.51 + pkgdesc = Tool for optimizing PDF/DJVU files for mobile e-readers and smartphones. + pkgver = 2.53 pkgrel = 1 - url = http://www.willus.com/k2pdfopt/ + url = http://www.willus.com/k2pdfopt arch = i686 arch = x86_64 license = GPL3 makedepends = cmake - depends = mupdf>=1.14 - depends = djvulibre>=3.5.25.3 - depends = netpbm>=10.61.02 - depends = leptonica>=1.74.4 - depends = jasper - source = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.51_src.zip - source = http://deb.debian.org/debian/pool/main/k/k2pdfopt/k2pdfopt_2.51+ds-1.debian.tar.xz - source = jasper.patch - md5sums = 97bd96b21c7ee2680a9bfe12060992ba - md5sums = 9075edbbef77506cb18e2a4479d71ec4 - md5sums = aa38a1626c75962385bb3a0f5123a297 + depends = libpng + depends = libjpeg-turbo + depends = djvulibre + optdepends = ghostscript: PostScript support + 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 pkgname = k2pdfopt - diff --git a/CMakeLists.txt.patch b/CMakeLists.txt.patch new file mode 100644 index 000000000000..dc54011d8790 --- /dev/null +++ b/CMakeLists.txt.patch @@ -0,0 +1,78 @@ +--- 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 --") @@ -1,47 +1,48 @@ -# Maintainer: Jose Riha <jose 1711 gmail com> +# Contributor: Eric Fung <loseurmarbles[AT]gmail[DOT]com> +# Contributor: Jose Riha <jose 1711 gmail com> # Contributor: Facundo Tuesca <facutuesca at gmail dot com> -_tesseract_version=4.0.0 - pkgname=k2pdfopt -pkgver=2.51 +pkgver=2.53 pkgrel=1 -pkgdesc="A tool that optimizes PDF files for viewing on mobile readers" +pkgdesc='Tool for optimizing PDF/DJVU files for mobile e-readers and smartphones.' arch=('i686' 'x86_64') -url="http://www.willus.com/k2pdfopt/" +url='http://www.willus.com/k2pdfopt' license=('GPL3') makedepends=('cmake') -depends=('mupdf>=1.14' - 'djvulibre>=3.5.25.3' - 'netpbm>=10.61.02' - 'leptonica>=1.74.4' - 'jasper') -source=("http://www.willus.com/k2pdfopt/src/${pkgname}_v${pkgver}_src.zip" - "http://deb.debian.org/debian/pool/main/k/k2pdfopt/k2pdfopt_2.51+ds-1.debian.tar.xz" - "jasper.patch") -md5sums=('97bd96b21c7ee2680a9bfe12060992ba' - '9075edbbef77506cb18e2a4479d71ec4' - 'aa38a1626c75962385bb3a0f5123a297') +depends=('libpng' 'libjpeg-turbo' 'djvulibre') +optdepends=('ghostscript: PostScript support' + 'jasper: JPEG 2000 bitmap support' + 'gsl: polynomial fit for spline interpolation feature' + 'leptonica: OCR support') +source=("${url}/src/${pkgname}_v${pkgver}_src.zip" + 'CMakeLists.txt.patch' + 'k2pdfoptlib.patch' + 'willuslib.patch') +sha256sums=('58c1b0647be5237570c110b0bb77eb78fab384282a2648edb59eac673070959b' + '6569d3f15c288f1297ebc0f239a5d58bd3040e0521a22981a176d86b376cb6e3' + '32db8cf1012b3626d397023c7ecd08b711136700bca9f37b18e056f4c367e392' + 'c0ae18681871385ab4b10a0c129661cf7318e2d86837c2d092c77fe362cb9512') prepare() { - cd "${srcdir}/${pkgname}_v${pkgver}" - for i in ../debian/patches/*.patch - do - patch -p1 -i "$i" - done - patch -p2 -i "${srcdir}/jasper.patch" + cd "${srcdir}/${pkgname}_v${pkgver}" + patch < ../CMakeLists.txt.patch + patch -p2 < ../k2pdfoptlib.patch + patch -p2 < ../willuslib.patch } build() { - cd "${srcdir}/${pkgname}_v${pkgver}" - [ -d build ] && rm -r build - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. - make + cd "${srcdir}/${pkgname}_v${pkgver}" + [ -d '_build' ] && rm -r '_build' + mkdir '_build' + cd '_build' + cmake -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" .. + cmake --build . } package() { - cd "${srcdir}/${pkgname}_v${pkgver}/build" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}_v${pkgver}" + cd '_build' + install -d "${pkgdir}/usr/bin" + cmake --install . } diff --git a/jasper.patch b/jasper.patch deleted file mode 100644 index 7f87deb9ecaf..000000000000 --- a/jasper.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aur src.orig/k2pdfopt_v2.51/CMakeLists.txt src/k2pdfopt_v2.51/CMakeLists.txt ---- src.orig/k2pdfopt_v2.51/CMakeLists.txt 2019-03-24 21:45:17.683484849 +0100 -+++ src/k2pdfopt_v2.51/CMakeLists.txt 2019-03-24 21:46:17.443514984 +0100 -@@ -5,7 +5,7 @@ - - include(FindPkgConfig) - --set(K2PDFOPT_LIB "-lm") -+set(K2PDFOPT_LIB "-lm -ljasper") - - # cmake -DCMAKE_BUILD_TYPE=Debug <path> - -diff -aur src.orig/k2pdfopt_v2.51/willuslib/bmp.c src/k2pdfopt_v2.51/willuslib/bmp.c ---- src.orig/k2pdfopt_v2.51/willuslib/bmp.c 2019-01-01 00:21:16.000000000 +0100 -+++ src/k2pdfopt_v2.51/willuslib/bmp.c 2019-03-24 21:45:48.713500408 +0100 -@@ -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/k2pdfoptlib.patch b/k2pdfoptlib.patch new file mode 100644 index 000000000000..b8838e54edb8 --- /dev/null +++ b/k2pdfoptlib.patch @@ -0,0 +1,101 @@ +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 diff --git a/libraries_mod.zip b/libraries_mod.zip Binary files differdeleted file mode 100644 index 99452917b565..000000000000 --- a/libraries_mod.zip +++ /dev/null diff --git a/willuslib.patch b/willuslib.patch new file mode 100644 index 000000000000..ffadbd65651d --- /dev/null +++ b/willuslib.patch @@ -0,0 +1,127 @@ +Only in src.orig/k2pdfopt_v2.53/willuslib/: ansi.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: array.c +diff -ua src.orig/k2pdfopt_v2.53/willuslib/bmp.c src.changes/willuslib/bmp.c +--- src.orig/k2pdfopt_v2.53/willuslib/bmp.c 2020-07-11 11:58:35.000000000 -0700 ++++ src.changes/willuslib/bmp.c 2021-12-25 01:02:16.157767301 -0800 +@@ -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 -ua src.orig/k2pdfopt_v2.53/willuslib/bmpdjvu.c src.changes/willuslib/bmpdjvu.c +--- src.orig/k2pdfopt_v2.53/willuslib/bmpdjvu.c 2020-06-15 13:58:45.000000000 -0700 ++++ src.changes/willuslib/bmpdjvu.c 2021-12-25 03:27:26.072106793 -0800 +@@ -23,7 +23,7 @@ + #include "willus.h" + + #ifdef HAVE_DJVU_LIB +-#include <djvu.h> ++#include <libdjvu/ddjvuapi.h> + + static void handle(int wait,ddjvu_context_t *ctx); + static void djvu_add_page_info(char *buf,ddjvu_document_t *doc,int page,int npages); +Only in src.orig/k2pdfopt_v2.53/willuslib/: bmpmupdf.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: CMakeLists.txt +Only in src.orig/k2pdfopt_v2.53/willuslib/: dtcompress.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: filelist.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: fontdata.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: fontrender.c +diff -ua src.orig/k2pdfopt_v2.53/willuslib/gslpolyfit.c src.changes/willuslib/gslpolyfit.c +--- src.orig/k2pdfopt_v2.53/willuslib/gslpolyfit.c 2012-09-12 06:37:20.000000000 -0700 ++++ src.changes/willuslib/gslpolyfit.c 2021-12-27 00:46:49.667145276 -0800 +@@ -24,7 +24,7 @@ + #include <stdlib.h> + #include "willus.h" + #ifdef HAVE_GSL_LIB +-#include <gsl.h> ++#include <gsl/gsl_multifit.h> + #endif + + void gslpolyfit(double *x,double *y0,int n,int d,double *c0) +Only in src.orig/k2pdfopt_v2.53/willuslib/: linux.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: math.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: mem.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: ocr.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: ocrgocr.c +diff -ua src.orig/k2pdfopt_v2.53/willuslib/ocrtess.c src.changes/willuslib/ocrtess.c +--- src.orig/k2pdfopt_v2.53/willuslib/ocrtess.c 2020-06-19 18:49:17.000000000 -0700 ++++ src.changes/willuslib/ocrtess.c 2021-12-27 01:02:22.092401580 -0800 +@@ -25,10 +25,12 @@ + #include <string.h> + #include <ctype.h> + #include <locale.h> +-#include <leptonica.h> +-#include <tesseract.h> + #include "willus.h" + ++#ifdef HAVE_TESSERACT_LIB ++#include <leptonica/allheaders.h> ++#include <tesseract.h> ++ + char *ocrtess_langnames[] = + { + "af","afr","Afrikaans", +@@ -1080,3 +1082,4 @@ + } + return(langname); + } ++#endif /* HAVE_TESSERACT_LIB */ +Only in src.orig/k2pdfopt_v2.53/willuslib/: pdfwrite.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: point2d.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: render.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: strbuf.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: string.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: token.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: wfile.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: wgs.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: wgui.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: willus.h +Only in src.orig/k2pdfopt_v2.53/willuslib/: willusversion.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: winbmp.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: win.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: wincomdlg.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: wininet.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: winmbox.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: winshell.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: winshellwapi.c +diff -ua src.orig/k2pdfopt_v2.53/willuslib/wleptonica.c src.changes/willuslib/wleptonica.c +--- src.orig/k2pdfopt_v2.53/willuslib/wleptonica.c 2018-12-06 20:07:14.000000000 -0800 ++++ src.changes/willuslib/wleptonica.c 2021-12-27 01:32:01.045884896 -0800 +@@ -23,7 +23,7 @@ + #include "willus.h" + + #ifdef HAVE_LEPTONICA_LIB +-#include <leptonica.h> ++#include <leptonica/allheaders.h> + + static void wlept_pix_from_bmp(PIX **pixptr,WILLUSBITMAP *bmp); + static void wlept_bmp_from_pix(WILLUSBITMAP *bmp,PIX *pix); +@@ -135,7 +135,7 @@ + dew1=dewarpCreate(pixb,1); + pixDestroy(&pixb); + dewarpaInsertDewarp(dewa,dew1); +- dewarpBuildPageModel_ex(dew1,debug,fit_order); ++ dewarpBuildPageModel(dew1,debug); + if (bmp1!=NULL) + { + PIX *pix2,*pix2d; +Only in src.orig/k2pdfopt_v2.53/willuslib/: wmupdf.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: wmupdfinfo.c +Only in src.orig/k2pdfopt_v2.53/willuslib/: wpdf.c +diff -ua src.orig/k2pdfopt_v2.53/willuslib/wsys.c src.changes/willuslib/wsys.c +--- src.orig/k2pdfopt_v2.53/willuslib/wsys.c 2020-05-31 14:53:34.000000000 -0700 ++++ src.changes/willuslib/wsys.c 2021-12-27 02:41:30.321026174 -0800 +@@ -570,7 +570,7 @@ + if (value[0]=='\0') + { + estr=getenv(varname); +- if (estr==NULL); ++ if (estr==NULL) + assign=0; + } + if (assign) +Only in src.orig/k2pdfopt_v2.53/willuslib/: wzfile.c |