diff --git a/.github/workflows/poppler.yml b/.github/workflows/poppler.yml index e5fbe56..21889cf 100644 --- a/.github/workflows/poppler.yml +++ b/.github/workflows/poppler.yml @@ -9,9 +9,8 @@ on: - '.github/workflows/poppler.yml' jobs: - build-poppler-23_12_0: - name: poppler 23.12.0 + build: + name: poppler uses: ./.github/workflows/build.yml with: package: poppler - version: '23.12.0' diff --git a/pdf2htmlEX/build.gradle.kts b/pdf2htmlEX/build.gradle.kts index c4cfcb1..dbd771a 100644 --- a/pdf2htmlEX/build.gradle.kts +++ b/pdf2htmlEX/build.gradle.kts @@ -7,7 +7,7 @@ group = rootProject.group // https://github.com/pdf2htmlEX/pdf2htmlEX/pull/154 Hoping it will be named rc2 val portVersion = "0.18.8.rc2" -version = "0.18.8.rc2-beta-9" +version = "0.18.8.rc2-beta-10" plugins { id("maven-publish") @@ -21,7 +21,7 @@ dependencies { implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:1.18.0-beta-7") implementation("com.viliussutkus89.ndk.thirdparty:freetype${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.13.2-beta-8") implementation("com.viliussutkus89.ndk.thirdparty:fontforge${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:20230101-beta-17") - implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:23.12.0-beta-6") + implementation("com.viliussutkus89.ndk.thirdparty:poppler${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:24.01.0-beta-1") } ndkPorts { diff --git a/pdf2htmlEX/patches/0.18.8.rc2/find-libraries.patch b/pdf2htmlEX/patches/0.18.8.rc2/find-libraries.patch index c9542c1..be88473 100644 --- a/pdf2htmlEX/patches/0.18.8.rc2/find-libraries.patch +++ b/pdf2htmlEX/patches/0.18.8.rc2/find-libraries.patch @@ -25,8 +25,8 @@ -) - - -+pkg_search_module(POPPLER-GLIB REQUIRED IMPORTED_TARGET poppler-glib=23.12.0) -+pkg_search_module(POPPLER REQUIRED IMPORTED_TARGET poppler=23.12.0) ++pkg_search_module(POPPLER-GLIB REQUIRED IMPORTED_TARGET poppler-glib>=23.12.0) ++pkg_search_module(POPPLER REQUIRED IMPORTED_TARGET poppler>=23.12.0) +set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} PkgConfig::POPPLER-GLIB PkgConfig::POPPLER) if(ENABLE_SVG) - pkg_check_modules(CAIRO REQUIRED cairo>=1.10.0) diff --git a/poppler/build.gradle.kts b/poppler/build.gradle.kts index 6790212..906817d 100644 --- a/poppler/build.gradle.kts +++ b/poppler/build.gradle.kts @@ -5,8 +5,8 @@ import org.gradle.jvm.tasks.Jar group = rootProject.group -val portVersion = "23.12.0" -version = "23.12.0-beta-6" +val portVersion = "24.01.0" +version = "${portVersion}-beta-1" plugins { id("maven-publish") diff --git a/poppler/patches/23.12.0/CheckFileOffsetBits.patch b/poppler/patches/24.01.0/CheckFileOffsetBits.patch similarity index 100% rename from poppler/patches/23.12.0/CheckFileOffsetBits.patch rename to poppler/patches/24.01.0/CheckFileOffsetBits.patch diff --git a/poppler/patches/23.12.0/ExportPrivatesForPdf2htmlEX.patch b/poppler/patches/24.01.0/ExportPrivatesForPdf2htmlEX.patch similarity index 100% rename from poppler/patches/23.12.0/ExportPrivatesForPdf2htmlEX.patch rename to poppler/patches/24.01.0/ExportPrivatesForPdf2htmlEX.patch diff --git a/poppler/patches/23.12.0/FindCairo.patch b/poppler/patches/24.01.0/FindCairo.patch similarity index 100% rename from poppler/patches/23.12.0/FindCairo.patch rename to poppler/patches/24.01.0/FindCairo.patch diff --git a/poppler/poppler-24.01.0.tar.xz b/poppler/poppler-24.01.0.tar.xz new file mode 100644 index 0000000..82986ba Binary files /dev/null and b/poppler/poppler-24.01.0.tar.xz differ