summaryrefslogtreecommitdiff
path: root/dev-util/qbs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-30 17:36:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-30 17:36:28 +0100
commit7014a5a3ea0feffab9701fdd6b64cc7667a985af (patch)
treef2cbbaa8bb9209cd15208721103228336149b799 /dev-util/qbs
parent7a86906b67693cc65671d3e1476835d3a7e13092 (diff)
gentoo resync : 30.06.2019
Diffstat (limited to 'dev-util/qbs')
-rw-r--r--dev-util/qbs/Manifest4
-rw-r--r--dev-util/qbs/qbs-1.13.1.ebuild (renamed from dev-util/qbs/qbs-1.13.0.ebuild)9
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest
index eb8fc2d48334..6305de26fb3b 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,5 @@
DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
-DIST qbs-src-1.13.0.tar.gz 4323291 BLAKE2B ae5e20e38d2667acc3c6b9c62c06ec7733c94d8c8dcc7a9145e288b507e529b12afab27ea2e2761604605609d678d1f1dc0fb3f0e1448bc1aeac9fd4ea3fa37d SHA512 98207b39bb9e5926e218a4fc4da2c7b38160bdd8eac563ef3135be63076bd09763c895f23c3ef3d1640adb04bdc1977e1a66d10b6a9d243adc0414e7dffd4ade
+DIST qbs-src-1.13.1.tar.gz 4324622 BLAKE2B d64145f38aea95f4b7539a9652c276f4dddb4af8424142b45df77083c2c8821f0858827c6d8390ca70835e9bbd3eda02163b7e180ebb82eb90976afe727b4dd7 SHA512 1626a218665d380a8030bf4930be857399806643e7868bace6cafe269054ec560eb47e37e358acdb3edbbb15bc8f4ec9af55142d6bfe2ab5db0c8a08aa40d597
EBUILD qbs-1.12.2.ebuild 2863 BLAKE2B 4370fd9d166b14540048249ece2af983041e9416ee77e5908d206e94baed606fb7d99cccb9c0df7c958f41ff9dc9d13a598d194f8c12b9488f9a294f69d3a76f SHA512 8174e680c3d86b70f6560d93e5270d0b7385d1f950d8a9be26b7b362fde6e6f6dc73ff9bea9340fef781f7063f920bfff83668bcb6ab30c61fb64c209b4c71c2
-EBUILD qbs-1.13.0.ebuild 2809 BLAKE2B 6072be9c788ec4f6d7e7427dcb3779595d733d2476d543de5ef1add7ccf0f7e2cd1e3e6dbf42257849f228e86951010b73b20f0d6a19bdd36b466250391c2639 SHA512 26798ae3683306f9979255c073058dd1efef270efe923ca7deba82da1d2fae77a4862ce6888bf84c78382b89afe3bcadc3c66795b3846a44df2fb1e628bd21ae
+EBUILD qbs-1.13.1.ebuild 2945 BLAKE2B 8df19e63414683b53e3a899089f5c892b9d0ac1e9cc90431aebe10b61f71d2ca832a5afdf7a0198349c75b79f3fa2ea5f0bf24075f2fda093695af95df0c41c8 SHA512 024fe32bdff219a46bfebbef5a1ef9244ececd358e01f9bbded43d65df4f06e93779738941da4fcfc5935e93be2f19ae156957c6386e5811e84f03bb97fd0467
MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.13.0.ebuild b/dev-util/qbs/qbs-1.13.1.ebuild
index 01828115c967..0eea5267ba76 100644
--- a/dev-util/qbs/qbs-1.13.0.ebuild
+++ b/dev-util/qbs/qbs-1.13.1.ebuild
@@ -31,7 +31,11 @@ DEPEND="${RDEPEND}
dev-qt/qdoc:5
dev-qt/qthelp:5
)
- test? ( dev-qt/qtdeclarative:5 )
+ test? (
+ dev-qt/linguist-tools:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ )
"
S=${WORKDIR}/${MY_P}
@@ -48,6 +52,9 @@ src_prepare() {
-e '/qbslibdir =/ s:/lib:/$$QBS_LIBRARY_DIRNAME:' \
static-res.pro || die
+ # respect LDFLAGS
+ sed -i -e '/QMAKE_LFLAGS =/ s/ = / += /' src/lib/library.pri || die
+
echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro
# skip several tests that fail and/or have additional deps