From 1551fe56fd6ba43a94509cffc61b6bf854b7ac9f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 1 Jun 2024 00:07:06 +0100 Subject: gentoo auto-resync : 01:06:2024 - 00:07:06 --- dev-util/qbs/Manifest | 2 +- dev-util/qbs/qbs-2.3.1.ebuild | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'dev-util/qbs') diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index 09564650e2ea..21f48a5fb78c 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1,4 +1,4 @@ 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 -EBUILD qbs-2.3.1.ebuild 2241 BLAKE2B 7d112d2a45491b4e50334188346270d18aa030c96db8c056def2e550336b5146eaa56ce3fc961ffcfc494ac7aa5f397b180dbeaf61e715e383adae35fce10594 SHA512 6ece15bf47be704d5c2a3a189f64004c5eaf05fbb109c97baa90df016ef80bf9eda322f84bc170e11f97b659b1eb37dab869da48fa3aae568aa261f6d2a4668d +EBUILD qbs-2.3.1.ebuild 2385 BLAKE2B d666ad502f8097ed00f2a24fd378ddd8e48a485ef623d5db1074183287cbf6e7da02dcec4fef2413eadc4c8a68acf1b5bac87dd97faf57c9363e100c52e6e616 SHA512 4ea19085358e4c2435837898d3199ad619b7dd508c8913137e2f0c658c2d3c4e56ef9ef0266b6c82d89441f9d647861d8c36e32299a4b34abe344b13ad946bb7 MISC metadata.xml 1135 BLAKE2B 389cfca2f13552aa0da4e29204014c678d2e710cc96fed8f68616431d5a5d0b9bcd5505b396f843dd065c66c0bd8d955ae6137637eb19226552b6b36509fe296 SHA512 854fb0ce9d21b6ff61c4ed32efeffda84d31ec809faa830b921804dc59e5d6d49d8b7326877705f94346f677d72cc17be5ed4099a6e51dbf381f7456c57567d6 diff --git a/dev-util/qbs/qbs-2.3.1.ebuild b/dev-util/qbs/qbs-2.3.1.ebuild index 2e99070c6c0f..1eaaf83d9393 100644 --- a/dev-util/qbs/qbs-2.3.1.ebuild +++ b/dev-util/qbs/qbs-2.3.1.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake flag-o-matic python-any-r1 +inherit cmake flag-o-matic python-any-r1 toolchain-funcs DESCRIPTION="Modern build tool for software projects" HOMEPAGE="https://doc.qt.io/qbs/" @@ -62,6 +62,10 @@ src_configure() { # 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) -- cgit v1.2.3