diff options
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cbindgen/cbindgen-0.28.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch (renamed from dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch) | 16 | ||||
| -rw-r--r-- | dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild | 16 | ||||
| -rw-r--r-- | dev-util/glslang/glslang-1.3.296.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/qbs/Manifest | 1 | ||||
| -rw-r--r-- | dev-util/qbs/qbs-2.5.1.ebuild | 91 | ||||
| -rw-r--r-- | dev-util/spirv-headers/spirv-headers-1.3.296.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/spirv-tools/spirv-tools-1.3.296.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/volk/volk-1.3.296.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/vulkan-headers/vulkan-headers-1.3.296.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.3.296.0.ebuild | 4 | ||||
| -rw-r--r-- | dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.296.0.ebuild | 4 |
12 files changed, 135 insertions, 19 deletions
diff --git a/dev-util/cbindgen/cbindgen-0.28.0.ebuild b/dev-util/cbindgen/cbindgen-0.28.0.ebuild index 90b3285a3866..0d3462def391 100644 --- a/dev-util/cbindgen/cbindgen-0.28.0.ebuild +++ b/dev-util/cbindgen/cbindgen-0.28.0.ebuild @@ -88,7 +88,7 @@ LICENSE+=" || ( Apache-2.0 Boost-1.0 ) " SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~loong ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" IUSE="test" # Needs debugging enabled and lots of other problems. diff --git a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch b/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch index d30e496bbf02..0f9feab30499 100644 --- a/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15.patch +++ b/dev-util/geany-plugins/files/geany-plugins-2.0-gcc15-r1.patch @@ -25,3 +25,19 @@ } /* loads @filename in @kf and return %FALSE if failed, emitting a warning +# https://github.com/geany/geany-plugins/commit/109ad6e6a2cfa31deb33ebfcef838ba337ff208f +--- a/geanyprj/src/unittests.c ++++ b/geanyprj/src/unittests.c +@@ -25,12 +25,6 @@ file_teardown(void) + system("rm -rf test_list_dir"); + } + +-gboolean +-true(G_GNUC_UNUSED const gchar * arg) +-{ +- return TRUE; +-} +- + START_TEST(test_get_file_list) + { + GSList *files = get_file_list("test_list_dir", NULL, NULL, NULL); diff --git a/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild b/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild index 23be408934bd..848d2c73df88 100644 --- a/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild +++ b/dev-util/geany-plugins/geany-plugins-2.0-r2.ebuild @@ -15,10 +15,12 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86" -IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope webhelper workbench" +IUSE="ctags debugger enchant git gpg gtkspell lua markdown nls pretty-printer scope test webhelper workbench" REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )" -DEPEND=" +RESTRICT="!test? ( test )" + +COMMON_DEPEND=" dev-libs/glib:2 >=dev-util/geany-2.0 x11-libs/gtk+:3 @@ -38,7 +40,10 @@ DEPEND=" webhelper? ( net-libs/webkit-gtk:4.1 ) workbench? ( dev-libs/libgit2:= ) " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + test? ( dev-libs/check ) +" +RDEPEND="${COMMON_DEPEND} scope? ( dev-debug/gdb ) " BDEPEND="virtual/pkgconfig @@ -47,7 +52,7 @@ BDEPEND="virtual/pkgconfig PATCHES=( "${FILESDIR}/${P}-gcc14.patch" - "${FILESDIR}/${P}-gcc15.patch" + "${FILESDIR}/${P}-gcc15-r1.patch" "${FILESDIR}/${P}-webkit2gtk-4.1.patch" ) @@ -57,6 +62,9 @@ pkg_setup() { src_prepare() { default + if ! use test; then + sed -i "s:gp_have_unittests=yes:gp_have_unittests=no:" build/unittests.m4 || die + fi eautoreconf } diff --git a/dev-util/glslang/glslang-1.3.296.0-r1.ebuild b/dev-util/glslang/glslang-1.3.296.0-r1.ebuild index efa2c6b3ea03..e073373d1bac 100644 --- a/dev-util/glslang/glslang-1.3.296.0-r1.ebuild +++ b/dev-util/glslang/glslang-1.3.296.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then else GIT_COMMIT="vulkan-sdk-${PV}" SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}/${PN}-${GIT_COMMIT}" fi diff --git a/dev-util/qbs/Manifest b/dev-util/qbs/Manifest index c9fb2b143afd..570e4714aa18 100644 --- a/dev-util/qbs/Manifest +++ b/dev-util/qbs/Manifest @@ -1 +1,2 @@ DIST qbs-src-2.5.0.tar.gz 5726362 BLAKE2B 3757b17750078ceddc45b88688a51b3f6e1659c9c845683a11e92a5acdfa44a6b6cac61aeb551ccde21282fcd971484bdec1e002b8a8c47e5fc6fd9d23523011 SHA512 60bfbac4fa7435da93431be50603bb19fbdf7a5bafc8a3a1129b792d323cbd4e42c2fd7b7b24c30c8a4a2b4b01b65ac72c366e54e01e1c6da2699ff6dedaf35f +DIST qbs-src-2.5.1.tar.gz 5723765 BLAKE2B b9dce154a84cbc719aa7bdaec1cc2f2c29d07e8e20bea206b0248471a8b3b975d393b2163aaf333995544901dc800d7c83cedf5638d7d412cb5ec19f7bfe8d1c SHA512 93a94aa669a530b649b75c5144abd719aa1b57fba833aacb3abf5ff3b2edac145671993299301e6cb486397dbe3e0afd591acb81f1a091afd5e88a5a48014882 diff --git a/dev-util/qbs/qbs-2.5.1.ebuild b/dev-util/qbs/qbs-2.5.1.ebuild new file mode 100644 index 000000000000..96b6c36a3917 --- /dev/null +++ b/dev-util/qbs/qbs-2.5.1.ebuild @@ -0,0 +1,91 @@ +# Copyright 2024-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9,10,11,12,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 ) Boost-1.0 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 knowledge 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 feels + # 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 + "${FILESDIR}"/${PN}-2.4.1-ldconfig.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 + + # tests build failure w/ gcc:14 + -O3 (bug #933187, needs looking into) + use test && 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/spirv-headers/spirv-headers-1.3.296.0.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.296.0.ebuild index d04d07a7df32..12f20485c8a0 100644 --- a/dev-util/spirv-headers/spirv-headers-1.3.296.0.ebuild +++ b/dev-util/spirv-headers/spirv-headers-1.3.296.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/dev-util/spirv-tools/spirv-tools-1.3.296.0.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.296.0.ebuild index 8d546210c740..0f82ce9ef746 100644 --- a/dev-util/spirv-tools/spirv-tools-1.3.296.0.ebuild +++ b/dev-util/spirv-tools/spirv-tools-1.3.296.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="vulkan-sdk-${PV}" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi diff --git a/dev-util/volk/volk-1.3.296.0.ebuild b/dev-util/volk/volk-1.3.296.0.ebuild index 6a883251e886..78fa446f356b 100644 --- a/dev-util/volk/volk-1.3.296.0.ebuild +++ b/dev-util/volk/volk-1.3.296.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="vulkan-sdk-${PV}" SRC_URI="https://github.com/zeux/volk/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv" S="${WORKDIR}"/${PN}-${EGIT_COMMIT} fi diff --git a/dev-util/vulkan-headers/vulkan-headers-1.3.296.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.3.296.0.ebuild index 06bb825e390d..02e1f7e3e205 100644 --- a/dev-util/vulkan-headers/vulkan-headers-1.3.296.0.ebuild +++ b/dev-util/vulkan-headers/vulkan-headers-1.3.296.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.296.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.296.0.ebuild index 1c61be76d51f..d5225b8a8b38 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.3.296.0.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.3.296.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV} fi diff --git a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.296.0.ebuild b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.296.0.ebuild index a8895f087cf1..4cb6f5488124 100644 --- a/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.296.0.ebuild +++ b/dev-util/vulkan-utility-libraries/vulkan-utility-libraries-1.3.296.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then else EGIT_COMMIT="vulkan-sdk-${PV}" SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86" S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT} fi |
