From 7f5e120f08c13d082e140626e1afc40949e6f58c Mon Sep 17 00:00:00 2001 From: Kacper Kasper Date: Sun, 29 Jun 2014 19:17:33 +0200 Subject: [PATCH] Fixes for libqt4 * Fix policy violations introduced by my previous change (sorry) * Change library versions where needed --- dev-qt/libqt4/libqt4-4.8.6.1.recipe | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dev-qt/libqt4/libqt4-4.8.6.1.recipe b/dev-qt/libqt4/libqt4-4.8.6.1.recipe index 6aeb3a088..11021dffa 100644 --- a/dev-qt/libqt4/libqt4-4.8.6.1.recipe +++ b/dev-qt/libqt4/libqt4-4.8.6.1.recipe @@ -10,7 +10,7 @@ SRC_FILENAME="libqt4-$portVersion.tar.gz" SOURCE_DIR="qt4-4.8.6-haiku-1" LICENSE="GNU LGPL v2.1" COPYRIGHT="2014 Digia Plc and/or its subsidiary(-ies)." -REVISION="2" +REVISION="3" CHECKSUM_SHA256="8683b000622df6348016cea132a272ebd39f70b1b0c89b9bb043f4f0a88d879d" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then @@ -26,7 +26,7 @@ PROVIDES=" libqt4$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:qtconfig$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:qsystray$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libphonon$secondaryArchSuffix = $portVersion compat >= 4.8 + lib:libphonon$secondaryArchSuffix = 4.4.0 compat >= 4 lib:libQt3Support$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtCLucene$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtCore$secondaryArchSuffix = $portVersion compat >= 4.8 @@ -42,7 +42,7 @@ PROVIDES=" lib:libQtSql$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtSvg$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtTest$secondaryArchSuffix = $portVersion compat >= 4.8 - lib:libQtWebKit$secondaryArchSuffix = $portVersion compat >= 4.8 + lib:libQtWebKit$secondaryArchSuffix = 4.9.4 compat >= 4 lib:libQtXml$secondaryArchSuffix = $portVersion compat >= 4.8 lib:libQtXmlPatterns$secondaryArchSuffix = $portVersion compat >= 4.8 " @@ -107,7 +107,7 @@ PROVIDES_devel=" cmd:uic3$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:xmlpatterns$secondaryArchSuffix = $portVersion compat >= 4.8 cmd:xmlpatternsvalidator$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libphonon$secondaryArchSuffix = $portVersion compat >= 4.8 + devel:libphonon$secondaryArchSuffix = 4.4.0 compat >= 4 devel:libQt3Support$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtCLucene$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtCore$secondaryArchSuffix = $portVersion compat >= 4.8 @@ -123,7 +123,7 @@ PROVIDES_devel=" devel:libQtSql$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtSvg$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtTest$secondaryArchSuffix = $portVersion compat >= 4.8 - devel:libQtWebKit$secondaryArchSuffix = $portVersion compat >= 4.8 + devel:libQtWebKit$secondaryArchSuffix = 4.9.4 compat >= 4 devel:libQtXml$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtXmlPatterns$secondaryArchSuffix = $portVersion compat >= 4.8 devel:libQtUiTools$secondaryArchSuffix = $portVersion compat >= 4.8 @@ -131,6 +131,8 @@ PROVIDES_devel=" REQUIRES_devel=" libqt4$secondaryArchSuffix == $portVersion base + haiku$secondaryArchSuffix >= $haikuVersion + lib:libz$secondaryArchSuffix " BUILD()