diff options
author | Davide Pesavento <pesa@gentoo.org> | 2015-05-04 14:02:19 +0000 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2015-05-04 14:02:19 +0000 |
commit | 6fc4a7a55606e422c57ea85dbc081abb95b84725 (patch) | |
tree | f9dc41cb56d57dfe5397f1946c0b3f297debcd5c /dev-util | |
parent | Remove atlas support, fixes bug #541524, fixes https://github.com/gentoo/gent... (diff) | |
download | historical-6fc4a7a55606e422c57ea85dbc081abb95b84725.tar.gz historical-6fc4a7a55606e422c57ea85dbc081abb95b84725.tar.bz2 historical-6fc4a7a55606e422c57ea85dbc081abb95b84725.zip |
Backport two upstream patches, one of which fixes bug 548086.
Thanks to RazrFalcon for reporting and Jake Petroules for the quick fix.
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/qbs/ChangeLog | 11 | ||||
-rw-r--r-- | dev-util/qbs/Manifest | 34 | ||||
-rw-r--r-- | dev-util/qbs/files/1.4.0-fix-plugins-destdir.patch | 38 | ||||
-rw-r--r-- | dev-util/qbs/files/1.4.0-install-missing-header.patch | 75 | ||||
-rw-r--r-- | dev-util/qbs/qbs-1.4.0-r1.ebuild (renamed from dev-util/qbs/qbs-1.4.0.ebuild) | 10 |
5 files changed, 145 insertions, 23 deletions
diff --git a/dev-util/qbs/ChangeLog b/dev-util/qbs/ChangeLog index 3f15a8830557..c9d02e69f628 100644 --- a/dev-util/qbs/ChangeLog +++ b/dev-util/qbs/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-util/qbs # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.16 2015/05/03 11:40:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/ChangeLog,v 1.17 2015/05/04 14:02:12 pesa Exp $ + +*qbs-1.4.0-r1 (04 May 2015) + + 04 May 2015; Davide Pesavento <pesa@gentoo.org> + +files/1.4.0-fix-plugins-destdir.patch, + +files/1.4.0-install-missing-header.patch, +qbs-1.4.0-r1.ebuild, + -qbs-1.4.0.ebuild: + Backport two upstream patches, one of which fixes bug 548086. Thanks to + RazrFalcon for reporting and Jake Petroules for the quick fix. 03 May 2015; Davide Pesavento <pesa@gentoo.org> qbs-1.4.0.ebuild: Add examples USE flag. diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index fadc657d9c52..653a9b1dbf89 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,26 +1,28 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX 1.4.0-fix-plugins-destdir.patch 1142 SHA256 7bf0b0c2d240082ba47e093287acd560a743c4a808bde6fb06dd3f55bda37b6f SHA512 76266aa62ef8c0bb11afd5550920fd59590780a248a48e22a24af4ecea8343587b983c5f9bfd399f1df54464f681eee9b81ab15458f28d8c88f47089f367db22 WHIRLPOOL 62ff76f3c51255a1f3f7a9481c985e67f8853bfbef6a426771d0574349f53a3dfdc17f36903f40f1cf385183a54854a00969e9b23f0d3386aacd28b91d41c999 +AUX 1.4.0-install-missing-header.patch 2551 SHA256 7931259255935e52fbd0ada6b9ecb23e5076076527269e7aa6458c062d168d44 SHA512 8f79cb321c7f2b8bae6921c513442572a547f5de59d15f2f1b7ad879003a9b0d5b9b6ef6f2bd74e1a87ef11de1de65091b39b3648958abf2fc2725517242b65c WHIRLPOOL 3daad07c4e2934fcf4c5dbc616cc9daf893dfedd5620c57f0ad2fb17ed3d09e18ee9466b1911c403858f3a0b3aad5a2b1b459a13c5214e4399cc946cfc5abd73 DIST qbs-1.4.0.src.tar.gz 785064 SHA256 d384d0368c3e32ab3bdd9d85c96bb037aa1f650e77326ab5cd400a38cfef33f3 SHA512 2271393670dd22eefb35099b84a51a7456321763e8414dc5ce96d9675b062ffa2cb7b4f89f52b74ef3e05c2ad62301e3406e3a0adc313f475d534a9a75cd577d WHIRLPOOL 06dbe42ad7244b7ca1576a444ed6f09cf64eb89455b36467a32058ce21cf207d635f7f71c6eed843b7afae0b6416e9f846ea719910c60fc45f90ecd4ec4fa654 -EBUILD qbs-1.4.0.ebuild 2214 SHA256 7a8f8b12fa06f90d61e284c96dcfdd75ad0cce51d4b5913b66f12d8b235a0e36 SHA512 d614887cacd076fba0affa4256c7e764eaba7aad3c8ead6c4d1809fa4aabaaa774132020415c1d478dde9c26685e1db0f476a32f71eb3ccd6b21213265ed11de WHIRLPOOL ba1e98b293ade48304690214331d541bc40f424c04e8ede05d4483e08137e6fb280871e67c04e0bbc9ba888a69861cbecfbdd3ce1e0a040d3255201f3d5e909d -MISC ChangeLog 2682 SHA256 2b51bbd11a8e455d0d6778aee54c0ec0fb7475c8b7be99378c78e37776606e68 SHA512 e0de4ff20f9a0f3e39777ac89fc5c8ea8ce2d746b53eacf80a59690719da87791162c9907aa19120eb862a5947d8aa974bf5184518a2496a0292fd8ec5abbc34 WHIRLPOOL fda57655a19983137a13485433cfbc428f210eccbe1eb6f4cbd8de326b830a47b46a99d85f06cee97db12e4f077863083d8e9d93e0cac5d4186494be3677bcaf +EBUILD qbs-1.4.0-r1.ebuild 2155 SHA256 1a346caa199972e286699fa40c0bc8cead9f91d865ac880fd7a474716ab0f5f8 SHA512 c0b89f62ffaa75cd954e6a2359359fb1c7eed7cc7f6969536a65fcaf828570e3b26cb2fdb39a997ccea7b3e4dce0ef695307c85a81e54515d157f207cfe0601e WHIRLPOOL f1097ea8a6e1bf95ecee5f2c43111ab57800ffcc7af564ee83341beb3b81f9754b9485a2f1204b7e5be11494769a25e7ba9dd40cea8396fd85566e24838b9882 +MISC ChangeLog 3031 SHA256 9f60cc0ca7f0bd4e6f087a98e530d82d53fc73423ef59b501f060aa39b31dca8 SHA512 dc397b6f9e3614a907295ccc5dfa6c799d8799122cc62777a971148147c04726dd5c89c8736184daab6712d29218dc93c778902e8845bb5966abad1467163553 WHIRLPOOL 2bef1e6a524b844b4fcdccf43a4eeafdfa6068e8744403aaecb4751a52fbf902cfcd7e814091bcde31b70b67196e3c71584f54d4aa33bdf0303b0df8f1254017 MISC metadata.xml 155 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7 SHA512 f05c8982778167c3667c9246b9730ba49fec2967731ed2c615e31a7fddc220fcea8c0843caa70a14957c8c4910892c512b6f2e00a9724d65e6032e1289f4562a WHIRLPOOL 25ccd49f04da07c8525fe18b21229764bb4104938abefc6c953bf9caa533dd5c10ae7b3f80a1251182e6c1520c09383d9f1d0ac1dc74832a99299c9be27406c4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCABmBQJVRgkvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJVR3vrXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE -QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9xR8QAJWQhH3bHahd5iSAqGEm7FgX -RJV23gtd5vMjty5iWXQ/ZJ3YhEHxdxP0eCw4wgyybnMazdA7cbsF2eplxXr3zlcZ -0cFlwdEnvLd47VuPtk86dj1+Vm2/oYlgst3vDsplc7whOsFTsU9+5tZL0LCGCwBf -Nxbg4FI9jnVr1tTU1v9wh5iCQJD7b1nijR50UuhJz9q5VgJA67L99HeFozVgXAKs -PFV9RMEGAcQ+wP1ZZYc15cUT6AU5kX+JbGQ3IoRgFGB440w5BCcdwbOhLhN/R3N5 -n73lxQjFJEvbhopZXs3NJGCwEBxa7DlRqTPSjQBx42kMuhUglA3SDCkisDUOBHWf -YAcuDDdZJtM98mbgolQpQwaquar+n9bAMS9iL49hx1+EmAXQMuS2Jh3ZX0vNRsFD -Z/ATL8yRBa7rw7MSYx/wOhxHsjOr8jO/2ol95JxGnb1e0fxInaNowDCxvDnNlCrj -GaA/Tf52dEeFnvmqvW5ZoqVaFWkPt7hz7cG0NU1/UijkiOTTWBIV09JiOxKkLvAB -V80n+kQJQqplQpSYm/LGCOOisoyo6qJLk3y5OpAr8TNUvJ6egIiX75vtvsbp4WQt -a46AEzJcbmvGv+pJEQlMBw0MhKvIpEYrJ0pyoe1UIZrGVV+zM+DVPUjanvxDJR6f -4jjGCD+mosYLMEn4MheH -=poUv +QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9DeEP/1hdrUjXwHwNWZ5MUpbU1cKC +KNHYXIT/f9Ku0M7yEXWaAcuKCcqzBMA0E4XYVkvRnokxCL4L5aP8gH7d5FYdkeTd +THLpXXFseuYyNXW+bUnVvPDxBq3fZ5CMp+vuRjOwkQZgE4PF1gEhGhd7ZnxdcPbk +3r2XeDWAJSW1u0WbLr52jmXD8nYDTLyYqwHnHmTAkfMFPQiUqXjOJjalBZHF9ggy +io2ULwpekBdebhLqHlqFAyuRdXkE7eXAWDX8mgIBzuF7pBxUlr2l1d9u7Vd1Y6Af +DlwQ13Zc4p0ayPI5Mlf7gbUhekN0eyA9fqcUz4m2/3CdycSm7xYgqqCedSfjLJHV +yNc5f3u6ycmnYN7E39g7ZqjYPyhTi1k2vxWtdgZHjon/RJypyD9xqKXrYlnrPAu8 +Bel4h85j60tc5v0aERCrNIjGuF0ozL86FLywv5yyo+n//VPxBN1ggW5HVM2bciem +MYpYPuYi09TBzanCNAUnuV3vuR45dZLINh0qfUx3AShiFC5hgqkJd5UiULMIbLi1 +43UTLBFOMGq+84XXAHls2Rs+OHnMsFT6W+KtI0mOFbGw6whWoDL9axClLeHLEBJW +Bpwx7HU3UanW0tiIiKnadvklLk8fZpV/Y2h332CkRyiU7G9Mjw4xIbtF5Inqlz8d +nAOqrcgr0IyKhMWX4Nnp +=5rj/ -----END PGP SIGNATURE----- diff --git a/dev-util/qbs/files/1.4.0-fix-plugins-destdir.patch b/dev-util/qbs/files/1.4.0-fix-plugins-destdir.patch new file mode 100644 index 000000000000..733b4cf1d66b --- /dev/null +++ b/dev-util/qbs/files/1.4.0-fix-plugins-destdir.patch @@ -0,0 +1,38 @@ +From 15a64cec8b3ca7111fa631861fce8227a9a3dda8 Mon Sep 17 00:00:00 2001 +From: Jake Petroules <jake.petroules@petroules.com> +Date: Thu, 30 Apr 2015 04:05:54 -0700 +Subject: qmake: fix DESTDIR of qbs plugin shared libraries. + +Change-Id: Ib8941b0d9232155545792215803556be5a5d4d17 +Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> +--- + src/plugins/plugins.pri | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri +index 3775c60..70bc0e0 100644 +--- a/src/plugins/plugins.pri ++++ b/src/plugins/plugins.pri +@@ -1,7 +1,9 @@ ++include(../library_dirname.pri) ++ + !isEmpty(QBS_PLUGINS_BUILD_DIR) { + destdirPrefix = $${QBS_PLUGINS_BUILD_DIR} + } else { +- destdirPrefix = $$shadowed($$PWD)/../../lib ++ destdirPrefix = $$shadowed($$PWD)/../../$${QBS_LIBRARY_DIRNAME} + } + DESTDIR = $${destdirPrefix}/qbs/plugins + TEMPLATE = lib +@@ -10,8 +12,6 @@ CONFIG += depend_includepath + CONFIG += shared + unix: CONFIG += plugin + +-include(../library_dirname.pri) +- + !isEmpty(QBS_PLUGINS_INSTALL_DIR): \ + installPrefix = $${QBS_PLUGINS_INSTALL_DIR} + else: \ +-- +2.4.0 + diff --git a/dev-util/qbs/files/1.4.0-install-missing-header.patch b/dev-util/qbs/files/1.4.0-install-missing-header.patch new file mode 100644 index 000000000000..3af545f16de9 --- /dev/null +++ b/dev-util/qbs/files/1.4.0-install-missing-header.patch @@ -0,0 +1,75 @@ +From d2aa95c50c6b884905ed93484f4d3b0b39ef68c5 Mon Sep 17 00:00:00 2001 +From: Jake Petroules <jake.petroules@petroules.com> +Date: Sat, 2 May 2015 14:24:26 -0700 +Subject: Install headers necessary for Qt Creator to build with + QBS_INSTALL_DIR. + +Task-number: QBS-792 +Change-Id: I4930970c97176d6598a780e917eeb8ccc17124ce +Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> +--- + src/app/qbs/commandlinefrontend.cpp | 1 + + src/lib/corelib/corelib.qbs | 2 +- + src/lib/corelib/qbs.h | 1 - + src/lib/corelib/tools/tools.pri | 1 + + 4 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp +index c4ec96b..3602d41 100644 +--- a/src/app/qbs/commandlinefrontend.cpp ++++ b/src/app/qbs/commandlinefrontend.cpp +@@ -39,6 +39,7 @@ + #include <api/runenvironment.h> + #include <logging/translator.h> + #include <tools/qbsassert.h> ++#include <tools/projectgeneratormanager.h> + + #include <QDir> + #include <QFile> +diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs +index a5fb92a..8dca80d 100644 +--- a/src/lib/corelib/corelib.qbs ++++ b/src/lib/corelib/corelib.qbs +@@ -304,7 +304,6 @@ QbsLibrary { + "cleanoptions.cpp", + "codelocation.cpp", + "commandechomode.cpp", +- "commandechomode.h", + "error.cpp", + "executablefinder.cpp", + "executablefinder.h", +@@ -356,6 +355,7 @@ QbsLibrary { + "buildoptions.h", + "cleanoptions.h", + "codelocation.h", ++ "commandechomode.h", + "error.h", + "generateoptions.h", + "installoptions.h", +diff --git a/src/lib/corelib/qbs.h b/src/lib/corelib/qbs.h +index 73bea54..8b5bfe6 100644 +--- a/src/lib/corelib/qbs.h ++++ b/src/lib/corelib/qbs.h +@@ -41,7 +41,6 @@ + #include "tools/cleanoptions.h" + #include "tools/error.h" + #include "tools/generateoptions.h" +-#include "tools/projectgeneratormanager.h" + #include "tools/installoptions.h" + #include "tools/preferences.h" + #include "tools/profile.h" +diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri +index 3bf459d..17beb63 100644 +--- a/src/lib/corelib/tools/tools.pri ++++ b/src/lib/corelib/tools/tools.pri +@@ -86,6 +86,7 @@ qbs_enable_unit_tests { + $$PWD/architectures.h \ + $$PWD/cleanoptions.h \ + $$PWD/codelocation.h \ ++ $$PWD/commandechomode.h \ + $$PWD/error.h \ + $$PWD/settings.h \ + $$PWD/settingsmodel.h \ +-- +2.4.0 + diff --git a/dev-util/qbs/qbs-1.4.0.ebuild b/dev-util/qbs/qbs-1.4.0-r1.ebuild index 39cbfdf6ff26..7a891a86195a 100644 --- a/dev-util/qbs/qbs-1.4.0.ebuild +++ b/dev-util/qbs/qbs-1.4.0-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0.ebuild,v 1.3 2015/05/03 11:40:23 pesa Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/qbs/qbs-1.4.0-r1.ebuild,v 1.1 2015/05/04 14:02:12 pesa Exp $ EAPI=5 -inherit multilib pax-utils qmake-utils +inherit eutils multilib pax-utils qmake-utils DESCRIPTION="Qt Build Suite" HOMEPAGE="http://wiki.qt.io/Qbs" @@ -34,10 +34,8 @@ DEPEND="${RDEPEND} " src_prepare() { - # fix plugins libdir - # v1.4.1 will contain a fix: https://codereview.qt-project.org/111532 - sed -i -e "/destdirPrefix/ s:/lib:/$(get_libdir):" \ - src/plugins/plugins.pri || die + epatch "${FILESDIR}"/${PV}-fix-plugins-destdir.patch + epatch "${FILESDIR}"/${PV}-install-missing-header.patch # disable tests that require nodejs (bug 527652) sed -i -e 's/!haveNodeJs()/true/' \ |