From a58d216c45f106fa7cc8d3a278457d4e62ca4068 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 14 May 2017 21:28:39 +0200 Subject: [PATCH] Use explicit libQt5* in REQUIRES/BUILD_REQUIRES. --- media-gfx/librecad/librecad-2.1.3.recipe | 24 +++++++++++++------ media-sound/cantata/cantata-2.0.1.recipe | 17 +++++++++---- .../gnuplot/gnuplot-5.0.6.recipe | 16 ++++++++++--- x11-libs/qscintilla/qscintilla-2.9.1.recipe | 16 +++++++++---- 4 files changed, 54 insertions(+), 19 deletions(-) diff --git a/media-gfx/librecad/librecad-2.1.3.recipe b/media-gfx/librecad/librecad-2.1.3.recipe index 52f9abb06..aecfd65c9 100644 --- a/media-gfx/librecad/librecad-2.1.3.recipe +++ b/media-gfx/librecad/librecad-2.1.3.recipe @@ -6,7 +6,7 @@ translations." HOMEPAGE="http://librecad.org/" COPYRIGHT="2017 LibreCAD" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/LibreCAD/LibreCAD/archive/$portVersion.tar.gz" CHECKSUM_SHA256="74c4ede409b13d0365c65c0cd52dba04f1049530f6df706dc905443d5e60db06" PATCHES="librecad-$portVersion.patchset" @@ -22,22 +22,32 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - lib:libqt5$secondaryArchSuffix lib:libfreetype$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Svg$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix " BUILD_REQUIRES=" - boost${secondaryArchSuffix}_devel + haiku${secondaryArchSuffix}_devel + devel:libboost_system$secondaryArchSuffix devel:libfreetype$secondaryArchSuffix devel:libGL$secondaryArchSuffix - devel:libqt5$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5PrintSupport$secondaryArchSuffix + devel:libQt5Svg$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:qmake$secondaryArchSuffix - cmd:make cmd:g++$secondaryArchSuffix + cmd:make cmd:pkg_config$secondaryArchSuffix + cmd:qmake$secondaryArchSuffix >= 5 + cmd:which " BUILD() diff --git a/media-sound/cantata/cantata-2.0.1.recipe b/media-sound/cantata/cantata-2.0.1.recipe index 8769ed98d..7176bce6e 100644 --- a/media-sound/cantata/cantata-2.0.1.recipe +++ b/media-sound/cantata/cantata-2.0.1.recipe @@ -46,17 +46,26 @@ BUILD_REQUIRES=" devel:libavcodec$secondaryArchSuffix devel:libavformat$secondaryArchSuffix devel:libavutil$secondaryArchSuffix - devel:libqt5$secondaryArchSuffix devel:libmpg123$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix + devel:libQt5Svg$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5DBus$secondaryArchSuffix + devel:libQt5Multimedia$secondaryArchSuffix + devel:libQt5Sql$secondaryArchSuffix + devel:libQt5Xml$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Concurrent$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix devel:libtag$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake - cmd:gcc${secondaryArchSuffix} - cmd:ld${secondaryArchSuffix} + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make - cmd:pkg_config${secondaryArchSuffix} + cmd:pkg_config$secondaryArchSuffix " BUILD() diff --git a/sci-visualization/gnuplot/gnuplot-5.0.6.recipe b/sci-visualization/gnuplot/gnuplot-5.0.6.recipe index 435a0a9b5..d2f4c31e6 100644 --- a/sci-visualization/gnuplot/gnuplot-5.0.6.recipe +++ b/sci-visualization/gnuplot/gnuplot-5.0.6.recipe @@ -6,7 +6,7 @@ as a plotting engine by third-party applications like Octave." HOMEPAGE="http://www.gnuplot.info" COPYRIGHT="1986 - 1993, 1998, 2004 Thomas Williams, Colin Kelley" LICENSE="Gnuplot" -REVISION="1" +REVISION="2" SOURCE_URI="http://downloads.sourceforge.net/gnuplot/gnuplot-$portVersion.tar.gz" CHECKSUM_SHA256="5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460" @@ -27,7 +27,12 @@ REQUIRES=" lib:libjpeg$secondaryArchSuffix lib:libncurses$secondaryArchSuffix lib:libpng16$secondaryArchSuffix - lib:libqt5$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5Network$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Svg$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix lib:libreadline$secondaryArchSuffix lib:libtiff$secondaryArchSuffix lib:libvpx$secondaryArchSuffix @@ -42,7 +47,12 @@ BUILD_REQUIRES=" devel:libgd$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix # devel:libpango_1.0$secondaryArchSuffix - devel:libqt5$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5Network$secondaryArchSuffix + devel:libQt5PrintSupport$secondaryArchSuffix + devel:libQt5Svg$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix devel:libreadline$secondaryArchSuffix devel:libvpx$secondaryArchSuffix devel:libz$secondaryArchSuffix diff --git a/x11-libs/qscintilla/qscintilla-2.9.1.recipe b/x11-libs/qscintilla/qscintilla-2.9.1.recipe index 3b73037e9..d89b93316 100644 --- a/x11-libs/qscintilla/qscintilla-2.9.1.recipe +++ b/x11-libs/qscintilla/qscintilla-2.9.1.recipe @@ -25,7 +25,7 @@ This version of QScintilla is based on Scintilla v3.5.4." HOMEPAGE="https://www.riverbankcomputing.com/software/qscintilla/" COPYRIGHT="2015 Riverbank Computing Limited" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="http://sourceforge.net/projects/pyqt/files/QScintilla2/QScintilla-$portVersion/QScintilla-gpl-$portVersion.zip" CHECKSUM_SHA256="00b362c19c6578e7a1ebd4faf0310784af082795b7fc111549e5774c4e513be3" SOURCE_DIR="QScintilla-gpl-$portVersion" @@ -38,8 +38,11 @@ PROVIDES=" lib:libqscintilla2$secondaryArchSuffix = $portVersion " REQUIRES=" - haiku${secondaryArchSuffix} - lib:libqt5$secondaryArchSuffix + haiku$secondaryArchSuffix + lib:libQt5Core$secondaryArchSuffix + lib:libQt5Gui$secondaryArchSuffix + lib:libQt5PrintSupport$secondaryArchSuffix + lib:libQt5Widgets$secondaryArchSuffix lib:libgl$secondaryArchSuffix " @@ -54,11 +57,14 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - devel:libqt5$secondaryArchSuffix + devel:libQt5Core$secondaryArchSuffix + devel:libQt5Gui$secondaryArchSuffix + devel:libQt5PrintSupport$secondaryArchSuffix + devel:libQt5Widgets$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:make - cmd:g++${secondaryArchSuffix} + cmd:g++$secondaryArchSuffix " BUILD()