From 004d820fd3814248c3faf4eac508022e389bc84f Mon Sep 17 00:00:00 2001 From: Joonas Niilola Date: Wed, 9 Oct 2024 09:06:25 +0300 Subject: [PATCH 01/32] dev-lang/spidermonkey: add 128.3.0 - enable python-3.13 support with a patch from RedHat/Fedora, - "machify" configure, compile and tests phases to finally bring SM on par with other Mozilla products using mach, allowing us to most likely re-introduce an eclass to handle SM, Firefox and Thunderbird at some point. Closes: https://bugs.gentoo.org/912170 Signed-off-by: Joonas Niilola --- dev-lang/spidermonkey/Manifest | 3 + .../spidermonkey-128-known-test-failures.txt | 44 ++ .../spidermonkey/spidermonkey-128.3.0.ebuild | 476 ++++++++++++++++++ 3 files changed, 523 insertions(+) create mode 100644 dev-lang/spidermonkey/files/spidermonkey-128-known-test-failures.txt create mode 100644 dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest index 15055529ddfb7..2843f7b0e31cb 100644 --- a/dev-lang/spidermonkey/Manifest +++ b/dev-lang/spidermonkey/Manifest @@ -5,6 +5,9 @@ DIST firefox-115.15.0esr.source.tar.xz 507920832 BLAKE2B 997a3148b7019fbec95e1e0 DIST firefox-115.16.0esr.source.tar.xz 515133700 BLAKE2B 9501b617b346d56f6de975f88974be6fdc3d4a901b2a1b952b6bbf6cc46384084260078d23c52bedff83a65bec4ea5ec78c3bcaac86c78d0b44e796317534840 SHA512 b6f93ec3d6acac5df177253c65b833c017e65ed6e78e96ff029098443928d291f6f67164aedb83d80aa28ee9dee305086597798238d3330e35183030e53e3550 DIST firefox-115esr-patches-10.tar.xz 17256 BLAKE2B 0f6265d6e12f55e9b5128f2f261ba3785b80563e049d2441fde09dedf419c6086c9d994d2b44d1aab35af64cde375bdc254206da9ef148fc20fa90da0417606d SHA512 a1f0012420593a1c1b38dba1785ee9092e0923f56458c38f003cca4ebaac30a73fe3d1f5806a5795c76b2b8d729f8184372e63681daa450c3bb8e5afbe9e2e4f DIST firefox-115esr-patches-13.tar.xz 51360 BLAKE2B a048bfadba989ebbd4c6e3df97d303d6853844e66ed92f5f5f322acf18866218b91d52dbbece63827de283eef855c932d67e329c8d93200aa83f11268a5d1b2f SHA512 186ec72323e621362dcef1bc67c476716aff97dfad701faa9220a7302e798d3cb4ed90d5ea59e3e92f016be29875bb5219787635db99a8848b7c76e4e2e09e90 +DIST firefox-128.3.0esr.source.tar.xz 560960556 BLAKE2B 015fefb408dcea5733053151aff05579b007ab757542a47956e007dc127b460f4a35e885a2ee4ef4dbb936820c8ea3907b00383f659b15a84e701590b50a5d72 SHA512 3c6ef272c0fb653d030fe3f7f72aa0e1097b1c6759556166815cde15465330f988b3bc23df4b4eb753daee930edbb1ef72145273cb29d0952bd9d7c547050f9b +DIST firefox-128esr-patches-03.tar.xz 14156 BLAKE2B 9a618f0ddb8596b740893dc9113f374d193a00e4e8e76dbb2794928ceaafc7b5309cb6f69f6287ae1e423f0be0a060580b0d9d59307c9889362dd17fb7d31d3d SHA512 c6ec7233b368fac623ec0cce6f5c37d358a0fa5bb2154dc67eebb50968376ca9d46f3a734f5d79a4aa4edde9e300a9c65315d0e499aa6a1325b6c76a6c164258 DIST spidermonkey-102-patches-05j.tar.xz 4596 BLAKE2B 215b770bbdf17973d7b3fd1df6cee9647459d2b02b0be5bdb289d457e5dbdb06ceac7a3082fc2f5836e991a4ac4486d73330b0276a466b5c528dab226a27829c SHA512 d2b8e32dac87d60a00fd93479dc34d8adab4feec24a38591cebeb4cf271aa2fd964f4dc26e67ebfb127a47bc8f684d50b32b2cff18ed5286701a04a289058185 DIST spidermonkey-115-patches-01.tar.xz 3992 BLAKE2B e97d0cb3edfb885119226f54f22485ed4e8220cd904d3356b87ccc013403f976a042171cf9ca7250bcf3fe3d90996dd80b4104e7d614f95d7bcfcb0e710a8a78 SHA512 cece96f172a09dd0e29f7c2fdbf650cde405b276bc4083956365289f1da4b1d078ccbde760da6553888ddb3c53cf9aded52051db556a2c4ec492fed01dcb03a1 DIST spidermonkey-115-patches-02.tar.xz 4896 BLAKE2B f78d9804c1427b45d6fda496b4991ec6f672dec9ce031ed57a2920fa1968c942a235f46e40166c8ab8d731a1963f322d34bb2f6984133179175e6f7376d27d13 SHA512 11fd01152d1e7b8ca89bf628076e1f4fb4f1ba6c9dc0f9dd544252495c580c04e4d5ffc238d5587f9e993aa91a47828333564ca55f60e008bd370089cd07d2e6 +DIST spidermonkey-128-patches-01.tar.xz 3612 BLAKE2B 21143ee914743f21c9c68c8ba06b5662019c9526c658514e117da54ae0e82b0c361b859656be9d6cf7db83e64b1164cc19c878dce94f777f200304473fa05041 SHA512 8b21b5b637d00272479333d8d0ef9c04b63e569fa7d123972692e0c3f8b44d2d9fa45e702ed942ae05a0074609e3e41277580768e3228293e9d6256c7ebe7979 diff --git a/dev-lang/spidermonkey/files/spidermonkey-128-known-test-failures.txt b/dev-lang/spidermonkey/files/spidermonkey-128-known-test-failures.txt new file mode 100644 index 0000000000000..5c6f6941b2ad5 --- /dev/null +++ b/dev-lang/spidermonkey/files/spidermonkey-128-known-test-failures.txt @@ -0,0 +1,44 @@ +non262/Date/15.9.5.7.js +non262/Date/time-zone-etc_localetime.js +non262/Intl/Collator/big5han-gb2312han.js +non262/Intl/Collator/implicithan.js +non262/Intl/DateTimeFormat/day-period-hour-cycle.js +non262/Intl/DateTimeFormat/formatRange-timeZone-offset.js +non262/Intl/DateTimeFormat/formatRange-timeZoneName-matches-format.js +non262/Intl/DateTimeFormat/formatRange-timeZoneName.js +non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js +non262/Intl/DateTimeFormat/related-year.js +non262/Intl/DisplayNames/calendar.js +non262/Intl/DisplayNames/currency.js +non262/Intl/DisplayNames/language-dialect.js +non262/Intl/ListFormat/conjunction-type.js +non262/Intl/Locale/likely-subtags-generated.js +non262/Intl/Locale/likely-subtags.js +non262/Intl/NumberFormat/currency-narrow-symbol.js +non262/Intl/available-locales-resolved.js +non262/Intl/available-locales-supported.js +test262/built-ins/RegExp/property-escapes/generated/Alphabetic.js +test262/built-ins/RegExp/property-escapes/generated/Assigned.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Letter.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Letter.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Other_Symbol.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Symbol.js +test262/built-ins/RegExp/property-escapes/generated/General_Category_-_Unassigned.js +test262/built-ins/RegExp/property-escapes/generated/Grapheme_Base.js +test262/built-ins/RegExp/property-escapes/generated/IDS_Binary_Operator.js +test262/built-ins/RegExp/property-escapes/generated/ID_Continue.js +test262/built-ins/RegExp/property-escapes/generated/ID_Start.js +test262/built-ins/RegExp/property-escapes/generated/Ideographic.js +test262/built-ins/RegExp/property-escapes/generated/Script_-_Common.js +test262/built-ins/RegExp/property-escapes/generated/Script_-_Han.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Common.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Han.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Malayalam.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sharada.js +test262/built-ins/RegExp/property-escapes/generated/Script_Extensions_-_Sinhala.js +test262/built-ins/RegExp/property-escapes/generated/Sentence_Terminal.js +test262/built-ins/RegExp/property-escapes/generated/Unified_Ideograph.js +test262/built-ins/RegExp/property-escapes/generated/XID_Continue.js +test262/built-ins/RegExp/property-escapes/generated/XID_Start.js +test262/intl402/NumberFormat/prototype/format/useGrouping-extended-en-IN.js diff --git a/dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild b/dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild new file mode 100644 index 0000000000000..a85726775523d --- /dev/null +++ b/dev-lang/spidermonkey/spidermonkey-128.3.0.ebuild @@ -0,0 +1,476 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="8" + +FIREFOX_PATCHSET="firefox-128esr-patches-03.tar.xz" +SPIDERMONKEY_PATCHSET="spidermonkey-128-patches-01.tar.xz" + +LLVM_COMPAT=( 17 18 ) + +PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_REQ_USE="ncurses,ssl,xml(+)" + +WANT_AUTOCONF="2.1" + +inherit autotools check-reqs flag-o-matic llvm-r1 multiprocessing python-any-r1 toolchain-funcs + +MY_PN="mozjs" +MY_PV="${PV/_pre*}" + +MY_MAJOR=$(ver_cut 1) + +MOZ_ESR=yes + +MOZ_PV=${PV} +MOZ_PV_SUFFIX= +if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then + MOZ_PV_SUFFIX=${BASH_REMATCH[1]} + + # Convert the ebuild version to the upstream Mozilla version + MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI + MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI + MOZ_PV="${MOZ_PV%%_rc*}" # Handle rc for SRC_URI +fi + +if [[ -n ${MOZ_ESR} ]] ; then + # ESR releases have slightly different version numbers + MOZ_PV="${MOZ_PV}esr" +fi + +MOZ_PN="firefox" +MOZ_P="${MOZ_PN}-${MOZ_PV}" +MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}" +MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}" + +MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}" + +if [[ ${PV} == *_rc* ]] ; then + MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}" +fi + +PATCH_URIS=( + https://dev.gentoo.org/~juippis/mozilla/patchsets/${FIREFOX_PATCHSET} + https://dev.gentoo.org/~juippis/mozilla/patchsets/${SPIDERMONKEY_PATCHSET} +) + +DESCRIPTION="Mozilla's JavaScript engine written in C and C++" +HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html" +SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz + ${PATCH_URIS[@]}" +KEYWORDS="~amd64" + +LICENSE="MPL-2.0" +SLOT="$(ver_cut 1)" +IUSE="clang cpu_flags_arm_neon debug +jit lto test" + +#RESTRICT="test" +RESTRICT="!test? ( test )" + +BDEPEND="${PYTHON_DEPS} + $(llvm_gen_dep ' + sys-devel/llvm:${LLVM_SLOT} + clang? ( + sys-devel/clang:${LLVM_SLOT} + sys-devel/lld:${LLVM_SLOT} + virtual/rust:0/llvm-${LLVM_SLOT} + ) + ') + !clang? ( virtual/rust ) + !elibc_glibc? ( dev-lang/rust ) + >=dev-util/cbindgen-0.26.0 + virtual/pkgconfig + test? ( + $(python_gen_any_dep 'dev-python/six[${PYTHON_USEDEP}]') + )" +DEPEND=">=dev-libs/icu-73.1:= + dev-libs/nspr + sys-libs/readline:0= + sys-libs/zlib" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/firefox-${PV%_*}" + +llvm_check_deps() { + if ! has_version -b "sys-devel/llvm:${LLVM_SLOT}" ; then + einfo "sys-devel/llvm:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + return 1 + fi + + if use clang ; then + if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then + einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + return 1 + fi + + if ! has_version -b "virtual/rust:0/llvm-${LLVM_SLOT}" ; then + einfo "virtual/rust:0/llvm-${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + return 1 + fi + + if ! tc-ld-is-mold ; then + if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then + einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 + return 1 + fi + fi + fi + + einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2 +} + +mozconfig_add_options_ac() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${#} -lt 2 ]] ; then + die "${FUNCNAME} requires at least two arguments" + fi + + local reason=${1} + shift + + local option + for option in ${@} ; do + echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG} + done +} + +mozconfig_add_options_mk() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${#} -lt 2 ]] ; then + die "${FUNCNAME} requires at least two arguments" + fi + + local reason=${1} + shift + + local option + for option in ${@} ; do + echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG} + done +} + +mozconfig_use_enable() { + debug-print-function ${FUNCNAME} "$@" + + if [[ ${#} -lt 1 ]] ; then + die "${FUNCNAME} requires at least one arguments" + fi + + local flag=$(use_enable "${@}") + mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}" +} + +python_check_deps() { + if use test ; then + python_has_version "dev-python/six[${PYTHON_USEDEP}]" + fi +} + +pkg_pretend() { + if use test ; then + CHECKREQS_DISK_BUILD="4400M" + else + CHECKREQS_DISK_BUILD="4300M" + fi + + check-reqs_pkg_pretend +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]] ; then + if use test ; then + CHECKREQS_DISK_BUILD="4400M" + else + CHECKREQS_DISK_BUILD="4300M" + fi + + check-reqs_pkg_setup + + llvm-r1_pkg_setup + + if use clang && use lto && tc-ld-is-lld ; then + local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }') + [[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}") + [[ -z ${version_lld} ]] && die "Failed to read ld.lld version!" + + local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }') + [[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}") + [[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!" + + if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then + eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}." + eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:" + eerror " - Manually switch rust version using 'eselect rust' to match used LLVM version" + eerror " - Switch to dev-lang/rust[system-llvm] which will guarantee matching version" + eerror " - Build ${CATEGORY}/${PN} without USE=lto" + eerror " - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole " + eerror " llvm/clang/lld/rust chain depending on your @world updates)" + die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!" + fi + fi + + python-any-r1_pkg_setup + + # Build system is using /proc/self/oom_score_adj, bug #604394 + addpredict /proc/self/oom_score_adj + + if ! mountpoint -q /dev/shm ; then + # If /dev/shm is not available, configure is known to fail with + # a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py + ewarn "/dev/shm is not mounted -- expect build failures!" + fi + + # Ensure we use C locale when building, bug #746215 + export LC_ALL=C + fi +} + +src_prepare() { + if use lto ; then + rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die + fi + + # Workaround for bgo #915651,915651,929013 on musl + if use elibc_glibc ; then + rm -v "${WORKDIR}"/firefox-patches/*bgo-748849-RUST_TARGET_override.patch || die + fi + + eapply "${WORKDIR}"/firefox-patches + eapply "${WORKDIR}"/spidermonkey-patches + + default + + # Make cargo respect MAKEOPTS + export CARGO_BUILD_JOBS="$(makeopts_jobs)" + + # Workaround for bgo #915651,915651,929013 on musl + if ! use elibc_glibc ; then + if use amd64 ; then + export RUST_TARGET="x86_64-unknown-linux-musl" + elif use x86 ; then + export RUST_TARGET="i686-unknown-linux-musl" + elif use arm64 ; then + export RUST_TARGET="aarch64-unknown-linux-musl" + elif use ppc64 ; then + export RUST_TARGET="powerpc64le-unknown-linux-musl" + else + die "Unknown musl chost, please post your rustc -vV along with emerge --info on Gentoo's bug #915651" + fi + fi + + # sed-in toolchain prefix + sed -i \ + -e "s/objdump/${CHOST}-objdump/" \ + python/mozbuild/mozbuild/configure/check_debug_ranges.py \ + || die "sed failed to set toolchain prefix" + + einfo "Removing pre-built binaries ..." + find third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die + + # Create build dir + BUILD_DIR="${WORKDIR}/${PN}_build" + mkdir -p "${BUILD_DIR}" || die +} + +src_configure() { + # Show flags set at the beginning + einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}" + einfo "Current CFLAGS: ${CFLAGS}" + einfo "Current CXXFLAGS: ${CXXFLAGS}" + einfo "Current LDFLAGS: ${LDFLAGS}" + einfo "Current RUSTFLAGS: ${RUSTFLAGS}" + + local have_switched_compiler= + if use clang; then + # Force clang + einfo "Enforcing the use of clang due to USE=clang ..." + + local version_clang=$(clang --version 2>/dev/null | grep -F -- 'clang version' | awk '{ print $3 }') + [[ -n ${version_clang} ]] && version_clang=$(ver_cut 1 "${version_clang}") + [[ -z ${version_clang} ]] && die "Failed to read clang version!" + + if tc-is-gcc; then + have_switched_compiler=yes + fi + AR=llvm-ar + CC=${CHOST}-clang-${version_clang} + CXX=${CHOST}-clang++-${version_clang} + NM=llvm-nm + RANLIB=llvm-ranlib + + elif ! use clang && ! tc-is-gcc ; then + # Force gcc + have_switched_compiler=yes + einfo "Enforcing the use of gcc due to USE=-clang ..." + AR=gcc-ar + CC=${CHOST}-gcc + CXX=${CHOST}-g++ + NM=gcc-nm + RANLIB=gcc-ranlib + fi + + if [[ -n "${have_switched_compiler}" ]] ; then + # Because we switched active compiler we have to ensure + # that no unsupported flags are set + strip-unsupported-flags + fi + + # Ensure we use correct toolchain, + # AS is used in a non-standard way by upstream, #bmo1654031 + export HOST_CC="$(tc-getBUILD_CC)" + export HOST_CXX="$(tc-getBUILD_CXX)" + export AS="$(tc-getCC) -c" + + tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG + + # Pass the correct toolchain paths through cbindgen + if tc-is-cross-compiler ; then + export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}" + fi + + # ../python/mach/mach/mixin/process.py fails to detect SHELL + export SHELL="${EPREFIX}/bin/bash" + + # Set state path + export MOZBUILD_STATE_PATH="${BUILD_DIR}" + + # Set MOZCONFIG + export MOZCONFIG="${S}/.mozconfig" + + # Initialize MOZCONFIG + mozconfig_add_options_ac '' --enable-project=js + + mozconfig_add_options_ac 'Gentoo default' \ + --host="${CBUILD:-${CHOST}}" \ + --target="${CHOST}" \ + --disable-ctype \ + --disable-jemalloc \ + --disable-smoosh \ + --disable-strip \ + --enable-readline \ + --enable-release \ + --enable-shared-js \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --prefix="${EPREFIX}/usr" \ + --with-intl-api \ + --with-system-icu \ + --with-system-nspr \ + --with-system-zlib \ + --with-toolchain-prefix="${CHOST}-" \ + --x-includes="${ESYSROOT}/usr/include" \ + --x-libraries="${ESYSROOT}/usr/$(get_libdir)" + + mozconfig_use_enable debug + mozconfig_use_enable jit + mozconfig_use_enable test tests + + if use debug ; then + mozconfig_add_options_ac '+debug' --disable-optimize + mozconfig_add_options_ac '+debug' --enable-debug-symbols + mozconfig_add_options_ac '+debug' --enable-real-time-tracing + else + mozconfig_add_options_ac '-debug' --enable-optimize + mozconfig_add_options_ac '-debug' --disable-debug-symbols + mozconfig_add_options_ac '-debug' --disable-real-time-tracing + fi + + # We always end up disabling this at some point due to newer rust versions. bgo#933372 + mozconfig_add_options_ac '--disable-rust-simd' --disable-rust-simd + + # Modifications to better support ARM, bug 717344 + if use cpu_flags_arm_neon ; then + mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon + + if ! tc-is-clang ; then + # thumb options aren't supported when using clang, bug 666966 + mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-thumb=yes + mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-thumb-interwork=no + fi + fi + + # Tell build system that we want to use LTO + if use lto ; then + if use clang ; then + if tc-ld-is-mold ; then + mozconfig_add_options_ac '+lto' --enable-linker=mold + else + mozconfig_add_options_ac '+lto' --enable-linker=lld + fi + mozconfig_add_options_ac '+lto' --enable-lto=cross + + else + mozconfig_add_options_ac '+lto' --enable-linker=bfd + mozconfig_add_options_ac '+lto' --enable-lto=full + fi + fi + + # LTO flag was handled via configure + filter-lto + + # Pass MAKEOPTS to build system + export MOZ_MAKE_FLAGS="${MAKEOPTS}" + + # Use system's Python environment + export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none" + export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach + + # Disable notification when build system has finished + export MOZ_NOSPAM=1 + + # Portage sets XARGS environment variable to "xargs -r" by default which + # breaks build system's check_prog() function which doesn't support arguments + mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs" + + # Set build dir + mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}" + + # Show flags we will use + einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}" + einfo "Build CFLAGS: ${CFLAGS}" + einfo "Build CXXFLAGS: ${CXXFLAGS}" + einfo "Build LDFLAGS: ${LDFLAGS}" + einfo "Build RUSTFLAGS: ${RUSTFLAGS}" + + ./mach configure || die +} + +src_compile() { + ./mach build --verbose || die +} + +src_test() { + if "${BUILD_DIR}/js/src/js" -e 'print("Hello world!")'; then + einfo "Smoke-test successful, continuing with full test suite" + else + die "Smoke-test failed: did interpreter initialization fail?" + fi + + cp "${FILESDIR}"/spidermonkey-${SLOT}-known-test-failures.txt "${T}"/known_test_failures.list || die + + ./mach jstests --exclude-file="${T}"/known_test_failures.list || die +} + +src_install() { + cd "${BUILD_DIR}" || die + default + # DESTDIR="${D}" ./mach install || die + + # fix soname links + pushd "${ED}"/usr/$(get_libdir) &>/dev/null || die + mv lib${MY_PN}-${MY_MAJOR}.so lib${MY_PN}-${MY_MAJOR}.so.0.0.0 || die + ln -s lib${MY_PN}-${MY_MAJOR}.so.0.0.0 lib${MY_PN}-${MY_MAJOR}.so.0 || die + ln -s lib${MY_PN}-${MY_MAJOR}.so.0 lib${MY_PN}-${MY_MAJOR}.so || die + popd &>/dev/null || die + + # remove unneeded files + rm \ + "${ED}"/usr/bin/js${MY_MAJOR}-config \ + "${ED}"/usr/$(get_libdir)/libjs_static.ajs || die + + # fix permissions + chmod -x \ + "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc \ + "${ED}"/usr/include/mozjs-${MY_MAJOR}/js-config.h || die +} From ecfcce7410c2454d054c7be5533efe58b2adac1e Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:03:54 -0400 Subject: [PATCH 02/32] dev-qt/qt3d: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qt3d/qt3d-6.7.9999.ebuild | 37 -------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 dev-qt/qt3d/qt3d-6.7.9999.ebuild diff --git a/dev-qt/qt3d/qt3d-6.7.9999.ebuild b/dev-qt/qt3d/qt3d-6.7.9999.ebuild deleted file mode 100644 index 5e1b7809f57eb..0000000000000 --- a/dev-qt/qt3d/qt3d-6.7.9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="3D rendering module for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -elif [[ ${QT6_BUILD_TYPE} == live ]]; then - EGIT_SUBMODULES=() # skip qtquick3d-assimp -fi - -IUSE="gles2-only qml vulkan" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent,gles2-only=,gui,network,opengl,vulkan=] - ~dev-qt/qtshadertools-${PV}:6 - media-libs/assimp:= - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - -DQT_FEATURE_qt3d_system_assimp=ON - -DQT_UNITY_BUILD=OFF # fails to build - ) - - qt6-build_src_configure -} From b3d0893e6aa6cc4968f4c911cadd59fe69a6f2f0 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:03:55 -0400 Subject: [PATCH 03/32] dev-qt/qt5compat: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qt5compat/qt5compat-6.7.9999.ebuild | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 dev-qt/qt5compat/qt5compat-6.7.9999.ebuild diff --git a/dev-qt/qt5compat/qt5compat-6.7.9999.ebuild b/dev-qt/qt5compat/qt5compat-6.7.9999.ebuild deleted file mode 100644 index 4462f312f1544..0000000000000 --- a/dev-qt/qt5compat/qt5compat-6.7.9999.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module containing the unsupported Qt 5 APIs" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="icu qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,icu=,network,xml] - icu? ( dev-libs/icu:= ) - qml? ( - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtshadertools-${PV}:6 - ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Quick) - ) - - qt6-build_src_configure -} - -src_test() { - # tst_qxmlinputsource sometimes hang without -j1 - qt6-build_src_test -j1 -} From 832c240015e84020ede46812c5b2d9090c4b7f5d Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:03:56 -0400 Subject: [PATCH 04/32] dev-qt/qtcharts: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtcharts/qtcharts-6.7.9999.ebuild | 28 ------------------------ 1 file changed, 28 deletions(-) delete mode 100644 dev-qt/qtcharts/qtcharts-6.7.9999.ebuild diff --git a/dev-qt/qtcharts/qtcharts-6.7.9999.ebuild b/dev-qt/qtcharts/qtcharts-6.7.9999.ebuild deleted file mode 100644 index 264ac86f88866..0000000000000 --- a/dev-qt/qtcharts/qtcharts-6.7.9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Chart component library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="gles2-only qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gles2-only=,gui,opengl,widgets] - qml? ( ~dev-qt/qtdeclarative-${PV}:6[opengl] ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} From d1078c95f8c162fd51c45b760e757b66b40300df Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:03:57 -0400 Subject: [PATCH 05/32] dev-qt/qtconnectivity: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtconnectivity-6.7.9999.ebuild | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild deleted file mode 100644 index c9923654ba1c9..0000000000000 --- a/dev-qt/qtconnectivity/qtconnectivity-6.7.9999.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="+bluetooth nfc smartcard" -REQUIRED_USE="|| ( bluetooth nfc )" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - bluetooth? ( - ~dev-qt/qtbase-${PV}:6[dbus] - net-wireless/bluez:= - ) - nfc? ( - smartcard? ( sys-apps/pcsc-lite ) - ) -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # most hardware tests are auto-skipped, but some still misbehave - # if bluez/hardware is available (generally tests here may not be - # very relevant without hardware, lists may need to be extended) - tst_qbluetoothdevicediscoveryagent #936485 - tst_qbluetoothlocaldevice - tst_qbluetoothserver - tst_qbluetoothservicediscoveryagent - tst_qbluetoothserviceinfo - tst_qlowenergycontroller -) - -src_prepare() { - qt6-build_src_prepare - - use bluetooth || - sed -i '/add_subdirectory(bluetooth)/d' src/CMakeLists.txt || die - use nfc || - sed -i '/add_subdirectory(nfc)/d' src/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - $(usev nfc $(qt_feature smartcard pcsclite)) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - # broken (unnecessary) symlink due to add_app() being used over add_tool() - use !bluetooth || rm -- "${ED}"/usr/bin/sdpscanner6 || die - - if use test; then - local delete=( # sigh - "${D}${QT6_BINDIR}"/bluetoothtestdevice - "${D}${QT6_BINDIR}"/bttestui - "${D}${QT6_BINDIR}"/qlecontroller-server - ) - # using -f given not tracking which tests may be skipped or not - rm -f -- "${delete[@]}" || die - fi -} From 1e1f337f64ef83463527eb6fe432287f3addd720 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:03:57 -0400 Subject: [PATCH 06/32] dev-qt/qtdeclarative: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtdeclarative-6.7.9999.ebuild | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild deleted file mode 100644 index 724f992b0453f..0000000000000 --- a/dev-qt/qtdeclarative/qtdeclarative-6.7.9999.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) - -# behaves very badly when qtdeclarative is not already installed, also -# other more minor issues (installs junk, sandbox/offscreen issues) -QT6_RESTRICT_TESTS=1 - -inherit python-any-r1 qt6-build - -DESCRIPTION="Qt Declarative (Quick 2)" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE="accessibility +jit +network opengl qmlls +sql +ssl svg vulkan +widgets" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,network=,opengl=,sql?,ssl?,vulkan=,widgets=] - qmlls? ( ~dev-qt/qtlanguageserver-${PV}:6 ) - svg? ( ~dev-qt/qtsvg-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND=" - ${PYTHON_DEPS} - ~dev-qt/qtshadertools-${PV}:6 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qmlls Qt6LanguageServerPrivate) - $(cmake_use_find_package sql Qt6Sql) - $(cmake_use_find_package svg Qt6Svg) - $(qt_feature jit qml_jit) - $(qt_feature network qml_network) - $(qt_feature ssl qml_ssl) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if [[ ! -e ${D}${QT6_LIBDIR}/libQt6QuickControls2.so.6 ]]; then #940675 - eerror "${CATEGORY}/${PF} seems to have been improperly built and" - eerror "install was aborted to protect the system. Possibly(?) due" - eerror "to a rare portage ordering bug. If using portage, try:" - eerror " emerge -1 qtshadertools:6 qtdeclarative:6" - eerror "If that did not resolve the issue, please provide build.log" - eerror "on https://bugs.gentoo.org/940675" - die "aborting due to incomplete/broken build (see above)" - fi -} From eae38d1180f8254d04f5c23cdaede13d5d918ae3 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:03:58 -0400 Subject: [PATCH 07/32] dev-qt/qthttpserver: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qthttpserver/qthttpserver-6.7.9999.ebuild | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild diff --git a/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild b/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild deleted file mode 100644 index 49febbf2b6584..0000000000000 --- a/dev-qt/qthttpserver/qthttpserver-6.7.9999.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="HTTP server functionality for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="+ssl websockets" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network,ssl=] - websockets? ( ~dev-qt/qtwebsockets-${PV}:6 ) -" -DEPEND=" - ${RDEPEND} - test? ( ~dev-qt/qtbase-${PV}:6[concurrent] ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package websockets Qt6WebSockets) - ) - - qt6-build_src_configure -} From 0ad248afbafa6ac1b92e4498c49b0b38f6c318d3 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:03:59 -0400 Subject: [PATCH 08/32] dev-qt/qtimageformats: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtimageformats-6.7.9999.ebuild | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild diff --git a/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild b/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild deleted file mode 100644 index 9d1a9a6f9685b..0000000000000 --- a/dev-qt/qtimageformats/qtimageformats-6.7.9999.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Additional format plugins for the Qt image I/O system" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc64 ~riscv ~x86" -fi - -IUSE="mng" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - media-libs/libwebp:= - media-libs/tiff:= - mng? ( media-libs/libmng:= ) -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # heif plugin is only for Mac, test is normally auto-skipped but may - # misbehave with kde-frameworks/kimageformats:6[heif] (bug #927971) - tst_qheif -) - -src_configure() { - local mycmakeargs=( - -DQT_FEATURE_jasper=OFF - $(qt_feature mng) - -DQT_FEATURE_tiff=ON - -DQT_FEATURE_webp=ON - -DQT_FEATURE_system_tiff=ON - -DQT_FEATURE_system_webp=ON - ) - - qt6-build_src_configure -} From 10ee400e6f61bfc0a2813f75fddcaf07613d3c9e Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:00 -0400 Subject: [PATCH 09/32] dev-qt/qtlanguageserver: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtlanguageserver-6.7.9999.ebuild | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild diff --git a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild b/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild deleted file mode 100644 index b02596ef5aabd..0000000000000 --- a/dev-qt/qtlanguageserver/qtlanguageserver-6.7.9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Implementation of the Language Server Protocol for Qt" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -RDEPEND="~dev-qt/qtbase-${PV}:6" -DEPEND="${RDEPEND}" From 1dc947d4545466a69083e784b34c30d32c009212 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:01 -0400 Subject: [PATCH 10/32] dev-qt/qtlocation: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtlocation/qtlocation-6.7.9999.ebuild | 44 -------------------- 1 file changed, 44 deletions(-) delete mode 100644 dev-qt/qtlocation/qtlocation-6.7.9999.ebuild diff --git a/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild b/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild deleted file mode 100644 index d407e2f12e547..0000000000000 --- a/dev-qt/qtlocation/qtlocation-6.7.9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Location (places, maps, navigation) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtpositioning-${PV}:6[qml] -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # ignores QML_IMPORT_PATH (unlike other tests) and looks in - # the missing builddir/qml, skip rather than work around - tst_declarative_ui -) - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*TestGeoServicePlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Location/*UnsupportedPlacesGeoServicePlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Qml/QmlPlugins/*declarative_location_test*.cmake - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_geocodingplugin.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_placesplugin_unsupported.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_qmltestplugin.so - "${D}${QT6_PLUGINDIR}"/geoservices/libqtgeoservices_routingplugin.so - "${D}${QT6_QMLDIR}"/QtLocation/Test - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} From f8e9e99d5869d761cb241244fd95d89690c22904 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:02 -0400 Subject: [PATCH 11/32] dev-qt/qtmultimedia: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtmultimedia/qtmultimedia-6.7.9999.ebuild | 133 ------------------ 1 file changed, 133 deletions(-) delete mode 100644 dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild deleted file mode 100644 index 2921a408326e3..0000000000000 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic qt6-build - -DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE=" - +X alsa eglfs +ffmpeg gstreamer opengl pulseaudio - qml v4l vaapi vulkan wayland -" -# tst_qmediaplayerbackend hard requires qml, review in case becomes optional -REQUIRED_USE=" - || ( ffmpeg gstreamer ) - eglfs? ( ffmpeg opengl qml ) - test? ( qml ) - vaapi? ( ffmpeg opengl ) -" - -# gstreamer[X=] is to avoid broken gst detect if -X w/ gst[X] w/o xorg-proto -# (*could* be removed if gst-plugins-base[X] RDEPENDs on xorg-proto) -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] - alsa? ( - !pulseaudio? ( media-libs/alsa-lib ) - ) - ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] - media-video/ffmpeg:=[vaapi?] - X? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrandr - ) - ) - gstreamer? ( - dev-libs/glib:2 - media-libs/gst-plugins-bad:1.0 - media-libs/gst-plugins-base:1.0[X=] - media-libs/gstreamer:1.0 - opengl? ( - ~dev-qt/qtbase-${PV}:6[X?,wayland?] - media-libs/gst-plugins-base:1.0[X?,egl,opengl,wayland?] - ) - ) - opengl? ( media-libs/libglvnd ) - pulseaudio? ( media-libs/libpulse ) - qml? ( - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtquick3d-${PV}:6 - ) -" -DEPEND=" - ${RDEPEND} - X? ( x11-base/xorg-proto ) - v4l? ( sys-kernel/linux-headers ) - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="~dev-qt/qtshadertools-${PV}:6" - -CMAKE_SKIP_TESTS=( - # unimportant and expects all backends to be available (bug #928420) - tst_backends - # tries to use real alsa or pulseaudio and fails in sandbox - tst_qaudiosink - tst_qaudiosource - tst_qmediacapture_gstreamer - tst_qmediacapturesession - tst_qmediaplayerbackend - tst_qsoundeffect - # may try to use v4l2 or hardware acceleration depending on availability - tst_qscreencapture_integration - tst_qscreencapturebackend - tst_qvideoframebackend - # fails with offscreen rendering - tst_qvideoframecolormanagement - tst_qwindowcapturebackend -) - -src_configure() { - # normally passed by the build system, but needed for 32-on-64 chroots - use x86 && append-cppflags -DPFFFT_SIMD_DISABLE - - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - $(qt_feature ffmpeg) - $(qt_feature gstreamer) - $(usev gstreamer " - $(qt_feature opengl gstreamer_gl) - $(usev opengl " - $(qt_feature X gstreamer_gl_x11) - $(qt_feature wayland gstreamer_gl_wayland) - ") - ") - $(qt_feature pulseaudio) - $(qt_feature v4l linux_v4l) - $(qt_feature vaapi) - ) - - # ALSA backend is experimental off-by-default and can take priority - # causing problems (bug #935146), disable if USE=pulseaudio is set - # (also do not want unnecessary usage of ALSA plugins -> pulse) - if use alsa && use pulseaudio; then - # einfo should be enough given pure-ALSA users tend to disable pulse - einfo "Warning: USE=alsa is ignored when USE=pulseaudio is set" - mycmakeargs+=( -DQT_FEATURE_alsa=OFF ) - else - mycmakeargs+=( $(qt_feature alsa) ) - fi - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6Multimedia/Qt6MockMultimediaPlugin*.cmake - "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_mockmultimediaplugin.pri - "${D}${QT6_PLUGINDIR}"/multimedia/libmockmultimediaplugin.* - "${D}${QT6_PLUGINDIR}"/multimedia/objects-* - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} From ee31d6f923295e267ede6481b32b375ce40fdb7f Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:03 -0400 Subject: [PATCH 12/32] dev-qt/qtnetworkauth: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtnetworkauth/qtnetworkauth-6.7.9999.ebuild | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild diff --git a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild b/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild deleted file mode 100644 index 606ca90b42f86..0000000000000 --- a/dev-qt/qtnetworkauth/qtnetworkauth-6.7.9999.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Network authorization library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -fi - -RDEPEND="~dev-qt/qtbase-${PV}:6[network]" -DEPEND="${RDEPEND}" From e0a08b6157029e751387e06a157a20218df02062 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:04 -0400 Subject: [PATCH 13/32] dev-qt/qtpositioning: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtpositioning-6.7.9999.ebuild | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 dev-qt/qtpositioning/qtpositioning-6.7.9999.ebuild diff --git a/dev-qt/qtpositioning/qtpositioning-6.7.9999.ebuild b/dev-qt/qtpositioning/qtpositioning-6.7.9999.ebuild deleted file mode 100644 index c872768c9bd81..0000000000000 --- a/dev-qt/qtpositioning/qtpositioning-6.7.9999.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Physical position determination library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="geoclue nmea +qml" - -DEPEND=" - ~dev-qt/qtbase-${PV}:6 - geoclue? ( ~dev-qt/qtbase-${PV}:6[dbus] ) - nmea? ( - ~dev-qt/qtbase-${PV}:6[network] - ~dev-qt/qtserialport-${PV}:6 - ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -RDEPEND=" - ${DEPEND} - geoclue? ( app-misc/geoclue:2.0 ) -" - -CMAKE_SKIP_TESTS=( - # threads test (rarely) fails randomly - tst_qgeoareamonitor -) - -src_prepare() { - qt6-build_src_prepare - - # unfortunately cmake_use_find_package would break things with qtbase - use geoclue || - sed -e 's/TARGET Qt::DBus/FALSE/' \ - -i src/plugins/position/CMakeLists.txt || die - use nmea || - sed -e 's/TARGET Qt::Network/FALSE/' \ - -i src/plugins/position/CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*DummyPlugin*.cmake - "${D}${QT6_LIBDIR}"/cmake/Qt6Positioning/*TestPlugin*.cmake - "${D}${QT6_PLUGINDIR}"/position/libqtposition_satellitesourcetest.so - "${D}${QT6_PLUGINDIR}"/position/libqtposition_testplugin{,2}.so - ) - # using -f given not tracking which tests may be skipped or not - rm -f -- "${delete[@]}" || die - fi -} From 6e4cd23edbb9a87dae3727d8b6407d4e95ec13f8 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:04 -0400 Subject: [PATCH 14/32] dev-qt/qtquick3d: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild diff --git a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild b/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild deleted file mode 100644 index 21502bc53a049..0000000000000 --- a/dev-qt/qtquick3d/qtquick3d-6.7.9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module and API for defining 3D content in Qt QuickTools" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -elif [[ ${QT6_BUILD_TYPE} == live ]]; then - EGIT_SUBMODULES=() # skip qtquick3d-assimp -fi - -IUSE="opengl vulkan" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent,gui,opengl=,vulkan=,widgets] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtquicktimeline-${PV}:6 - ~dev-qt/qtshadertools-${PV}:6 - media-libs/assimp:= - sys-libs/zlib:= -" -DEPEND=" - ${RDEPEND} - test? ( ~dev-qt/qtbase-${PV}:6[network] ) - vulkan? ( dev-util/vulkan-headers ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.6.2-gcc14.patch - "${FILESDIR}"/${PN}-6.6.2-x32abi.patch - "${FILESDIR}"/${PN}-6.7.2-gcc15.patch -) - -CMAKE_SKIP_TESTS=( - # collada support is disabled in system media-libs/assimp (bug #891787) - tst_qquick3dassetimport -) - -src_configure() { - local mycmakeargs=( - -DQT_FEATURE_system_assimp=ON - ) - - qt6-build_src_configure -} From 1540a7527201fbc58acf7f1547ea07258d20ad27 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:05 -0400 Subject: [PATCH 15/32] dev-qt/qtquicktimeline: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtquicktimeline-6.7.9999.ebuild | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 dev-qt/qtquicktimeline/qtquicktimeline-6.7.9999.ebuild diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.9999.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-6.7.9999.ebuild deleted file mode 100644 index 393a5c2037bc1..0000000000000 --- a/dev-qt/qtquicktimeline/qtquicktimeline-6.7.9999.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module for keyframe-based timeline construction" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6 - ~dev-qt/qtdeclarative-${PV}:6 -" -DEPEND="${RDEPEND}" From cbc6a0dbded5ae317157f574f2ba40dc2bf5159b Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:06 -0400 Subject: [PATCH 16/32] dev-qt/qtremoteobjects: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtremoteobjects-6.7.9999.ebuild | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 dev-qt/qtremoteobjects/qtremoteobjects-6.7.9999.ebuild diff --git a/dev-qt/qtremoteobjects/qtremoteobjects-6.7.9999.ebuild b/dev-qt/qtremoteobjects/qtremoteobjects-6.7.9999.ebuild deleted file mode 100644 index 49b703f47ebd4..0000000000000 --- a/dev-qt/qtremoteobjects/qtremoteobjects-6.7.9999.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Inter-Process Communication (IPC) library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - qml? ( - ~dev-qt/qtbase-${PV}:6[gui] - ~dev-qt/qtdeclarative-${PV}:6 - ) -" -DEPEND=" - ${RDEPEND} - test? ( ~dev-qt/qtbase-${PV}:6[gui] ) -" - -src_configure() { - # same issue as bug #913692 when tests are enabled - has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && - local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) ) - - qt6-build_src_configure -} - -src_test() { - # tests re-use 127.0.0.1:65213 and randomly fail if ran at same time - qt6-build_src_test -j1 -} - -src_install() { - qt6-build_src_install - - if use test; then - # installs 30+ test binaries like "qt6/bin/state" and, given - # otherwise empty, "can" delete the directory rather than list - rm -r -- "${D}${QT6_BINDIR}" || die - fi -} From 22f6cedd273ee1921d1687f3f3a30bd26b684f7d Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:07 -0400 Subject: [PATCH 17/32] dev-qt/qtscxml: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtscxml/qtscxml-6.7.9999.ebuild | 34 -------------------------- 1 file changed, 34 deletions(-) delete mode 100644 dev-qt/qtscxml/qtscxml-6.7.9999.ebuild diff --git a/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild b/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild deleted file mode 100644 index 0f087eb496fcb..0000000000000 --- a/dev-qt/qtscxml/qtscxml-6.7.9999.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="State Chart XML (SCXML) support library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # may fail with pid-sandbox, or at least musl/hardened+gcc (exact - # conditions unknown but passes without pid, considering this flaky) - tst_qstatemachine -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} From c5139c72e9d5b7cea91d94db86242385a29db9bf Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:08 -0400 Subject: [PATCH 18/32] dev-qt/qtsensors: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtsensors/qtsensors-6.7.9999.ebuild | 28 ---------------------- 1 file changed, 28 deletions(-) delete mode 100644 dev-qt/qtsensors/qtsensors-6.7.9999.ebuild diff --git a/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild b/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild deleted file mode 100644 index 5a576fcfd7cc8..0000000000000 --- a/dev-qt/qtsensors/qtsensors-6.7.9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Hardware sensor access library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[dbus] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - ) - - qt6-build_src_configure -} From e7431f7016d203c63560a252c1d4c55d6100681e Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:09 -0400 Subject: [PATCH 19/32] dev-qt/qtserialbus: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtserialbus/qtserialbus-6.7.9999.ebuild | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild diff --git a/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild b/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild deleted file mode 100644 index 7f316fa23bbc1..0000000000000 --- a/dev-qt/qtserialbus/qtserialbus-6.7.9999.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt module to access CAN, ModBus, and other industrial serial buses and protocols" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network] - ~dev-qt/qtserialport-${PV}:6 -" -DEPEND="${RDEPEND}" - -CMAKE_SKIP_TESTS=( - # rarely fails randomly (perhaps related to -j) - tst_qcandbcfileparser -) - -src_install() { - qt6-build_src_install - - if use test; then - local delete=( # sigh - "${D}${QT6_LIBDIR}"/cmake/Qt6SerialBus/*TestCanBusPlugin*.cmake - "${D}${QT6_MKSPECSDIR}"/modules/qt_plugin_qttestcanbus.pri - "${D}${QT6_PLUGINDIR}"/canbus/libqttestcanbus.* - "${D}${QT6_PLUGINDIR}"/canbus/objects-*/ - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} From eb6743b479a82bd5f25b38af26be9c2f637bcffe Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:10 -0400 Subject: [PATCH 20/32] dev-qt/qtserialport: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtserialport/qtserialport-6.7.9999.ebuild | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 dev-qt/qtserialport/qtserialport-6.7.9999.ebuild diff --git a/dev-qt/qtserialport/qtserialport-6.7.9999.ebuild b/dev-qt/qtserialport/qtserialport-6.7.9999.ebuild deleted file mode 100644 index 95b360fac6cf6..0000000000000 --- a/dev-qt/qtserialport/qtserialport-6.7.9999.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Serial port abstraction library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6 - virtual/libudev:= -" -DEPEND="${RDEPEND}" From 0061b5b6a9ca88266d770c90bb86bb617110153a Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:11 -0400 Subject: [PATCH 21/32] dev-qt/qtshadertools: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtshadertools-6.7.9999.ebuild | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild diff --git a/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild b/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild deleted file mode 100644 index 15f54c185b88e..0000000000000 --- a/dev-qt/qtshadertools/qtshadertools-6.7.9999.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt APIs and Tools for Graphics Pipelines" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-6.7.2-gcc15.patch -) From 7a1034e1ff5ef35afa0eefb37cdb442d4493fb76 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:11 -0400 Subject: [PATCH 22/32] dev-qt/qtspeech: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtspeech/qtspeech-6.7.9999.ebuild | 44 ------------------------ 1 file changed, 44 deletions(-) delete mode 100644 dev-qt/qtspeech/qtspeech-6.7.9999.ebuild diff --git a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild b/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild deleted file mode 100644 index 1b13d44342236..0000000000000 --- a/dev-qt/qtspeech/qtspeech-6.7.9999.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# tests are kind of flaky, sometimes hang, and also fail with clang -# (not that it's unusable with clang) -- may be worth revisiting -# eventually given qtspeech is still somewhat new (added in 6.4.0) -QT6_RESTRICT_TESTS=1 - -inherit qt6-build - -DESCRIPTION="Text-to-speech library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="flite qml +speechd" -# can build with neither, but then it is just mock tts and may be confusing -REQUIRED_USE="|| ( flite speechd )" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6 - ~dev-qt/qtmultimedia-${PV}:6 - flite? ( app-accessibility/flite ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) - speechd? ( app-accessibility/speech-dispatcher ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Qml) - $(qt_feature flite) - $(qt_feature speechd) - - # flite_alsa was likely to work around old issues in flite, it does - # nothing but add -lasound (no code change, and is unneeded) - -DQT_FEATURE_flite_alsa=OFF - ) - - qt6-build_src_configure -} From 0c98e058ff163dbef23fcb479a0b57e1f9d19641 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:12 -0400 Subject: [PATCH 23/32] dev-qt/qtsvg: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtsvg/qtsvg-6.7.9999.ebuild | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 dev-qt/qtsvg/qtsvg-6.7.9999.ebuild diff --git a/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild b/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild deleted file mode 100644 index e7ea7c613b250..0000000000000 --- a/dev-qt/qtsvg/qtsvg-6.7.9999.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build toolchain-funcs - -DESCRIPTION="SVG rendering library for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui,widgets] - sys-libs/zlib:= -" -DEPEND="${RDEPEND}" - -src_test() { - # tst_QSvgRenderer::testFeColorMatrix (new in 6.7, likely low impact) - # is known failing on BE, could use more looking into (bug #935356) - [[ $(tc-endian) == big ]] && local CMAKE_SKIP_TESTS=( tst_qsvgrenderer ) - - qt6-build_src_test -} From 2f1307ca12b6af9a4ef26770c26159b50a008c9f Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:13 -0400 Subject: [PATCH 24/32] dev-qt/qttools: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qttools/qttools-6.7.9999.ebuild | 154 ------------------------- 1 file changed, 154 deletions(-) delete mode 100644 dev-qt/qttools/qttools-6.7.9999.ebuild diff --git a/dev-qt/qttools/qttools-6.7.9999.ebuild b/dev-qt/qttools/qttools-6.7.9999.ebuild deleted file mode 100644 index da97fd670c795..0000000000000 --- a/dev-qt/qttools/qttools-6.7.9999.ebuild +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LLVM_COMPAT=( {15..18} ) # see .cmake.conf for minimum -LLVM_OPTIONAL=1 - -# behaves very badly when qttools is not already installed, also -# other issues to handle (clang tests flaky depending on version, -# and 3rdparty/ tries to FetchContent gtest) -QT6_RESTRICT_TESTS=1 - -inherit desktop llvm-r1 optfeature qt6-build - -DESCRIPTION="Qt Tools Collection" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE=" - +assistant clang designer distancefieldgenerator gles2-only - +linguist opengl pixeltool +qdbus qdoc qml qtattributionsscanner - qtdiag qtplugininfo vulkan +widgets zstd -" -# note that some tools do not *require* widgets but will skip a sub-tool -# if not enabled (e.g. linguist gives lrelease but not the GUI linguist6) -REQUIRED_USE=" - assistant? ( widgets ) - clang? ( ${LLVM_REQUIRED_USE} ) - designer? ( qml widgets ) - distancefieldgenerator? ( qml widgets ) - pixeltool? ( widgets ) - qdoc? ( clang qml ) -" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[widgets?] - assistant? ( ~dev-qt/qtbase-${PV}:6[network,sql,sqlite] ) - clang? ( - $(llvm_gen_dep ' - sys-devel/clang:${LLVM_SLOT}= - sys-devel/llvm:${LLVM_SLOT}= - ') - ) - designer? ( - ~dev-qt/qtbase-${PV}:6[network,xml,zstd=] - zstd? ( app-arch/zstd:= ) - ) - qdbus? ( ~dev-qt/qtbase-${PV}:6[dbus,xml] ) - qml? ( ~dev-qt/qtdeclarative-${PV}:6[widgets?] ) - qtdiag? ( ~dev-qt/qtbase-${PV}:6[network,gles2-only=,vulkan=] ) - widgets? ( ~dev-qt/qtbase-${PV}:6[opengl=] ) -" -DEPEND=" - ${RDEPEND} - qtdiag? ( - vulkan? ( dev-util/vulkan-headers ) - ) -" - -pkg_setup() { - use clang && llvm-r1_pkg_setup -} - -src_configure() { - local mycmakeargs=( - # prevent the clang test as it can abort due to bug #916098 - $(cmake_use_find_package clang WrapLibClang) - $(cmake_use_find_package qml Qt6Qml) - $(cmake_use_find_package widgets Qt6Widgets) - $(qt_feature assistant) - $(qt_feature clang) - $(qt_feature designer) - $(qt_feature distancefieldgenerator) - $(qt_feature linguist) - $(qt_feature pixeltool) - $(qt_feature qdbus) - $(qt_feature qdoc) - $(qt_feature qtattributionsscanner) - $(qt_feature qtdiag) - $(qt_feature qtplugininfo) - - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # https://github.com/litehtml/litehtml/issues/266 - $(usev assistant -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=ON) - - $(usev designer -DQT_UNITY_BUILD=OFF) # fails to build (QTBUG-122634) - ) - - qt6-build_src_configure -} - -src_install() { - qt6-build_src_install - - if use widgets; then #914766 - use designer || use distancefieldgenerator || use pixeltool && - newicon src/designer/src/designer/images/designer.png designer6.png - - if use assistant; then - make_desktop_entry assistant6 'Qt 6 Assistant' assistant6 \ - 'Qt;Development;Documentation' \ - 'Comment=Tool for viewing online documentation in Qt help file format' - newicon src/assistant/assistant/images/assistant-128.png assistant6.png - fi - - if use designer; then - make_desktop_entry designer6 'Qt 6 Designer' designer6 \ - 'Qt;Development;GUIDesigner' \ - 'Comment=WYSIWYG tool for designing and building graphical user interfaces with QtWidgets' - fi - - if use distancefieldgenerator; then - # no icon, sharing with designer which fits letter-wise - make_desktop_entry qdistancefieldgenerator6 'Qt 6 Distance Field Generator' designer6 \ - 'Qt;Development' \ - 'Comment=Tool for pregenerating the font cache of Qt applications' - fi - - if use linguist; then - make_desktop_entry linguist6 'Qt 6 Linguist' linguist6 \ - 'Qt;Development;Translation' \ - 'Comment=Tool for translating Qt applications' - newicon src/linguist/linguist/images/icons/linguist-128-32.png linguist6.png - fi - - if use pixeltool; then - # no icon, not fitting but share with designer for now - make_desktop_entry pixeltool6 'Qt 6 Pixel Tool' designer6 \ - 'Qt;Development' \ - 'Comment=Tool for zooming in the desktop area pointed by the cursor' - fi - - if use qdbus; then - make_desktop_entry qdbusviewer6 'Qt 6 QDBusViewer' qdbusviewer6 \ - 'Qt;Development' \ - 'Comment=Tool that lets introspect D-Bus objects and messages' - newicon src/qdbus/qdbusviewer/images/qdbusviewer-128.png qdbusviewer6.png - fi - - # hack: make_destop_entry does not support overriding DESCRIPTION - find "${ED}" -type f -name "*.desktop" \ - -exec sed -i "/^Comment=${DESCRIPTION}/d" -- {} + || die - fi -} - -pkg_postinst() { - use assistant && - optfeature "Qt documentation viewable in assistant" \ - 'dev-qt/qt-docs:6[qch]' #602296 -} From 30533fced76e0cec043a1f823a7492dc8ec409d2 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:14 -0400 Subject: [PATCH 25/32] dev-qt/qttranslations: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qttranslations-6.7.9999.ebuild | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 dev-qt/qttranslations/qttranslations-6.7.9999.ebuild diff --git a/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild b/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild deleted file mode 100644 index 4957b280c2a21..0000000000000 --- a/dev-qt/qttranslations/qttranslations-6.7.9999.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -QT6_RESTRICT_TESTS=1 # no tests -inherit qt6-build - -DESCRIPTION="Translation files for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DEPEND="~dev-qt/qtbase-${PV}:6" -BDEPEND="~dev-qt/qttools-${PV}:6[linguist]" From 7b43838924776504f8e5080e8ebe8a9600186810 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:15 -0400 Subject: [PATCH 26/32] dev-qt/qtvirtualkeyboard: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtvirtualkeyboard-6.7.9999.ebuild | 51 ------------------- 1 file changed, 51 deletions(-) delete mode 100644 dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild diff --git a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild b/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild deleted file mode 100644 index 4639b2cf069d6..0000000000000 --- a/dev-qt/qtvirtualkeyboard/qtvirtualkeyboard-6.7.9999.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Customizable input framework and virtual keyboard for Qt" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -fi - -IUSE="+spell" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtsvg-${PV}:6 - spell? ( app-text/hunspell:= ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(qt_feature spell hunspell) - -DINPUT_vkb_handwriting=no # neither cerence nor myscript are packaged - ) - - qt6-build_src_configure -} - -src_test() { - local CMAKE_SKIP_TESTS=( - # rarely randomly(?) fails even with -j1 - tst_layoutfilesystem - ) - - if use spell && has_version app-dicts/myspell-en; then - # 99% pass but minor sub-tests fail with myspell-en, needs looking into - ewarn "Warning: notable tests were skipped due to ${_} being installed" - CMAKE_SKIP_TESTS+=( - tst_inputpanel - tst_inputpanelcontrols2 - ) - else - einfo "tst_inputpanel can take >5mins, not known to actually hang" - fi - - qt6-build_src_test -} From 1864f0b3f306cac460c1a1a1213a143e5b100f49 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:16 -0400 Subject: [PATCH 27/32] dev-qt/qtwayland: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtwayland/qtwayland-6.7.9999.ebuild | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 dev-qt/qtwayland/qtwayland-6.7.9999.ebuild diff --git a/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild b/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild deleted file mode 100644 index 635ccf3a4a9c7..0000000000000 --- a/dev-qt/qtwayland/qtwayland-6.7.9999.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Wayland platform plugin for Qt" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -IUSE="accessibility compositor qml vulkan" - -RDEPEND=" - dev-libs/wayland - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl,vulkan=,wayland] - media-libs/libglvnd - x11-libs/libxkbcommon - compositor? ( - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) - ) -" -DEPEND=" - ${RDEPEND} - vulkan? ( dev-util/vulkan-headers ) -" -BDEPEND="dev-util/wayland-scanner" - -CMAKE_SKIP_TESTS=( - # segfaults for not-looked-into reasons, but not considered - # an issue given >=seatv5 exists since wayland-1.10 (2016) - tst_seatv4 - # needs a compositor/opengl, skip the extra trouble - tst_surface - tst_xdgdecorationv1 - # known failing with wayland-1.23.0 (or at least with offscreen), not - # believed to result in critical runtime issues so skip until this is - # looked at upstream (https://bugreports.qt.io/browse/QTBUG-126379) - tst_client - tst_compositor - tst_scaling -) - -PATCHES=( - "${FILESDIR}"/${PN}-6.7.3-wayland.xml-1.23.0.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Quick) - $(qt_feature compositor wayland_server) - ) - - qt6-build_src_configure -} - -src_test() { - # users' session setting may break tst_clientextension (bug #927030) - unset DESKTOP_SESSION XDG_CURRENT_DESKTOP - unset GNOME_DESKTOP_SESSION_ID KDE_FULL_SESSION - - qt6-build_src_test -} From dc9124ee9cf1982b3a86e9845d22e7dcc370edff Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:16 -0400 Subject: [PATCH 28/32] dev-qt/qtwebchannel: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtwebchannel/qtwebchannel-6.7.9999.ebuild | 27 ------------------- 1 file changed, 27 deletions(-) delete mode 100644 dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild diff --git a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild b/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild deleted file mode 100644 index e0cac52a6b5d5..0000000000000 --- a/dev-qt/qtwebchannel/qtwebchannel-6.7.9999.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Qt WebChannel" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="qml" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[concurrent] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -src_configure() { - has_version "=dev-qt/qtdeclarative-$(ver_cut 1-3)*:6" && #913692 - local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) ) - - qt6-build_src_configure -} From aed14891c060b9f91e75bb24c33701440ba665b6 Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:17 -0400 Subject: [PATCH 29/32] dev-qt/qtwebengine: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtwebengine/qtwebengine-6.7.9999.ebuild | 326 ------------------ 1 file changed, 326 deletions(-) delete mode 100644 dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild deleted file mode 100644 index 07490b941cb37..0000000000000 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ /dev/null @@ -1,326 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -PYTHON_REQ_USE="xml(+)" -inherit check-reqs flag-o-matic multiprocessing optfeature -inherit prefix python-any-r1 qt6-build toolchain-funcs - -DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications" -SRC_URI+=" - https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-13.tar.xz -" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64" -fi - -IUSE=" - accessibility +alsa bindist custom-cflags designer geolocation - +jumbo-build kerberos opengl pdfium pulseaudio qml screencast - +system-icu vaapi vulkan webdriver +widgets -" -REQUIRED_USE=" - designer? ( qml widgets ) -" - -# dlopen: krb5, libva, pciutils, udev -# gcc: for -latomic -RDEPEND=" - app-arch/snappy:= - dev-libs/expat - dev-libs/libevent:= - dev-libs/libxml2[icu] - dev-libs/libxslt - dev-libs/nspr - dev-libs/nss - ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?] - ~dev-qt/qtdeclarative-${PV}:6[widgets?] - ~dev-qt/qtwebchannel-${PV}:6[qml?] - media-libs/fontconfig - media-libs/freetype - media-libs/harfbuzz:= - media-libs/lcms:2 - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/libwebp:= - media-libs/mesa[gbm(+)] - media-libs/openjpeg:2= - media-libs/opus - media-libs/tiff:= - sys-apps/dbus - sys-apps/pciutils - sys-devel/gcc:* - sys-libs/zlib:=[minizip] - virtual/libudev - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXtst - x11-libs/libdrm - x11-libs/libxcb:= - x11-libs/libxkbcommon - x11-libs/libxkbfile - alsa? ( media-libs/alsa-lib ) - designer? ( ~dev-qt/qttools-${PV}:6[designer] ) - geolocation? ( ~dev-qt/qtpositioning-${PV}:6 ) - kerberos? ( virtual/krb5 ) - pulseaudio? ( media-libs/libpulse[glib] ) - screencast? ( - dev-libs/glib:2 - media-video/pipewire:= - ) - system-icu? ( dev-libs/icu:= ) - vaapi? ( media-libs/libva:=[X] ) - !vaapi? ( media-libs/libvpx:= ) -" -DEPEND=" - ${RDEPEND} - media-libs/libglvnd - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libxshmfence - opengl? ( media-libs/libglvnd[X] ) - screencast? ( media-libs/libepoxy[egl(+)] ) - pdfium? ( net-print/cups ) - test? ( - widgets? ( app-text/poppler[cxx(+)] ) - ) - vaapi? ( - vulkan? ( dev-util/vulkan-headers ) - ) -" -BDEPEND=" - $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]') - dev-util/gperf - net-libs/nodejs[ssl] - sys-devel/bison - sys-devel/flex -" - -PATCHES=( "${WORKDIR}"/patches/${PN} ) -[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999 - PATCHES+=( "${WORKDIR}"/patches/chromium ) - -PATCHES+=( - # add extras as needed here, may merge in set if carries across versions -) - -python_check_deps() { - python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]" -} - -qtwebengine_check-reqs() { - [[ ${MERGE_TYPE} == binary ]] && return - - if is-flagq '-g?(gdb)?([1-9])'; then #307861 - ewarn - ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which" - ewarn "is non-trivial with ${PN}. May experience extended compilation" - ewarn "times, increased disk/memory usage, and potentially link failure." - ewarn - ewarn "If run into issues, please try disabling before reporting a bug." - fi - - local CHECKREQS_DISK_BUILD=8G - local CHECKREQS_DISK_USR=360M - - if ! has distcc ${FEATURES}; then #830661 - # assume ~2GB per job or 1.5GB if clang, possible with less - # depending on free memory and *FLAGS, but prefer being safe as - # users having OOM issues with qtwebengine been rather common - tc-is-clang && : 15 || : 20 - local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G - fi - - check-reqs_${EBUILD_PHASE_FUNC} #570534 -} - -pkg_pretend() { - qtwebengine_check-reqs -} - -pkg_setup() { - qtwebengine_check-reqs - python-any-r1_pkg_setup -} - -src_prepare() { - qt6-build_src_prepare - - # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix - hprefixify -w /Gentoo/ src/core/content_client_qt.cpp - - # store chromium versions, only used in postinst for a warning - local chromium - mapfile -t chromium < CHROMIUM_VERSION || die - [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] && - QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die - [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] && - QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die -} - -src_configure() { - local mycmakeargs=( - $(qt_feature pdfium qtpdf_build) - $(qt_feature qml qtpdf_quick_build) - $(qt_feature webdriver webenginedriver) - $(qt_feature widgets qtpdf_widgets_build) - $(usev pdfium -DQT_FEATURE_pdf_v8=ON) - - -DQT_FEATURE_qtwebengine_build=ON - $(qt_feature qml qtwebengine_quick_build) - $(qt_feature widgets qtwebengine_widgets_build) - - $(cmake_use_find_package designer Qt6Designer) - - $(qt_feature alsa webengine_system_alsa) - $(qt_feature !bindist webengine_proprietary_codecs) - $(qt_feature geolocation webengine_geolocation) - $(qt_feature jumbo-build webengine_jumbo_build) - $(qt_feature kerberos webengine_kerberos) - $(qt_feature pulseaudio webengine_system_pulseaudio) - $(qt_feature screencast webengine_webrtc_pipewire) - $(qt_feature system-icu webengine_system_icu) - $(qt_feature vaapi webengine_vaapi) - $(qt_feature vulkan webengine_vulkan) - -DQT_FEATURE_webengine_embedded_build=OFF - -DQT_FEATURE_webengine_extensions=ON - -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet - -DQT_FEATURE_webengine_pepper_plugins=ON - -DQT_FEATURE_webengine_printing_and_pdf=ON - -DQT_FEATURE_webengine_spellchecker=ON - -DQT_FEATURE_webengine_webchannel=ON - -DQT_FEATURE_webengine_webrtc=ON - - # needs a modified ffmpeg to be usable, and even then it may not - # cooperate with new major ffmpeg versions (bug #831487) - -DQT_FEATURE_webengine_system_ffmpeg=OFF - - # use bundled re2 to avoid complications, Qt has also disabled - # this by default in 6.7.3+ (bug #913923) - -DQT_FEATURE_webengine_system_re2=OFF - - # bundled is currently required when using vaapi (forced regardless) - $(qt_feature !vaapi webengine_system_libvpx) - - # not necessary to pass these (default), but in case detection fails - $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \ - freetype gbm glib harfbuzz lcms2 libevent libjpeg \ - libopenjpeg2 libpci libpng libtiff libwebp libxml \ - minizip opus poppler snappy zlib) - - # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON - -DINSTALL_GN=OFF - ) - - local mygnargs=( - # prefer no dlopen where possible - $(usev pulseaudio link_pulseaudio=true) - $(usev screencast rtc_link_pipewire=true) - # reduce default disk space usage - symbol_level=0 - ) - - if use !custom-cflags; then - strip-flags # fragile - - if is-flagq '-g?(gdb)?([2-9])'; then #914475 - replace-flags '-g?(gdb)?([2-9])' -g1 - ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)" - fi - - # Built helpers segfault when using (at least) -march=armv8-a+pauth - # (bug #920555, #920568 -- suspected gcc bug). For now, filter all - # for simplicity. Override with USE=custom-cflags if wanted, please - # report if above -march works again so can cleanup. - use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*' - fi - - export NINJAFLAGS=$(get_NINJAOPTS) - [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v" - - local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}" - einfo "Extra Gn args: ${EXTRA_GN}" - - qt6-build_src_configure -} - -src_compile() { - # tentatively work around a possible (rare) race condition (bug #921680) - cmake_build WebEngineCore_sync_all_public_headers - - cmake_src_compile -} - -src_test() { - if [[ ${EUID} == 0 ]]; then - # almost every tests fail, so skip entirely - ewarn "Skipping tests due to running as root (chromium refuses this configuration)." - return - fi - - local CMAKE_SKIP_TESTS=( - # fails with network sandbox - tst_loadsignals - tst_qquickwebengineview - tst_qwebengineglobalsettings - tst_qwebengineview - # fails with offscreen rendering, may be worth retrying if the issue - # persist given these are rather major tests (or consider virtx) - tst_qmltests - tst_qwebenginepage - # certs verfication seems flaky and gives expiration warnings - tst_qwebengineclientcertificatestore - # test is misperformed when qtbase is built USE=-test? - tst_touchinput - # currently requires webenginedriver to be already installed - tst_webenginedriver - ) - - # prevent using the system's qtwebengine - # (use glob to avoid unnecessary complications with arch dir) - local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* ) - [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}" - local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess - local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales - local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]} - - # random failures in several tests without -j1 - qt6-build_src_test -j1 -} - -src_install() { - qt6-build_src_install - - [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472 - die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/" - - if use test && use webdriver; then - rm -- "${D}${QT6_BINDIR}"/testbrowser || die - fi -} - -pkg_postinst() { - # plugin may also be found in $HOME if provided by chrome or firefox - use amd64 && - optfeature "Widevine DRM support (protected media playback)" \ - www-plugins/chrome-binary-plugins - - elog - elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with" - elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the" - elog "list of backports is impossible to evaluate, but always bound to be behind" - elog "Chromium's release schedule." - elog - elog "In addition, various online services may deny service based on an outdated" - elog "user agent version (and/or other checks). Google is already known to do so." - elog - elog "tl;dr your web browsing experience will be compromised." -} From 98dbb4cc1bad6a0be6e91b21a241503cad7e805c Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:18 -0400 Subject: [PATCH 30/32] dev-qt/qtwebsockets: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- .../qtwebsockets/qtwebsockets-6.7.9999.ebuild | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild diff --git a/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild deleted file mode 100644 index d7e808f49cf7e..0000000000000 --- a/dev-qt/qtwebsockets/qtwebsockets-6.7.9999.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Implementation of the WebSocket protocol for the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86" -fi - -IUSE="qml +ssl" - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[network,ssl=] - qml? ( ~dev-qt/qtdeclarative-${PV}:6 ) -" -DEPEND="${RDEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package qml Qt6Quick) - ) - - qt6-build_src_configure -} From a5a303b64089bdfbf73b064d2cf1cd927694ab9f Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:19 -0400 Subject: [PATCH 31/32] dev-qt/qtwebview: drop 6.7.9999 Signed-off-by: Ionen Wolkens --- dev-qt/qtwebview/qtwebview-6.7.9999.ebuild | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 dev-qt/qtwebview/qtwebview-6.7.9999.ebuild diff --git a/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild deleted file mode 100644 index 76539b793b79c..0000000000000 --- a/dev-qt/qtwebview/qtwebview-6.7.9999.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Module for displaying web content in a QML application using the Qt6 framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64" -fi - -RDEPEND=" - ~dev-qt/qtbase-${PV}:6[gui] - ~dev-qt/qtdeclarative-${PV}:6 - ~dev-qt/qtwebengine-${PV}:6[qml] -" -DEPEND="${RDEPEND}" From 7420b76ad5feda9dc717220665a0af70d276f6bc Mon Sep 17 00:00:00 2001 From: Ionen Wolkens Date: Wed, 9 Oct 2024 02:04:20 -0400 Subject: [PATCH 32/32] dev-qt/qtbase: drop 6.7.9999 Will be no more releases from 6.7.x and 9999 is now stale. Signed-off-by: Ionen Wolkens --- dev-qt/qtbase/qtbase-6.7.9999.ebuild | 363 --------------------------- 1 file changed, 363 deletions(-) delete mode 100644 dev-qt/qtbase/qtbase-6.7.9999.ebuild diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild deleted file mode 100644 index 85c2de60245c6..0000000000000 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ /dev/null @@ -1,363 +0,0 @@ -# Copyright 2021-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic qt6-build toolchain-funcs - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -declare -A QT6_IUSE=( - [global]="+ssl +udev zstd" - [core]="icu journald syslog" - [modules]="+concurrent +dbus +gui +network +sql +xml" - - [gui]=" - +X accessibility eglfs evdev gles2-only +libinput - opengl renderdoc tslib vulkan wayland +widgets - " - [network]="brotli gssapi libproxy sctp" - [sql]="mysql oci8 odbc postgres +sqlite" - [widgets]="cups gtk" - - [optfeature]="nls" #810802 -) -IUSE="${QT6_IUSE[*]}" -REQUIRED_USE=" - ?? ( journald syslog ) - $( - printf '%s? ( gui ) ' ${QT6_IUSE[gui]//+/} - printf '%s? ( network ) ' ${QT6_IUSE[network]//+/} - printf '%s? ( sql ) ' ${QT6_IUSE[sql]//+/} - printf '%s? ( gui widgets ) ' ${QT6_IUSE[widgets]//+/} - ) - accessibility? ( dbus ) - eglfs? ( opengl ) - gles2-only? ( opengl ) - gui? ( || ( X eglfs wayland ) ) - libinput? ( udev ) - sql? ( || ( ${QT6_IUSE[sql]//+/} ) ) - test? ( icu sql? ( sqlite ) ) -" - -# groups: -# - global (configure.cmake) -# - qtcore (src/corelib/configure.cmake) -# - qtgui (src/gui/configure.cmake) -# - qtnetwork (src/network/configure.cmake) -# - qtprintsupport (src/printsupport/configure.cmake) [gui+widgets] -# - qtsql (src/plugins/sqldrivers/configure.cmake) -# nolink: renderdoc, systemd -COMMON_DEPEND=" - sys-libs/zlib:= - ssl? ( dev-libs/openssl:= ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) - - app-crypt/libb2 - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2:=[pcre16,unicode(+)] - icu? ( dev-libs/icu:= ) - journald? ( sys-apps/systemd ) - - dbus? ( sys-apps/dbus ) - gui? ( - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - media-libs/libjpeg-turbo:= - media-libs/libpng:= - x11-libs/libdrm - x11-libs/libxkbcommon[X?] - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - accessibility? ( app-accessibility/at-spi2-core:2 ) - eglfs? ( media-libs/mesa[gbm(+)] ) - evdev? ( sys-libs/mtdev ) - libinput? ( dev-libs/libinput:= ) - opengl? ( - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X?] ) - ) - renderdoc? ( media-gfx/renderdoc ) - tslib? ( x11-libs/tslib ) - widgets? ( - cups? ( net-print/cups ) - gtk? ( - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.24.41-r1:3[X?,wayland?] - x11-libs/pango - ) - ) - ) - network? ( - brotli? ( app-arch/brotli:= ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - ) - sql? ( - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 ) - ) -" -RDEPEND=" - ${COMMON_DEPEND} - syslog? ( virtual/logger ) -" -DEPEND=" - ${COMMON_DEPEND} - X? ( x11-base/xorg-proto ) - gui? ( - vulkan? ( dev-util/vulkan-headers ) - ) - network? ( - sctp? ( net-misc/lksctp-tools ) - ) - test? ( - elibc_musl? ( sys-libs/timezone-data ) - ) -" -BDEPEND="zstd? ( app-arch/libarchive[zstd] )" #910392 -PDEPEND=" - nls? ( ~dev-qt/qttranslations-${PV}:6 ) - wayland? ( ~dev-qt/qtwayland-${PV}:6 ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch - "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch - "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch - "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch - "${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch -) - -src_prepare() { - qt6-build_src_prepare - - if use test; then - # test itself has -Werror=strict-aliasing issues, drop for simplicity - sed -e '/add_subdirectory(qsharedpointer)/d' \ - -i tests/auto/corelib/tools/CMakeLists.txt || die - - # workaround for __extendhfxf2 being used for tst_qfloat16.cpp - # which is unavailable with compiler-rt (assume used if clang) - if tc-is-clang; then - sed -e '/add_subdirectory(qfloat16)/d' \ - -i tests/auto/corelib/global/CMakeLists.txt || die - fi - fi -} - -src_configure() { - if use gtk; then - # defang automagic dependencies (bug #624960) - use X || append-cxxflags -DGENTOO_GTK_HIDE_X11 - use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND - fi - - local mycmakeargs=( - -DBUILD_WITH_PCH=OFF - - -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" - -DINSTALL_BINDIR="${QT6_BINDIR}" - -DINSTALL_DATADIR="${QT6_DATADIR}" - -DINSTALL_DOCDIR="${QT6_DOCDIR}" - -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" - -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" - -DINSTALL_LIBDIR="${QT6_LIBDIR}" - -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" - -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" - -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" - -DINSTALL_QMLDIR="${QT6_QMLDIR}" - -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" - -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" - - -DQT_UNITY_BUILD=ON # ~30% faster build, affects other dev-qt/* too - - -DQT_FEATURE_relocatable=OFF #927691 - $(qt_feature ssl openssl) - $(qt_feature ssl openssl_linked) - $(qt_feature udev libudev) - $(qt_feature zstd) - - # qtcore - $(qt_feature icu) - $(qt_feature journald) - $(qt_feature syslog) - - # tools - -DQT_FEATURE_androiddeployqt=OFF - - # modules - $(qt_feature concurrent) - $(qt_feature dbus) - $(qt_feature gui) - $(qt_feature network) - $(qt_feature sql) - # trivial, and is often needed (sometimes even when not building tests) - -DQT_FEATURE_testlib=ON - $(qt_feature xml) - ) - - use gui && mycmakeargs+=( - $(qt_feature X xcb) - $(qt_feature X system_xcb_xinput) - $(qt_feature X xkbcommon_x11) - $(cmake_use_find_package X X11) # needed for truly no automagic - $(qt_feature accessibility accessibility_atspi_bridge) - $(qt_feature eglfs) - $(qt_feature evdev) - $(qt_feature evdev mtdev) - $(qt_feature libinput) - $(qt_feature renderdoc graphicsframecapture) - $(qt_feature tslib) - $(qt_feature vulkan) - $(qt_feature wayland) - $(qt_feature widgets) - -DINPUT_opengl=$(usex opengl $(usex gles2-only es2 desktop) no) - -DQT_FEATURE_system_textmarkdownreader=OFF # TODO?: package md4c - ) && use widgets && mycmakeargs+=( - # note: qtprintsupport is enabled w/ gui+widgets regardless of USE=cups - $(qt_feature cups) - $(qt_feature gtk gtk3) - ) - - use network && mycmakeargs+=( - $(qt_feature brotli) - $(qt_feature gssapi) - $(qt_feature libproxy) - $(qt_feature sctp) - $(usev test -DQT_SKIP_DOCKER_COMPOSE=ON) - ) - - use sql && mycmakeargs+=( - -DQT_FEATURE_sql_db2=OFF # unpackaged - -DQT_FEATURE_sql_ibase=OFF # unpackaged - -DQT_FEATURE_sql_mimer=OFF # unpackaged - $(qt_feature mysql sql_mysql) - $(qt_feature oci8 sql_oci) - $(usev oci8 -DOracle_ROOT="${ESYSROOT}"/usr/$(get_libdir)/oracle/client) - $(qt_feature odbc sql_odbc) - $(qt_feature postgres sql_psql) - $(qt_feature sqlite sql_sqlite) - $(qt_feature sqlite system_sqlite) - ) - - qt6-build_src_configure -} - -src_test() { - local -x TZ=UTC - local -x LC_TIME=C - - local CMAKE_SKIP_TESTS=( - # broken with out-of-source + if qtbase is not already installed - tst_moc - tst_qmake - # similarly broken when relocatable=OFF (bug #927691) - tst_qapplication - tst_qt_cmake_create - tst_uic - # needs x11/opengl, we *could* run these but tend to be flaky - # when opengl rendering is involved (even if software-only) - tst_qopengl{,config,widget,window} - tst_qgraphicsview - tst_qx11info - # fails with network sandbox - tst_qdnslookup - # fails with sandbox - tst_qsharedmemory - # typical to lack SCTP support on non-generic kernels - tst_qsctpsocket - # randomly fails without -j1, and not worth it over this (bug #916181) - tst_qfiledialog{,2} - # may randomly hang+timeout, perhaps related to -j as well - tst_qprocess #936484 - tst_qtimer - # these can be flaky depending on the environment/toolchain - tst_qlogging # backtrace log test can easily vary - tst_q{,raw}font # affected by available fonts / settings (bug #914737) - tst_qprinter # checks system's printers (bug #916216) - tst_qhighdpi # may detect users' settings and fail (bug #935364) - tst_qstorageinfo # checks mounted filesystems - # flaky due to using different test framework and fails with USE=-gui - tst_selftests - # known failing when using clang+glibc+stdc++, needs looking into - tst_qthread - # partially failing on x86 chroots and seemingly(?) harmless (dev-qt - # revdeps tests pass), skip globally to avoid keywording flakiness - tst_json - tst_qcolorspace - tst_qdoublevalidator - tst_qglobal - tst_qglyphrun - tst_qvectornd - tst_rcc - # similarly, but on armv7 and potentially others (bug #914028) - tst_qlineedit - tst_qpainter - # likewise, known failing on BE arches (bug #914033,914371,918878) - tst_qimagereader - tst_qimagewriter - tst_qpluginloader - tst_quuid # >=6.6.2 had related fixes, needs retesting - # partially broken on llvm-musl, needs looking into but skip to have - # a baseline for regressions (rest of dev-qt still passes with musl) - $(usev elibc_musl ' - tst_qicoimageformat - tst_qimagereader - tst_qimage - ') - # fails due to hppa's NaN handling, needs looking into (bug #914371) - $(usev hppa ' - tst_qcborvalue - tst_qnumeric - ') - # bug #914033 - $(usev sparc ' - tst_qbuffer - tst_qtconcurrentiteratekernel - ') - # note: for linux, upstream only really runs+maintains tests for amd64 - # https://doc.qt.io/qt-6/supported-platforms.html - ) - - qt6-build_src_test -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete_bins=( # need a better way to handle this - clientserver copier crashingServer desktopsettingsaware_helper - echo fileWriterProcess modal_helper nospace 'one space' - paster qcommandlineparser_test_helper qfileopeneventexternal - socketprocess syslocaleapp tst_qhashseed_helper 'two space s' - write-read-write - ) - local delete=( # sigh - "${D}${QT6_BINDIR}"/test* - "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -}