From 2c932ba5f87155931cd966009dfdabf70fc9305a Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sat, 1 Sep 2018 16:12:41 +0200 Subject: [PATCH] orcus: bump version --- ...rcus-0.13.4.recipe => orcus-0.14.0.recipe} | 48 +++++++++++-------- 1 file changed, 27 insertions(+), 21 deletions(-) rename dev-libs/orcus/{orcus-0.13.4.recipe => orcus-0.14.0.recipe} (66%) diff --git a/dev-libs/orcus/orcus-0.13.4.recipe b/dev-libs/orcus/orcus-0.14.0.recipe similarity index 66% rename from dev-libs/orcus/orcus-0.13.4.recipe rename to dev-libs/orcus/orcus-0.14.0.recipe index 9f0a1fcb4..a017a01c6 100644 --- a/dev-libs/orcus/orcus-0.13.4.recipe +++ b/dev-libs/orcus/orcus-0.14.0.recipe @@ -7,7 +7,7 @@ COPYRIGHT="Kohei Yoshida et al." LICENSE="MPL v2.0" REVISION="1" SOURCE_URI="https://kohei.us/files/orcus/src/liborcus-$portVersion.tar.xz" -CHECKSUM_SHA256="b71c4c15febe7dae63406e8023898e3a5cf7fe4ec43b2028dfbbf24e9fe282e4" +CHECKSUM_SHA256="54d4ef3898e6296587c90f24577b017fa2d400812d7d86feb371924dd6abc91c" SOURCE_DIR="liborcus-$portVersion" ARCHITECTURES="!x86_gcc2 x86 x86_64" @@ -15,6 +15,9 @@ SECONDARY_ARCHITECTURES="x86" boostMinimumVersion=1.65.0 +soVersion="${portVersion%.*}" +ixionSoVersion=$soVersion + PROVIDES=" orcus$secondaryArchSuffix = $portVersion cmd:orcus_css_dump$secondaryArchSuffix = $portVersion @@ -31,41 +34,44 @@ PROVIDES=" cmd:orcus_xml_dump$secondaryArchSuffix = $portVersion cmd:orcus_yaml$secondaryArchSuffix = $portVersion cmd:orcus_zip_dump$secondaryArchSuffix = $portVersion - lib:liborcus_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 - lib:liborcus_mso_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 - lib:liborcus_parser_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 - lib:liborcus_spreadsheet_model_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 + 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 + lib:liborcus_spreadsheet_model_$soVersion$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" haiku$secondaryArchSuffix + lib:libboost_date_time$secondaryArchSuffix >= $boostMinimumVersion lib:libboost_system$secondaryArchSuffix >= $boostMinimumVersion lib:libboost_filesystem$secondaryArchSuffix >= $boostMinimumVersion lib:libboost_iostreams$secondaryArchSuffix >= $boostMinimumVersion lib:libboost_program_options$secondaryArchSuffix >= $boostMinimumVersion - lib:libixion_0.13$secondaryArchSuffix + lib:libixion_$ixionSoVersion$secondaryArchSuffix lib:libz$secondaryArchSuffix " PROVIDES_devel=" orcus${secondaryArchSuffix}_devel = $portVersion - devel:liborcus_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 - devel:liborcus_mso_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 - devel:liborcus_parser_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 - devel:liborcus_spreadsheet_model_0.13$secondaryArchSuffix = 0.0.0 compat >= 0 + 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=" orcus$secondaryArchSuffix == $portVersion base + devel:libixion_$ixionSoVersion$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libboost_system$secondaryArchSuffix - devel:libboost_filesystem$secondaryArchSuffix - devel:libboost_iostreams$secondaryArchSuffix - devel:libboost_program_options$secondaryArchSuffix - devel:libixion_0.13$secondaryArchSuffix + 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 devel:libz$secondaryArchSuffix - devel:mdds >= 1.2 + devel:mdds >= 1.4 " BUILD_PREREQUIRES=" cmd:aclocal @@ -93,10 +99,10 @@ defineDebugInfoPackage orcus$secondaryArchSuffix \ $binDir/orcus-xml-dump \ $binDir/orcus-yaml \ $binDir/orcus-zip-dump \ - $libDir/liborcus-0.13.so.0.0.0 \ - $libDir/liborcus-mso-0.13.so.0.0.0 \ - $libDir/liborcus-parser-0.13.so.0.0.0 \ - $libDir/liborcus-spreadsheet-model-0.13.so.0.0.0 + $libDir/liborcus-$soVersion.so.0.0.0 \ + $libDir/liborcus-mso-$soVersion.so.0.0.0 \ + $libDir/liborcus-parser-$soVersion.so.0.0.0 \ + $libDir/liborcus-spreadsheet-model-$soVersion.so.0.0.0 PATCH() { @@ -117,7 +123,7 @@ INSTALL() make install for la in "" -mso -parser -spreadsheet-model; do - library=liborcus$la-0.13 + library=liborcus$la-$soVersion rm $libDir/$library.la prepareInstalledDevelLib $library done