diff --git a/CMakeLists.txt b/CMakeLists.txt index dcf4b49..7fb9e6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,7 +135,7 @@ endif() FetchContent_Declare(httplib SYSTEM GIT_REPOSITORY https://github.com/yhirose/cpp-httplib - GIT_TAG c765584e6b1055fe0dfe3e9e6d1b4b09aa305070 + GIT_TAG 787a34ad7f01f20922a237d5142aae469828be72 GIT_SHALLOW TRUE) FetchContent_MakeAvailable(httplib) diff --git a/deploy/appimage/AppRun b/deploy/appimage/AppRun index 2d29782..4a78749 100644 --- a/deploy/appimage/AppRun +++ b/deploy/appimage/AppRun @@ -1,4 +1,4 @@ #!/bin/bash -export TESSDATA_PREFIX=\$APPDIR/usr/share/tesseract-ocr/4.00/tessdata +export TESSDATA_PREFIX=$APPDIR/usr/share/tesseract-ocr/4.00/tessdata -\$APPDIR/usr/bin/checks-parser +$APPDIR/usr/bin/checks-parser diff --git a/deploy/appimage/Dockerfile b/deploy/appimage/Dockerfile index 695e42f..483b3a0 100644 --- a/deploy/appimage/Dockerfile +++ b/deploy/appimage/Dockerfile @@ -16,10 +16,14 @@ WORKDIR / RUN wget https://mirror.linux-ia64.org/gnu/gcc/releases/gcc-12.3.0/gcc-12.3.0.tar.gz RUN tar xf gcc-12.3.0.tar.gz +#RUN rm gcc-12.3.0.tar.gz + WORKDIR /gcc-12.3.0 -RUN ./configure --disable-multilib +RUN ./configure --disable-multilib --prefix=/usr RUN make -j $(nproc) && make install +RUN cp /lib64/* /lib/x86_64-linux-gnu || : + WORKDIR / RUN rm -rf gcc-12.3.0 @@ -66,6 +70,8 @@ RUN cp /appimage/build/checks-parser . WORKDIR /appimage -RUN LD_LIBRARY_PATH=LD_LIBRARY_PATH=/usr/local/lib64 linuxdeployqt AppDir/usr/bin/checks-parser -no-copy-copyright-files -appimage +RUN linuxdeployqt --appimage-extract-and-run AppDir/usr/bin/checks-parser -no-copy-copyright-files -appimage + +#RUN LD_LIBRARY_PATH=LD_LIBRARY_PATH=/usr/local/lib64 linuxdeployqt --appimage-extract-and-run AppDir/usr/bin/checks-parser -no-copy-copyright-files -appimage ENTRYPOINT bash