diff --git a/dev-libs/orcus/orcus0.20-0.20.2.recipe b/dev-libs/orcus/orcus0.21-0.21.0.recipe similarity index 84% rename from dev-libs/orcus/orcus0.20-0.20.2.recipe rename to dev-libs/orcus/orcus0.21-0.21.0.recipe index 20a24d6b4..9f55f81e6 100644 --- a/dev-libs/orcus/orcus0.20-0.20.2.recipe +++ b/dev-libs/orcus/orcus0.21-0.21.0.recipe @@ -7,13 +7,13 @@ COPYRIGHT="2022 Kohei Yoshida et al." LICENSE="MPL v2.0" REVISION="1" SOURCE_URI="https://gitlab.com/orcus/orcus/-/archive/$portVersion/orcus-$portVersion.tar.bz2" -CHECKSUM_SHA256="46cdeefef6bbf800e2e776630930fea6363107ac71460824ba54e37047eb85b8" +CHECKSUM_SHA256="3555660197d6d38d720643f430804bb0f95a484c1fe6c28c00808ae67f978d15" SOURCE_DIR="orcus-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -boostMinimumVersion=1.88.0 +boostMinimumVersion=1.90.0 commandBinDir=$binDir commandSuffix=$secondaryArchSuffix @@ -23,10 +23,10 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then fi soVersion="${portVersion%.*}" -ixionSoVersion="${portVersion%.*}" # keep on par with ixion +ixionSoVersion=0.20 # most recent version PROVIDES=" - orcus0.20$secondaryArchSuffix = $portVersion + orcus0.21$secondaryArchSuffix = $portVersion lib:liborcus_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 lib:liborcus_mso_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 lib:liborcus_parser_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 @@ -35,28 +35,29 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix lib:libboost_date_time$secondaryArchSuffix - lib:libboost_system$secondaryArchSuffix - lib:libboost_filesystem$secondaryArchSuffix lib:libboost_iostreams$secondaryArchSuffix lib:libboost_program_options$secondaryArchSuffix lib:libixion_$ixionSoVersion$secondaryArchSuffix lib:libz$secondaryArchSuffix " +REPLACES=" + orcus0.20$secondaryArchSuffix + " PROVIDES_devel=" - orcus0.20${secondaryArchSuffix}_devel = $portVersion + orcus0.21${secondaryArchSuffix}_devel = $portVersion devel:liborcus_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 devel:liborcus_mso_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 devel:liborcus_parser_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 devel:liborcus_spreadsheet_model_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES_devel=" - orcus0.20$secondaryArchSuffix == $portVersion base + orcus0.21$secondaryArchSuffix == $portVersion base devel:libixion_$ixionSoVersion$secondaryArchSuffix " PROVIDES_tools=" - orcus0.20${secondaryArchSuffix}_tools = $portVersion + orcus0.21${secondaryArchSuffix}_tools = $portVersion cmd:orcus_css_dump$commandSuffix = $portVersion cmd:orcus_csv$commandSuffix = $portVersion cmd:orcus_detect$commandSuffix = $portVersion @@ -73,7 +74,7 @@ PROVIDES_tools=" cmd:orcus_zip_dump$commandSuffix = $portVersion " REQUIRES_tools=" - orcus0.20$secondaryArchSuffix == $portVersion base + orcus0.21$secondaryArchSuffix == $portVersion base $REQUIRES " CONFLICTS_tools=" @@ -81,11 +82,14 @@ CONFLICTS_tools=" orcus0.18${secondaryArchSuffix}_tools " +ARCHITECTURES_doc="any" +PROVIDES_doc=" + orcus0.21_doc + " + BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libboost_date_time$secondaryArchSuffix >= $boostMinimumVersion - devel:libboost_system$secondaryArchSuffix >= $boostMinimumVersion - devel:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion devel:libboost_iostreams$secondaryArchSuffix >= $boostMinimumVersion devel:libboost_program_options$secondaryArchSuffix >= $boostMinimumVersion devel:libixion_$ixionSoVersion$secondaryArchSuffix @@ -104,7 +108,7 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " -defineDebugInfoPackage orcus0.20$secondaryArchSuffix \ +defineDebugInfoPackage orcus0.21$secondaryArchSuffix \ $(getPackagePrefix tools)/bin/orcus-css-dump \ $(getPackagePrefix tools)/bin/orcus-csv \ $(getPackagePrefix tools)/bin/orcus-detect \ @@ -147,14 +151,14 @@ INSTALL() make install # documentation - docdir="$developDir/documentation/orcus${portVersion%.*}" + docdir="$documentationDir/packages/orcus${portVersion%.*}" mkdir -p $docdir - cp -r doc/_doxygen/html $docdir + cp -r doc/_doxygen/html/* $docdir for la in "" -mso -parser -spreadsheet-model; do library=liborcus$la-$soVersion rm $libDir/$library.la - prepareInstalledDevelLib $library + prepareInstalledDevelLibs $library done fixPkgconfig @@ -163,6 +167,9 @@ INSTALL() packageEntries tools \ "$commandBinDir" + + packageEntries doc \ + $documentationDir } TEST()