From a448470c2bd2e5dd11e33428d813bfdf7cd0413c Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sun, 3 Mar 2024 19:52:31 +0100 Subject: [PATCH] qcoro, add libversion (#10180) --- dev-qt/qcoro/qcoro_qt5-0.9.0.recipe | 32 ++++++++++++++++++----------- dev-qt/qcoro/qcoro_qt6-0.9.0.recipe | 32 ++++++++++++++++++----------- 2 files changed, 40 insertions(+), 24 deletions(-) diff --git a/dev-qt/qcoro/qcoro_qt5-0.9.0.recipe b/dev-qt/qcoro/qcoro_qt5-0.9.0.recipe index 030ea1507..f672b51b4 100644 --- a/dev-qt/qcoro/qcoro_qt5-0.9.0.recipe +++ b/dev-qt/qcoro/qcoro_qt5-0.9.0.recipe @@ -4,7 +4,7 @@ HOMEPAGE="https://github.com/danvratil/qcoro/" COPYRIGHT="2015-2022 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/danvratil/qcoro/archive/refs/tags/v$portVersion.tar.gz" CHECKSUM_SHA256="cfaf6b778450f06adac4ce5e353eb6eae213a3b62b8c8740520d58cf9fe3ec1a" SOURCE_DIR="qcoro-$portVersion" @@ -12,13 +12,16 @@ SOURCE_DIR="qcoro-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" qcoro_qt5$secondaryArchSuffix = $portVersion - lib:libQCoro5Core$secondaryArchSuffix - lib:libQCoro5Network$secondaryArchSuffix - lib:libQCoro5Qml$secondaryArchSuffix - lib:libQCoro5Quick$secondaryArchSuffix - lib:libQCoro5WebSockets$secondaryArchSuffix + lib:libQCoro5Core$secondaryArchSuffix = $libVersionCompat + lib:libQCoro5Network$secondaryArchSuffix = $libVersionCompat + lib:libQCoro5Qml$secondaryArchSuffix = $libVersionCompat + lib:libQCoro5Quick$secondaryArchSuffix = $libVersionCompat + lib:libQCoro5WebSockets$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -27,11 +30,11 @@ REQUIRES=" PROVIDES_devel=" qcoro_qt5${secondaryArchSuffix}_devel = $portVersion - devel:libQCoro5Core$secondaryArchSuffix - devel:libQCoro5Network$secondaryArchSuffix - devel:libQCoro5Qml$secondaryArchSuffix - devel:libQCoro5Quick$secondaryArchSuffix - devel:libQCoro5WebSockets$secondaryArchSuffix + devel:libQCoro5Core$secondaryArchSuffix = $libVersionCompat + devel:libQCoro5Network$secondaryArchSuffix = $libVersionCompat + devel:libQCoro5Qml$secondaryArchSuffix = $libVersionCompat + devel:libQCoro5Quick$secondaryArchSuffix = $libVersionCompat + devel:libQCoro5WebSockets$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" qcoro_qt5$secondaryArchSuffix == $portVersion base @@ -69,7 +72,12 @@ INSTALL() { ninja -C build_qt5 install - prepareInstalledDevelLibs libQCoro5Core libQCoro5Network libQCoro5Qml libQCoro5Quick libQCoro5WebSockets + prepareInstalledDevelLibs \ + libQCoro5Core \ + libQCoro5Network \ + libQCoro5Qml \ + libQCoro5Quick \ + libQCoro5WebSockets packageEntries devel \ $developDir \ diff --git a/dev-qt/qcoro/qcoro_qt6-0.9.0.recipe b/dev-qt/qcoro/qcoro_qt6-0.9.0.recipe index da511da03..9085a4851 100644 --- a/dev-qt/qcoro/qcoro_qt6-0.9.0.recipe +++ b/dev-qt/qcoro/qcoro_qt6-0.9.0.recipe @@ -4,7 +4,7 @@ HOMEPAGE="https://github.com/danvratil/qcoro/" COPYRIGHT="2015-2022 The Qt Company Ltd." LICENSE="GNU LGPL v2.1 GNU LGPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/danvratil/qcoro/archive/refs/tags/v$portVersion.tar.gz" CHECKSUM_SHA256="cfaf6b778450f06adac4ce5e353eb6eae213a3b62b8c8740520d58cf9fe3ec1a" SOURCE_DIR="qcoro-$portVersion" @@ -12,13 +12,16 @@ SOURCE_DIR="qcoro-$portVersion" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" qcoro_qt6$secondaryArchSuffix = $portVersion - lib:libQCoro6Core$secondaryArchSuffix - lib:libQCoro6Network$secondaryArchSuffix - lib:libQCoro6Qml$secondaryArchSuffix - lib:libQCoro6Quick$secondaryArchSuffix - lib:libQCoro6WebSockets$secondaryArchSuffix + lib:libQCoro6Core$secondaryArchSuffix = $libVersionCompat + lib:libQCoro6Network$secondaryArchSuffix = $libVersionCompat + lib:libQCoro6Qml$secondaryArchSuffix = $libVersionCompat + lib:libQCoro6Quick$secondaryArchSuffix = $libVersionCompat + lib:libQCoro6WebSockets$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -31,11 +34,11 @@ REQUIRES=" PROVIDES_devel=" qcoro_qt6${secondaryArchSuffix}_devel = $portVersion - devel:libQCoro6Core$secondaryArchSuffix - devel:libQCoro6Network$secondaryArchSuffix - devel:libQCoro6Qml$secondaryArchSuffix - devel:libQCoro6Quick$secondaryArchSuffix - devel:libQCoro6WebSockets$secondaryArchSuffix + devel:libQCoro6Core$secondaryArchSuffix = $libVersionCompat + devel:libQCoro6Network$secondaryArchSuffix = $libVersionCompat + devel:libQCoro6Qml$secondaryArchSuffix = $libVersionCompat + devel:libQCoro6Quick$secondaryArchSuffix = $libVersionCompat + devel:libQCoro6WebSockets$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" qcoro_qt6$secondaryArchSuffix == $portVersion base @@ -75,7 +78,12 @@ INSTALL() # Qt6 install ninja -C build_qt6 install - prepareInstalledDevelLibs libQCoro6Core libQCoro6Network libQCoro6Qml libQCoro6Quick libQCoro6WebSockets + prepareInstalledDevelLibs \ + libQCoro6Core \ + libQCoro6Network \ + libQCoro6Qml \ + libQCoro6Quick \ + libQCoro6WebSockets packageEntries devel \ $developDir \