Skip to content

Commit

Permalink
Remove unused Poppler versions 23.10.0 and 21.02.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ViliusSutkus89 committed Dec 25, 2023
1 parent fa8caca commit b253c6d
Show file tree
Hide file tree
Showing 11 changed files with 4 additions and 454 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/poppler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,6 @@ jobs:
package: poppler
version: '23.12.0'

build-poppler-23_10_0:
name: poppler 23.10.0
uses: ./.github/workflows/build.yml
with:
package: poppler
version: '23.10.0'

build-poppler-21_02_0:
name: poppler 21.02.0
uses: ./.github/workflows/build.yml
with:
package: poppler
version: '21.02.0'

build-poppler-0_89_0:
name: poppler 0.89.0
uses: ./.github/workflows/build.yml
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@ Usable version is 2.75.0
Available versions:

- 23.12.0
- 23.10.0
- 21.02.0
- 0.89.0
- 0.81.0

Expand Down
23 changes: 4 additions & 19 deletions poppler/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ val portVersion = when(project.findProperty("packageVersion")) {
version = "0.89.0-beta-7"
"0.89.0"
}
"21.02.0" -> {
version = "21.02.0-beta-6"
"21.02.0"
}
"23.10.0" -> {
version = "23.10.0-beta-8"
"23.10.0"
}
else /* "23.12.0" */ -> {
version = "23.12.0-beta-5"
"23.12.0"
Expand All @@ -47,7 +39,7 @@ dependencies {
implementation("com.viliussutkus89.ndk.thirdparty:glib2${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.75.0-beta-1")
implementation("com.viliussutkus89.ndk.thirdparty:cairo${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:1.18.0-beta-6")
implementation("com.viliussutkus89.ndk.thirdparty:lcms2${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.16-beta-2")
if (listOf("0.81.0", "0.89.0", "21.02.0").contains(portVersion)) {
if (listOf("0.81.0", "0.89.0").contains(portVersion)) {
// 23.10.0 supports Android's native alternative of fontconfig
implementation("com.viliussutkus89.ndk.thirdparty:fontconfig${ndkVersionSuffix}${dependencyLibraryTypeSuffix}:2.14.2-beta-5")
}
Expand Down Expand Up @@ -115,12 +107,7 @@ tasks.extractSrc {
srcDir.patch("glib-boxed-type.patch")
srcDir.patch("ExportPrivatesForPdf2htmlEX.patch")
}
"21.02.0" -> {
srcDir.resolve("CMakeLists.txt").patch("fontconfig.patch")
srcDir.resolve("CMakeLists.txt").patch("FindCairo.patch")
srcDir.patch("glib-boxed-type.patch")
}
"23.10.0", "23.12.0" -> {
"23.12.0" -> {
srcDir.resolve("CMakeLists.txt").patch("FindCairo.patch")
srcDir.resolve("cmake/modules/CheckFileOffsetBits.cmake").patch("CheckFileOffsetBits.patch")
srcDir.patch("ExportPrivatesForPdf2htmlEX.patch")
Expand All @@ -135,7 +122,7 @@ tasks.prefab {

tasks.register<CMakePortTask>("buildPort") {
when (portVersion) {
"0.81.0", "0.89.0", "21.02.0" -> {
"0.81.0", "0.89.0" -> {
cmake {
arg("-DENABLE_UNSTABLE_API_ABI_HEADERS=ON")
}
Expand All @@ -148,7 +135,7 @@ tasks.register<CMakePortTask>("buildPort") {
}
}
}
"23.10.0", "23.12.0" -> {
"23.12.0" -> {
cmake {
args(
"-DENABLE_UNSTABLE_API_ABI_HEADERS=ON",
Expand Down Expand Up @@ -280,8 +267,6 @@ publishing {
// Developer list obtained from:
// https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-0.81.0/AUTHORS
// https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-0.89.0/AUTHORS
// https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-21.02.0/AUTHORS
// https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-23.10.0/AUTHORS
// https://gitlab.freedesktop.org/poppler/poppler/-/raw/poppler-23.12.0/AUTHORS
// https://gitlab.freedesktop.org/poppler/poppler-data/-/blob/POPPLER_DATA_0_4_12/README
developer {
Expand Down
19 changes: 0 additions & 19 deletions poppler/patches/21.02.0/FindCairo.patch

This file was deleted.

41 changes: 0 additions & 41 deletions poppler/patches/21.02.0/fontconfig.patch

This file was deleted.

Loading

0 comments on commit b253c6d

Please sign in to comment.