Merge pull request #80 from jacktose-forks/patch-1

Bump to poppler 25.07.0

Author: oschwartz10612

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
       uses: conda-incubator/setup-miniconda@v3
     - name: Install Poppler
       shell: bash -l {0}
-      run: conda install -c conda-forge poppler -y
+      run: conda install -c conda-forge liblzma expat poppler -y
     - name: Run Package Script
       shell: bash -l {0}
       run: ./package.sh

.github/workflows/test.yaml

@@ -15,7 +15,7 @@ jobs:
       uses: conda-incubator/setup-miniconda@v3
     - name: Install Poppler
       shell: bash -l {0}
-      run: conda install -c conda-forge poppler -y
+      run: conda install -c conda-forge liblzma expat poppler -y
     - name: Run Package Script
       shell: bash -l {0}
       run: ./package.sh
@@ -33,7 +33,7 @@ jobs:
 
     - name: Remove Poppler
       shell: bash -l {0}
-      run: conda remove -c conda-forge poppler -y
+      run: conda remove -c conda-forge liblzma expat poppler -y
 
     - name: Test pdfattach
       run: D:\a\poppler-windows\poppler-windows\poppler-${{ env.POPPLER_VERSION }}\Library\bin\pdfattach.exe D:\a\poppler-windows\poppler-windows\sample.pdf D:\a\poppler-windows\poppler-windows\sample.pdf test.pdf
@@ -56,4 +56,4 @@ jobs:
     - name: Test pdftotext
       run: D:\a\poppler-windows\poppler-windows\poppler-${{ env.POPPLER_VERSION }}\Library\bin\pdftotext.exe -v
     - name: Test pdfunite
-      run: D:\a\poppler-windows\poppler-windows\poppler-${{ env.POPPLER_VERSION }}\Library\bin\pdfunite.exe -v
+      run: D:\a\poppler-windows\poppler-windows\poppler-${{ env.POPPLER_VERSION }}\Library\bin\pdfunite.exe -v

package.sh

@@ -1,4 +1,4 @@
-POPPLER_VERSION=24.08.0
+POPPLER_VERSION=25.07.0
 POPPLER_DATA_URL="https://poppler.freedesktop.org/poppler-data-0.4.12.tar.gz"
 BUILD="0"
 
@@ -9,7 +9,7 @@ mkdir "poppler-$POPPLER_VERSION"
 cd "poppler-$POPPLER_VERSION" || exit
 
 cp -a "$PKGS_PATH_DIR"/poppler-$POPPLER_VERSION*/Library/ .
-cp "$PKGS_PATH_DIR"/freetype*/Library/bin/freetype.dll ./Library/bin/
+cp "$PKGS_PATH_DIR"/libfreetype6*/Library/bin/freetype.dll ./Library/bin/
 cp "$PKGS_PATH_DIR"/libzlib*/Library/bin/zlib.dll ./Library/bin/
 cp -a "$PKGS_PATH_DIR"/zstd*/Library/bin/. ./Library/bin/
 cp "$PKGS_PATH_DIR"/libtiff*/Library/bin/tiff.dll ./Library/bin/
@@ -20,7 +20,7 @@ cp "$PKGS_PATH_DIR"/libcurl*/Library/bin/libcurl.dll ./Library/bin/
 cp "$PKGS_PATH_DIR"/openssl*/Library/bin/libcrypto-3-x64.dll ./Library/bin/
 cp "$PKGS_PATH_DIR"/openjpeg*/Library/bin/openjp2.dll ./Library/bin/
 cp "$PKGS_PATH_DIR"/libjpeg-turbo*/Library/bin/jpeg8.dll ./Library/bin/
-cp "$PKGS_PATH_DIR"/xz*/Library/bin/liblzma.dll ./Library/bin/
+cp "$PKGS_PATH_DIR"/liblzma*/Library/bin/liblzma.dll ./Library/bin/
 cp "$PKGS_PATH_DIR"/cairo*/Library/bin/cairo.dll ./Library/bin/
 # cp "$PKGS_PATH_DIR"/libdeflate*/Library/bin/libdeflate.dll ./Library/bin/
 cp "$PKGS_PATH_DIR"/libdeflate*/Library/bin/deflate.dll ./Library/bin/