1 |
commit: f7476b34e47b693e304aa3e404f5fe85fe2a9f8f |
2 |
Author: Asgeir Bjarni Ingvarsson <asgeir <AT> fundinn <DOT> org> |
3 |
AuthorDate: Mon Apr 30 02:15:37 2018 +0000 |
4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 30 03:09:30 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7476b34 |
7 |
|
8 |
dev-util/qbs: 1.11 version bump |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/8209 |
11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
12 |
|
13 |
dev-util/qbs/Manifest | 1 + |
14 |
dev-util/qbs/qbs-1.11.0.ebuild | 120 +++++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 121 insertions(+) |
16 |
|
17 |
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest |
18 |
index 44d5445ca18..f646edf215f 100644 |
19 |
--- a/dev-util/qbs/Manifest |
20 |
+++ b/dev-util/qbs/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST qbs-src-1.10.1.tar.gz 4140847 BLAKE2B cbd9770d426fdf70645f5c40fbc8956309845980776b920a0e5e612d0cbf63a9a1352e5ab43a98afd9a5a9db396d0b7bbd840b4581787aaafabad0982c6edca8 SHA512 e2019f59124cf8409c12bc108982f1c4c99dcff9d6272c26bee9d690327dea28990c4081857b1b2bfec57e3b557d83e0b8085823dbd4d0988c483d971dc06bac |
23 |
+DIST qbs-src-1.11.0.tar.gz 4299668 BLAKE2B b17e5d0e65fd0c29bf7837d53eb5c5470e6f3a243b4cbd215a528c6657e5c4831e49b369034133f784122e358cce723bd78b26df8bd580ed570a71590a73af7d SHA512 123319aca79c4816fcfd839a7c7f3029c55eac4dc2c2a2bae7df891c15ef81de22bb7f6ad04bbdb39401473a3df15e41b88adcd0d5d2462c2ef3e62bf5e0f80a |
24 |
|
25 |
diff --git a/dev-util/qbs/qbs-1.11.0.ebuild b/dev-util/qbs/qbs-1.11.0.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..bfadc6296da |
28 |
--- /dev/null |
29 |
+++ b/dev-util/qbs/qbs-1.11.0.ebuild |
30 |
@@ -0,0 +1,120 @@ |
31 |
+# Copyright 1999-2018 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=6 |
35 |
+ |
36 |
+inherit qmake-utils |
37 |
+ |
38 |
+MY_P=${PN}-src-${PV} |
39 |
+ |
40 |
+DESCRIPTION="Modern build tool for software projects" |
41 |
+HOMEPAGE="https://wiki.qt.io/Qbs" |
42 |
+SRC_URI="http://download.qt.io/official_releases/${PN}/${PV}/${MY_P}.tar.gz" |
43 |
+ |
44 |
+LICENSE="|| ( LGPL-2.1 LGPL-3 )" |
45 |
+SLOT="0" |
46 |
+KEYWORDS="~amd64 ~arm ~x86" |
47 |
+IUSE="doc examples test" |
48 |
+ |
49 |
+# see bug 581874 for the qttest dep in RDEPEND |
50 |
+RDEPEND=" |
51 |
+ dev-qt/qtcore:5= |
52 |
+ dev-qt/qtgui:5 |
53 |
+ dev-qt/qtnetwork:5 |
54 |
+ dev-qt/qtscript:5 |
55 |
+ dev-qt/qtwidgets:5 |
56 |
+ dev-qt/qtxml:5 |
57 |
+ test? ( dev-qt/qttest:5 ) |
58 |
+" |
59 |
+DEPEND="${RDEPEND} |
60 |
+ doc? ( |
61 |
+ dev-qt/qdoc:5 |
62 |
+ dev-qt/qthelp:5 |
63 |
+ ) |
64 |
+ test? ( dev-qt/qtdeclarative:5 ) |
65 |
+" |
66 |
+ |
67 |
+S=${WORKDIR}/${MY_P} |
68 |
+ |
69 |
+src_prepare() { |
70 |
+ default |
71 |
+ |
72 |
+ # don't add /usr/include to INCLUDEPATH |
73 |
+ # avoids a build failure in qt-creator with gcc-6 (bug 618424) |
74 |
+ sed -i -e '/^INCLUDEPATH/ s:$${PWD}/\.\.::' src/lib/corelib/use_installed_corelib.pri || die |
75 |
+ |
76 |
+ if ! use examples; then |
77 |
+ sed -i -e '/INSTALLS +=/ s:examples::' static.pro || die |
78 |
+ fi |
79 |
+ |
80 |
+ # the qbsres target uses the newly built qbs binary, so we have to tell it where to find its libraries |
81 |
+ sed -i -e '/qbsres\.commands =/ a\LD_LIBRARY_PATH=$$shell_quote($$shell_path($$QBS_LIBRARY_DIRNAME)) \\' \ |
82 |
+ static-res.pro || die |
83 |
+ |
84 |
+ echo "SUBDIRS = $(usex test auto '')" >> tests/tests.pro |
85 |
+ |
86 |
+ # since 1.10, TestApi is either broken or requires more configuration |
87 |
+ sed -i -e '/\<api\>/ d' tests/auto/auto.pro || die |
88 |
+ |
89 |
+ # skip several tests that fail and/or have additional deps |
90 |
+ sed -i \ |
91 |
+ -e 's/findArchiver("7z")/""/' `# requires p7zip, fails` \ |
92 |
+ -e 's/findArchiver(binaryName,.*/"";/' `# requires zip and jar` \ |
93 |
+ -e 's/p\.value("nodejs\./true||&/' `# requires nodejs, bug 527652` \ |
94 |
+ -e 's/\(p\.value\|m_qbsStderr\.contains\)("typescript\./true||&/' `# requires nodejs and typescript` \ |
95 |
+ tests/auto/blackbox/tst_blackbox.cpp || die |
96 |
+ |
97 |
+ # requires jdk, fails, bug 585398 |
98 |
+ sed -i -e '/blackbox-java\.pro/ d' tests/auto/auto.pro || die |
99 |
+} |
100 |
+ |
101 |
+src_configure() { |
102 |
+ local myqmakeargs=( |
103 |
+ qbs.pro # bug 523218 |
104 |
+ -recursive |
105 |
+ CONFIG+=qbs_disable_rpath |
106 |
+ CONFIG+=qbs_enable_project_file_updates |
107 |
+ $(usex test 'CONFIG+=qbs_enable_unit_tests' '') |
108 |
+ QBS_INSTALL_PREFIX="${EPREFIX}/usr" |
109 |
+ QBS_LIBRARY_DIRNAME="$(get_libdir)" |
110 |
+ ) |
111 |
+ eqmake5 "${myqmakeargs[@]}" |
112 |
+} |
113 |
+ |
114 |
+src_test() { |
115 |
+ einfo "Setting up test environment in ${T}" |
116 |
+ |
117 |
+ export HOME=${T} |
118 |
+ export LD_LIBRARY_PATH=${S}/$(get_libdir) |
119 |
+ |
120 |
+ "${S}"/bin/qbs-setup-toolchains /usr/bin/gcc gcc || die |
121 |
+ "${S}"/bin/qbs-setup-qt "$(qt5_get_bindir)/qmake" qbs_autotests || die |
122 |
+ |
123 |
+ einfo "Running autotests" |
124 |
+ |
125 |
+ # simply exporting LD_LIBRARY_PATH doesn't work |
126 |
+ # we have to use a custom testrunner script |
127 |
+ local testrunner=${WORKDIR}/gentoo-testrunner |
128 |
+ cat <<-EOF > "${testrunner}" |
129 |
+ #!/bin/sh |
130 |
+ export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH:+:}\${LD_LIBRARY_PATH}" |
131 |
+ exec "\$@" |
132 |
+ EOF |
133 |
+ chmod +x "${testrunner}" |
134 |
+ |
135 |
+ emake TESTRUNNER="'${testrunner}'" check |
136 |
+} |
137 |
+ |
138 |
+src_install() { |
139 |
+ emake INSTALL_ROOT="${D}" install |
140 |
+ |
141 |
+ dodoc -r changelogs |
142 |
+ |
143 |
+ # install documentation |
144 |
+ if use doc; then |
145 |
+ emake docs |
146 |
+ dodoc -r doc/qbs/html |
147 |
+ dodoc doc/qbs.qch |
148 |
+ docompress -x /usr/share/doc/${PF}/qbs.qch |
149 |
+ fi |
150 |
+} |