poppler, revbump for libtiff6, rename poppler -> poppler22 (#11098)

This commit is contained in:
Schrijvers Luc
2024-09-12 07:20:30 +02:00
committed by GitHub
parent a71849c360
commit b2015a5575
3 changed files with 27 additions and 24 deletions

View File

@@ -220,7 +220,7 @@ COPYRIGHT="2008 Adam Batkin
2007 Will Stephenson
1994 X Consortium"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="https://poppler.freedesktop.org/poppler-$portVersion.tar.xz"
CHECKSUM_SHA256="7d3493056b5b86413e5c693c2cae02c5c06cd8e618d14c2c31e2c84b67b2313e"
SOURCE_DIR="poppler-$portVersion"
@@ -240,7 +240,7 @@ libQt5VersionCompat="$libQt5Version compat >= ${libQt5Version%%.*}"
libQt6VersionCompat="$libQt6Version compat >= ${libQt6Version%%.*}"
PROVIDES="
poppler$secondaryArchSuffix = $portVersion
poppler22$secondaryArchSuffix = $portVersion
lib:libpoppler$secondaryArchSuffix = $libVersionCompat
lib:libpoppler_cpp$secondaryArchSuffix = $libCppVersionCompat
"
@@ -264,9 +264,12 @@ REQUIRES="
lib:libtiff$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
REPLACES="
poppler$secondaryArchSuffix
"
PROVIDES_devel="
poppler${secondaryArchSuffix}_devel = $portVersion
poppler22${secondaryArchSuffix}_devel = $portVersion
devel:libpoppler$secondaryArchSuffix = $libVersionCompat
devel:libpoppler_cpp$secondaryArchSuffix = $libCppVersionCompat
devel:libpoppler_glib$secondaryArchSuffix = $libGlibVersionCompat
@@ -275,7 +278,7 @@ PROVIDES_devel="
"
REQUIRES_devel="
haiku${secondaryArchSuffix}_devel
poppler$secondaryArchSuffix == $portVersion base
poppler22$secondaryArchSuffix == $portVersion base
lib:libpoppler_glib$secondaryArchSuffix
lib:libpoppler_qt5$secondaryArchSuffix
lib:libpoppler_qt6$secondaryArchSuffix
@@ -302,7 +305,7 @@ REQUIRES_devel="
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Xml$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 6
devel:libz$secondaryArchSuffix
"
@@ -311,12 +314,12 @@ SUMMARY_glib="$SUMMARY (glib bindings)"
DESCRIPTION_glib="$DESCRIPTION (glib bindings)"
PROVIDES_glib="
poppler${secondaryArchSuffix}_glib = $portVersion
poppler22${secondaryArchSuffix}_glib = $portVersion
lib:libpoppler_glib$secondaryArchSuffix = $libGlibVersionCompat
"
REQUIRES_glib="
haiku$secondaryArchSuffix
poppler$secondaryArchSuffix == $portVersion base
poppler22$secondaryArchSuffix == $portVersion base
lib:libcairo$secondaryArchSuffix
lib:libcurl$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
@@ -329,7 +332,7 @@ REQUIRES_glib="
lib:liblcms2$secondaryArchSuffix
lib:libopenjp2$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix >= 6
lib:libz$secondaryArchSuffix
"
@@ -338,12 +341,12 @@ SUMMARY_qt5="$SUMMARY (Qt5 bindings)"
DESCRIPTION_qt5="$DESCRIPTION (Qt5 bindings)"
PROVIDES_qt5="
poppler${secondaryArchSuffix}_qt5 = $portVersion
poppler22${secondaryArchSuffix}_qt5 = $portVersion
lib:libpoppler_qt5$secondaryArchSuffix = $libQt5VersionCompat
"
REQUIRES_qt5="
haiku$secondaryArchSuffix
poppler$secondaryArchSuffix == $portVersion base
poppler22$secondaryArchSuffix == $portVersion base
lib:libcurl$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
@@ -355,7 +358,7 @@ REQUIRES_qt5="
lib:libQt5Gui$secondaryArchSuffix
lib:libQt5Widgets$secondaryArchSuffix
lib:libQt5Xml$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix >= 6
lib:libz$secondaryArchSuffix
"
@@ -364,12 +367,12 @@ SUMMARY_qt6="$SUMMARY (Qt6 bindings)"
DESCRIPTION_qt6="$DESCRIPTION (Qt6 bindings)"
PROVIDES_qt6="
poppler${secondaryArchSuffix}_qt6 = $portVersion
poppler22${secondaryArchSuffix}_qt6 = $portVersion
lib:libpoppler_qt6$secondaryArchSuffix = $libQt6VersionCompat
"
REQUIRES_qt6="
haiku$secondaryArchSuffix
poppler$secondaryArchSuffix == $portVersion base
poppler22$secondaryArchSuffix == $portVersion base
lib:libcurl$secondaryArchSuffix
lib:libfontconfig$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
@@ -381,13 +384,13 @@ REQUIRES_qt6="
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Widgets$secondaryArchSuffix
lib:libQt6Xml$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix >= 6
lib:libz$secondaryArchSuffix
"
SUMMARY_tools="Binaries for the poppler package"
PROVIDES_tools="
poppler${secondaryArchSuffix}_tools
poppler22${secondaryArchSuffix}_tools
cmd:pdfattach
cmd:pdfdetach
cmd:pdffonts
@@ -403,7 +406,7 @@ PROVIDES_tools="
cmd:pdfunite
"
REQUIRES_tools="
poppler$secondaryArchSuffix == $portVersion base
poppler22$secondaryArchSuffix == $portVersion base
haiku$secondaryArchSuffix
lib:libcairo$secondaryArchSuffix
lib:libfreetype$secondaryArchSuffix
@@ -437,7 +440,7 @@ BUILD_REQUIRES="
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Xml$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 6
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
@@ -451,7 +454,7 @@ BUILD_PREREQUIRES="
cmd:pkg_config$secondaryArchSuffix
"
defineDebugInfoPackage poppler$secondaryArchSuffix \
defineDebugInfoPackage poppler22$secondaryArchSuffix \
"$(getPackagePrefix tools)"/bin/pdfdetach \
"$(getPackagePrefix tools)"/bin/pdffonts \
"$(getPackagePrefix tools)"/bin/pdfimages \

View File

@@ -9,7 +9,7 @@ LICENSE="Apache v2
GNU GPL v2
GNU GPL v3
poppler_24.06.0-2_copyright"
REVISION="2"
REVISION="3"
SOURCE_URI="https://poppler.freedesktop.org/poppler-$portVersion.tar.xz"
CHECKSUM_SHA256="80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55"
SOURCE_DIR="poppler-$portVersion"
@@ -69,7 +69,7 @@ REQUIRES_devel="
poppler23$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
poppler${secondaryArchSuffix}_devel
poppler22${secondaryArchSuffix}_devel
"
# GLIB
@@ -243,7 +243,7 @@ BUILD_REQUIRES="
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Xml$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 6
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="

View File

@@ -9,7 +9,7 @@ LICENSE="Apache v2
GNU GPL v2
GNU GPL v3
poppler_24.06.0-2_copyright"
REVISION="1"
REVISION="2"
SOURCE_URI="https://poppler.freedesktop.org/poppler-$portVersion.tar.xz"
CHECKSUM_SHA256="97453fbddf0c9a9eafa0ea45ac710d3d49bcf23a62e864585385d3c0b4403174"
SOURCE_DIR="poppler-$portVersion"
@@ -69,7 +69,7 @@ REQUIRES_devel="
poppler24$secondaryArchSuffix == $portVersion base
"
CONFLICTS_devel="
poppler${secondaryArchSuffix}_devel
poppler22${secondaryArchSuffix}_devel
poppler23${secondaryArchSuffix}_devel
"
@@ -249,7 +249,7 @@ BUILD_REQUIRES="
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Widgets$secondaryArchSuffix
devel:libQt6Xml$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix >= 6
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="