Merge pull request #73 from mariux64/update-2.14.4

paperless: update from 2.13.5 to 2.14.4
mariux64 · Jan 22, 2025 · bb64316 · bb64316
2 parents 3a4ec1d + a94a8cc
commit bb64316
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 153 deletions.
diff --git a/README.bug b/README.bug
@@ -1,93 +1 @@
-Error in pixReadMemTiff: function not present
-Error in pixReadMem: tiff: no pix returned
-Error in pixaGenerateFontFromString: pix not made
-Error in bmfCreate: font pixa not made
-
-pixReadMemTiff ist aus leptonica
-
-leptonica : build/leptonica-1.85.0/src/tiffio.c : pixReadMemTiff(const l_uint8  *cdata
-
-"function not present" kommt aus build/leptonica-1.85.0/src/tiffiostub.c
-
-tiffiostub.c wird eingebunden, anstatt tiffio.c wenn HAVE_LIBJPEG nicht defniert ist
-
-52: #if  !HAVE_LIBTIFF || !HAVE_LIBJPEG  /* defined in environ.h  */
-
-config.log @ leptonica sagt: finde pkg-config libtiff-4 nicht
-"No package 'libtiff-4' found"
-
-configure:14837: checking for libtiff-4
-configure:14844: $PKG_CONFIG --exists --print-errors "libtiff-4"
-Package libtiff-4 was not found in the pkg-config search path.
-
-- wir bauen jetzt leptonica so lange, bis der libtiff findet
- + is da : ~/2135-debug/tiff-4.7.0/lib/pkgconfig/libtiff-4.pc 
- + das profile von tiff- setzt auch den PKG_CONFIG_PATH:
-paperless@server:~/git/paperless-baremetal$ cat ~/2135-debug/tiff-4.7.0/profile 
-PATH=/home/paperless/2135-debug/tiff-4.7.0/bin:$PATH
-PKG_CONFIG_PATH=/home/paperless/2135-debug/tiff-4.7.0/lib/pkgconfig${PKG_CONFIG_PATH:+:}${PKG_CONFIG_PATH:-}
-LD_LIBRARY_PATH=/home/paperless/2135-debug/tiff-4.7.0/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}
-
- + das profile von tiff wird in leptonica gesourced
-
- + exportiere jetzt mal PKG_CONFIG_PATH
-
-   - er meckert er würde jetzt libjpeg.so.7 nicht finden.
-     "/bin/ld: ../src/.libs/libleptonica.so: undefined reference to `jpeg_start_decompress@LIBJPEG_7.0'"
-   + die gibts aber:
-      paperless@server:~/git/paperless-baremetal$ find ~/2135-debug/ | grep  jpeg.so
-      /home/paperless/2135-debug/libjpeg-turbo-3.1.0/lib/libjpeg.so.7.4.0
-   + Im PKG_CONFIG_PATH steht sie auch drin
-   + config.log auch alles OK:
-      JPEG_CFLAGS='-I/home/paperless/2135-debug/libjpeg-turbo-3.1.0/include'
-      JPEG_LIBS='-L/home/paperless/2135-debug/libjpeg-turbo-3.1.0/lib -ljpeg'
-      PKG_CONFIG_PATH='/home/paperless/2135-debug/imagemagick-7.1.1-41/lib/pkgconfig:/home/paperless/2135-debug/tiff-4.7.0/lib/pkgconfig:/home/paperless/2135-debug/libjpeg-turbo-3.1.0/lib/pkgconfig'
-      #define HAVE_LIBJPEG 1
-   - diffs zwischen 'notiff und nojepg,
-     + config.log: sollte gehen, kennt  HAVE_LIBTIFF und HAVE_LIBJPEG, alles korrekt
-     + config_auto.h: auch ok
-     + config.status: auch ok
-     + Makefile: auch ok
-       eventuell bindet der grundsätzlich die JPEG_CFLAGS nicht ein ?
-    ich find nix
-  mal ab hier mit 1.84.1 ? Nope. 
-
-  die libs stimmen auch...:
-   + nm ./libjpegturbo-3.1.0/lib/libjpeg.so.7.4.0 | grep jpeg_calc_output_dimensions
-     000000000004ace0 T jpeg_calc_output_dimensions
-       symbol ist in text (code) section (T).
-     nm ./leptonica-1.85.0/lib/libleptonica.so.6.0.0 | grep jpeg_calc_output_dimensions
-                      U jpeg_calc_output_dimensions@LIBJPEG_7.0
-       undefined, also extern (U)
-     nm ./libjpegturbo-3.1.0/bin/djpeg | grep jpeg_calc_output_dimensions
-                 U jpeg_calc_output_dimensions@LIBJPEG_7.0
-     ldd ./libjpegturbo-3.1.0/bin/djpeg
-       linux-vdso.so.1 (0x00007ffda8d52000)
-       libjpeg.so.7 => /home/paperless/2135-debug/libjpegturbo-3.1.0/lib/libjpeg.so.7 (0x00007f61f9078000)
-       libc.so.6 => /lib/x86_64-linux-gnu/libc.so.6 (0x00007f61f8e00000)
-       /lib64/ld-linux-x86-64.so.2 (0x00007f61f914a000)
-  versuchen wir mal static libjpeg
-    + leptonica baut durch
-    - tesseract failed:
-    /bin/ld: /home/paperless/2135-debug/leptonica-1.85.0/lib/libleptonica.a(writefile.o): warning: relocation against `NumImageFileFormatExtensions' in read-only section `.text'
-    /bin/ld: /home/paperless/2135-debug/leptonica-1.85.0/lib/libleptonica.a(colorspace.o): relocation R_X86_64_PC32 against symbol `LeptMsgSeverity' can not be used when making a shared object; recompile with -fPIC
-    /bin/ld: final link failed: bad value
-    collect2: error: ld returned 1 exit status
-    - --with-pic bei leptonica ...
-... hmmm... ich glaube ich bin wieder an anfang....
-
-        + ./manage.py migrate
-        SystemCheckError: System check identified some issues:
-
-        ERRORS:
-        ?: The selected ocr language deu is not installed. Paperless cannot OCR your documents without it. Please fix PAPERLESS_OCR_LANGUAGE.
-        ?: The selected ocr language eng is not installed. Paperless cannot OCR your documents without it. Please fix PAPERLESS_OCR_LANGUAGE.
-
-    - ./tesseract-5.5.0/bin/tesseract: error while loading shared libraries: libjpeg.so.62: cannot open shared object file: No such file or directory
-
- - clean build auf 2.13.5.1
-    - jbig2enc failed
-        checking for findFileFormatStream in -lleptonica... no
-        Error! Leptonica not detected.
-
-
+- libjbig2enc ist immer noch shared.
diff --git a/build.profile b/build.profile
@@ -1,6 +1,6 @@
-BUILD_TAG=2.13.5
+BUILD_TAG=2.14.4
 
-BUILD_paperless=paperless-ngx-2.13.5
+BUILD_paperless=paperless-ngx-2.14.4
 
 BUILD_DIR=build
 BUILD_SRC="${PWD}"
@@ -16,9 +16,9 @@ TMPDIR=${TMPDIR:-/tmp/${USER}/${BUILD_TAG}}
 LOGDIR=${PROJECT}/log
 
 # https://sqlite.org
-# wget "https://sqlite.org/2024/sqlite-autoconf-3470200.tar.gz"
-BUILD_sqlite=sqlite-3.47.2
-BUILD_sqlite_SRCURL="https://beehive.molgen.mpg.de/6bf0697af5b609e186cc223eca9c2cb1/sqlite-autoconf-3470200.tar.gz"
+# wget "https://sqlite.org/2025/sqlite-autoconf-3480000.tar.gz"
+BUILD_sqlite=sqlite-3.48.0
+BUILD_sqlite_SRCURL="https://beehive.molgen.mpg.de/ab4e0652b6dedb075faf7a2781ba2c20/sqlite-autoconf-3480000.tar.gz"
 
 # https://download.redis.io/releases   # community edition !
 # wget https://download.redis.io/releases/redis-7.4.1.tar.gz
@@ -29,9 +29,9 @@ BUILD_redis_SRCURL="https://beehive.molgen.mpg.de/360809807c15da120affb356e55c63
 BUILD_python=Python-3.11.11
 BUILD_python_SRCURL="https://beehive.molgen.mpg.de/9a5b43fcc06810b8ae924b0a080e6569/${BUILD_python}.tgz"
 
-# wget "https://nodejs.org/download/release/v22.12.0/node-v22.12.0.tar.gz"
-BUILD_node=node-22.12.0
-BUILD_node_SRCURL="https://beehive.molgen.mpg.de/d1bd17458220a27b1354c49f4bdae123/${BUILD_node/-/-v}.tar.gz"
+# wget "https://nodejs.org/download/release/v22.13.0/node-v22.13.0.tar.gz"
+BUILD_node=node-22.13.0
+BUILD_node_SRCURL="https://beehive.molgen.mpg.de/5e7e3ff99c6348c8f2f759cf2ed64e9f/${BUILD_node/-/-v}.tar.gz"
 
 # SRCURL="https://ffmpeg.org//releases/${BUILD_ffmpeg}.tar.gz"
 BUILD_ffmpeg=ffmpeg-7.1
@@ -66,7 +66,7 @@ BUILD_libwebp=libwebp-1.5.0
 BUILD_libwebp_SRCURL[0]="https://beehive.molgen.mpg.de/8f659e426eaa2aeec4b36bc9ea43b3f3/${BUILD_libwebp}.tar.gz"
 
 # gits
-BUILD_imagemagick=imagemagick-7.1.1-41
+BUILD_imagemagick=imagemagick-7.1.1-43
 BUILD_imagemagick_SRCURL="https://github.com/ImageMagick/ImageMagick.git"
 
 BUILD_pngquant=pngquant-3.0.3-6-g9a4952d

diff --git a/build.sudo b/build.sudo
@@ -18,6 +18,7 @@ PKGS=(
   imagemagick-6.q16
   libavformat-dev
   libbz2-dev
+  liblzma-dev
   libpango1.0-dev
   libpq-dev
   libreadline-dev

diff --git a/jbig2enc.build.sh b/jbig2enc.build.sh
@@ -45,14 +45,6 @@ local _conf=(
 #    --disable-shared
     )
 
-# LDFLAGS="$(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs-only-L lept)"
-# export
-
-# LEPTONICA_CFLAGS="$(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --cflags lept)"
-# export
-
-# LEPTONICA_LIBS="$(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs lept)"
-
 LDFLAGS="$(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs libtiff-4)"
 LDFLAGS+=" $(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs lept)"
 LDFLAGS+=" $(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs libjpeg)"
@@ -70,16 +62,6 @@ export CPPFLAGS
 LIBS='-lm -lleptonica -ltiff -ljpeg -lwebp  -lsharpyuv -lpng -lz -lzstd -llzma'
 export LIBS
 
-# LDFLAGS+=" $(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs-only-L libtiff-4)"
-#LDFLAGS+=" $(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs libtiff-4)"
-# export LDFLAGS
-
-# CPPFLAGS="-I${PROJECT}/${BUILD_leptonica}/include"
-#CFLAGS+=" -I${PROJECT}/${BUILD_libtiff}/include"
-# export CPPFLAGS
-
-#export PKG_CONFIG_PATH
-
 ./autogen.sh
 
 PKG_CONFIG_PATH=${PKG_CONFIG_PATH} ./configure "${_conf[@]}"

diff --git a/leptonica.build.sh b/leptonica.build.sh
@@ -32,20 +32,6 @@ test -d ${BUILD_PKG} || mkdir -pv ${BUILD_PKG} && tar -xf ${BUILD_PKG}.tar.gz --
 
 cd ${BUILD_PKG}
 
-#local _conf=(
-#    -DCMAKE_INSTALL_PREFIX=${PREFIX}
-#    -DENABLE_OPENJPEG=OFF
-#)
-
-#rm -rf b
-#mkdir b
-#pushd b
-#PKG_CONFIG_PATH=${PKG_CONFIG_PATH} cmake .. "${_conf[@]}"
-#make -j "${NPROC}" install
-# wtf
-#mv -v ${PREFIX}/lib/pkgconfig/lept_Release.pc ${PREFIX}/lib/pkgconfig/lept.pc
-#popd
-
 export PKG_CONFIG_PATH
 
 local _conf=(

diff --git a/libjpegturbo.build.sh b/libjpegturbo.build.sh
@@ -38,7 +38,6 @@ local _conf=(
 rm -rf b
 mkdir b
 pushd b
-# PKG_CONFIG_PATH=${PKG_CONFIG_PATH} cmake .. "${_conf[@]}"
 cmake .. "${_conf[@]}"
 make -j "${NPROC}" install
 popd

diff --git a/libtiff.build.sh b/libtiff.build.sh
@@ -32,7 +32,6 @@ cd "${BUILD_PKG}"
 
 local _conf=(
     --prefix="${PREFIX}"
-#    --disable-rpath
     --disable-shared
     --with-pic
     --disable-jbig

diff --git a/libwebp.build.sh b/libwebp.build.sh
@@ -6,7 +6,6 @@ set -u
 
 . build.profile
 
-# . ${PREFIX}/${BUILD_libjpegturbo}/profile
  . ${PREFIX}/${BUILD_libtiff}/profile
 
 function B_LIBWEBP {
@@ -24,14 +23,11 @@ PATH=${PREFIX}/bin:\$PATH
 PKG_CONFIG_PATH=${PROJECT}/${BUILD_PKG}/lib/pkgconfig\${PKG_CONFIG_PATH:+:}\${PKG_CONFIG_PATH:-}
 EOF
 
-
 test -e "${BUILD_PKG}".tar.gz || wget -nv "${SRCURL}" -O "${BUILD_PKG}".tar.gz
 test -d "${BUILD_PKG}" || mkdir -pv "${BUILD_PKG}" && tar -xf "${BUILD_PKG}".tar.gz --strip-components=1 -C "${BUILD_PKG}"
 
 cd "${BUILD_PKG}"
 
-
-
 local _conf=(
     --prefix="${PREFIX}"
     --enable-libwebpmux

diff --git a/tesseract.build.sh b/tesseract.build.sh
@@ -51,25 +51,12 @@ export PKG_CONFIG_PATH
 LDFLAGS="$(PKG_CONFIG_PATH=${PKG_CONFIG_PATH} pkg-config --libs-only-L lept)"
 LDFLAGS="-Wl,-rpath -Wl,$(pkg-config --variable=libdir lept)"
 export LDFLAGS
-# -Wl,-rpath,-WL,$(pkg-config --variable=libdir lept)
-#   - use the '-Wl,-rpath -Wl,LIBDIR' linker flag
-
-
 
 ./autogen.sh
 
 PKG_CONFIG_PATH=${PKG_CONFIG_PATH} \
 ./configure "${_conf[@]}"
 
-#local _conf=(
-#    -DCMAKE_INSTALL_PREFIX=${PREFIX}
-#    -DCMAKE_COLOR_MAKEFILE=OFF
-#    -DCMAKE_VERBOSE_MAKEFILE=ON
-#)
-#mkdir b
-#pushd b
-#PKG_CONFIG_PATH=${PKG_CONFIG_PATH} cmake .. "${_conf[@]}"
-
 make -j "${NPROC}" install
 
 popd