diff options
Diffstat (limited to 'dev-util/qbs')
| -rw-r--r-- | dev-util/qbs/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/qbs/files/qbs-2.4.1-ldconfig.patch | 17 | ||||
| -rw-r--r-- | dev-util/qbs/qbs-2.3.1.ebuild | 90 | ||||
| -rw-r--r-- | dev-util/qbs/qbs-2.4.1-r1.ebuild (renamed from dev-util/qbs/qbs-2.4.1.ebuild) | 1 |
4 files changed, 20 insertions, 93 deletions
diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 5e0aff2add46..2942edcc70b7 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,6 +1,5 @@ AUX qbs-2.3.1-qtver.patch 196 BLAKE2B 6cfabd1bbd16b2e342ff9eeb2748ce2215ed25d18203f59e0f181f465e02dfe1e2416b8ab2b5c8eb3b5aa6ec9e7c37e938e389165b1a995ed7f48233f257af79 SHA512 f3f95fc9d1a96767d9a3e74ac428e9b00f4e460959d04298f3f6ecc99f5eb72a57290e6d248f82d1ba8ca7e655fe729b8320a77da585b145c48ac90b9a315181 -DIST qbs-src-2.3.1.tar.gz 5614581 BLAKE2B 92fa24d75248a3732cbd99b660141e56654574f1388d50d5359afef7b442889fa59c4ab4f029f055ee618c0222f94faba47ae9fff85f0fae26e95f2ba34995f9 SHA512 27ba33805b942cf8180e55bdd6c37ccfd2aeaa2e8c01ca7e7485720030dfad7c5f1a3f92b77bff97a7ebf8878e455758c8729005e8b03959d18106f945d8d42c +AUX qbs-2.4.1-ldconfig.patch 696 BLAKE2B eb0339773ebddbf913e09f6e50fc366b50b8a7974262e6f568da879cd96035d8c93cfe7c8e9a891f4716a5af3ceff27e0a753c5e6ccfe78481d696dd068e7cf7 SHA512 07bd268c6e95c306c1f69e29164e2e54b3290d415a96dac143c9438021acf8a8e42fbb1ae750308560279ac4762984dd74b4e18fe3be84a9c9933c9dd7d1a752 DIST qbs-src-2.4.1.tar.gz 5739646 BLAKE2B 5455779be27a5eed316372303ec4264a6af8238684e9c4ae46dffcf7f9038b9aaff75dab29c84e761808158ce60f408c46eac829ef226168ad86c85df2fe7cd2 SHA512 caeb9289a208ca227fc2a16c38d88594b3b958c33f9108f74463bfad412a07ac7f7c4f85b6a741d3ee4c842e5a5d980d88b9c279ff8636cb2e98f67a70ee54b3 -EBUILD qbs-2.3.1.ebuild 2385 BLAKE2B d666ad502f8097ed00f2a24fd378ddd8e48a485ef623d5db1074183287cbf6e7da02dcec4fef2413eadc4c8a68acf1b5bac87dd97faf57c9363e100c52e6e616 SHA512 4ea19085358e4c2435837898d3199ad619b7dd508c8913137e2f0c658c2d3c4e56ef9ef0266b6c82d89441f9d647861d8c36e32299a4b34abe344b13ad946bb7 -EBUILD qbs-2.4.1.ebuild 2422 BLAKE2B b711d85ec07154d21d28e9b3fa4e2f366320f6adda8e09a9b1031bcf396c71aa8d3f8bca2f7a000ffa9faa6d6a55ac8e9ef2e840e7319ca1496f86b1c62a3c99 SHA512 61f86cc825c8d36dd6c383b788c5e3b6a18d39137d42f0aa745f6167bc894ed36a62797c44448bf628243260d5986a181705faf609d1ad003d5b9a23ab1b367d +EBUILD qbs-2.4.1-r1.ebuild 2464 BLAKE2B 3db130cfbad56cdfb8e8d80088dcc95516fc2b7bb098a765fc802d8df40add84dd7eb5238daa98b7a6900ddbdf236d62ddd994a2d17aaa527b726ef6aa7ace30 SHA512 48731ec065caeb88a5a61c521e4fefde65fceb0d6c9ca885cbd942f4f5f01f1edbb48befb2c673362606294a4f7b262adb68b203cb093ead784d12ab6ffc4b01 MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6 diff --git a/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch new file mode 100644 index 000000000000..aa20ee42c57e --- /dev/null +++ b/dev-util/qbs/files/qbs-2.4.1-ldconfig.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/939142 + +Exact cause unknown, but running qbs in portage's sandbox hangs +for a few people while running ldconfig, and using "env" seemingly +helps. Better (potentially upstreamable) patch welcome if someone +can figure out the right fix. +--- a/share/qbs/modules/cpp/LinuxGCC.qbs ++++ b/share/qbs/modules/cpp/LinuxGCC.qbs +@@ -48,7 +48,7 @@ UnixGCC { + var paths = []; + var ldconfig = new Process(); + try { +- var success = ldconfig.exec("ldconfig", ["-vNX"]); ++ var success = ldconfig.exec("env", ["ldconfig", "-vNX"]); + if (success === -1) + return; + var line; diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild deleted file mode 100644 index 1eaaf83d9393..000000000000 --- a/dev-util/qbs/qbs-2.3.1.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Modern build tool for software projects" -HOMEPAGE="https://doc.qt.io/qbs/" -SRC_URI="https://download.qt.io/official_releases/qbs/${PV}/${PN}-src-${PV}.tar.gz" -S=${WORKDIR}/${PN}-src-${PV} - -LICENSE="|| ( LGPL-2.1 LGPL-3 ) BSD" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-qt/qt5compat:6 - dev-qt/qtbase:6[concurrent,gui,network,widgets,xml] -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - $(python_gen_any_dep ' - dev-python/beautifulsoup4[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - ') - dev-qt/qttools:6[assistant,qdoc] - ) -" - -CMAKE_SKIP_TESTS=( - # QBS does not inherit toolchain/flags knowlege from cmake, and - # while can use ${BUILD_DIR}/bin/qbs-config to improve this it - # remains very fickle and will fail in varied ways with clang, - # musl, -native-symlinks, and libc++. After consideration it is - # not worth worrying about affected tests here (even if notable). - tst_api - tst_blackbox # also skips blackbox-* (intended) - tst_language -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.1-qtver.patch -) - -python_check_deps() { - # _find_python_module in cmake/QbsDocumentation.cmake - python_has_version "dev-python/beautifulsoup4[${PYTHON_USEDEP}]" && - python_has_version "dev-python/lxml[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - # temporary workaround for musl-1.2.4 (bug #906929), this ideally - # needs fixing in qtbase as *64 usage comes from its headers' macros - use elibc_musl && append-lfs-flags - - # fails to build with gcc:14 and -O3 (bug #933187) - tc-is-gcc && [[ $(gcc-major-version) -ge 14 ]] && - replace-flags -O3 -O2 - - local mycmakeargs=( - -DQBS_DOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF} - -DQBS_INSTALL_HTML_DOCS=$(usex doc) - -DQBS_INSTALL_MAN_PAGE=yes - -DQBS_INSTALL_QCH_DOCS=$(usex doc) - -DQBS_LIB_INSTALL_DIR="$(get_libdir)" - -DQT_VERSION_MAJOR=6 #931596 - -DWITH_TESTS=$(usex test) - -DWITH_UNIT_TESTS=$(usex test) - ) - - cmake_src_configure -} - -src_install() { - local DOCS=( README.md changelogs ) - cmake_src_install - - use !test || rm -- "${ED}"/usr/bin/{tst_*,qbs_*,clang-format-test} || die - - docompress -x /usr/share/doc/${PF}/qbs.qch -} diff --git a/dev-util/qbs/qbs-2.4.1.ebuild b/dev-util/qbs/qbs-2.4.1-r1.ebuild index 45c3e36f74e4..c82bed8f744e 100644 --- a/dev-util/qbs/qbs-2.4.1.ebuild +++ b/dev-util/qbs/qbs-2.4.1-r1.ebuild @@ -45,6 +45,7 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-2.3.1-qtver.patch + "${FILESDIR}"/${PN}-2.4.1-ldconfig.patch ) python_check_deps() { |