From be8708090362c01c6111c4b76f1e395c14d86e00 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 13 Aug 2024 11:06:03 +0100 Subject: gentoo auto-resync : 13:08:2024 - 11:06:03 --- dev-qt/Manifest.gz | Bin 11726 -> 11727 bytes dev-qt/qtbase/Manifest | 10 +- .../qtbase/files/qtbase-6.7.2-float16-sse2.patch | 43 +++ dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch | 32 ++ dev-qt/qtbase/qtbase-6.7.2-r1.ebuild | 357 -------------------- dev-qt/qtbase/qtbase-6.7.2-r2.ebuild | 359 +++++++++++++++++++++ dev-qt/qtbase/qtbase-6.7.9999.ebuild | 1 + dev-qt/qtbase/qtbase-6.8.9999.ebuild | 1 + dev-qt/qtbase/qtbase-6.9999.ebuild | 1 + dev-qt/qtconnectivity/Manifest | 2 +- dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild | 2 +- dev-qt/qtspeech/Manifest | 2 +- dev-qt/qtspeech/qtspeech-6.7.2.ebuild | 2 +- 13 files changed, 447 insertions(+), 365 deletions(-) create mode 100644 dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch create mode 100644 dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch delete mode 100644 dev-qt/qtbase/qtbase-6.7.2-r1.ebuild create mode 100644 dev-qt/qtbase/qtbase-6.7.2-r2.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index f45e3d241aa5..7f92a0dd8dd5 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 817b2d85bf01..9c82d6224700 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -3,9 +3,11 @@ AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f AUX qtbase-6.6.1-forkfd-childstack-size.patch 1003 BLAKE2B abc1bc5633032fc55fca91ef3dcc33617b11694d7a9d97e5eac21c0b4aae900082b7158da08b8514a3424364a3c35cb49d46fa11a0739aadbb73766b7fee949a SHA512 9e1dfb3452858131db286cb30915871e46178bb0891b604a257745fad133676cdf0df5273b6f681c49b1c3d3245f2c6e0a5025ce19efe6a0ed8bf5a1b3a5a5f0 AUX qtbase-6.6.3-gcc14-avx512fp16.patch 470 BLAKE2B 616b4fdcee6819a0ca4de1220f7524e0df00e13912e2e28d5c204d1a3e2bc351b9cdc212b9169e4d84e2884df76d9722a73f29734c18fe50cc8e6583e41a5cc2 SHA512 1effa903d5d3c65ffc6af5fb2f9896346b4b90cd1f8a54f0a697f23f1c118dd1803b5f4fa9b4959cf4ba1c433d36ca21a6abe6cb3bfae84a811297566388e907 AUX qtbase-6.7.2-CVE-2024-39936.patch 7171 BLAKE2B d1b6e9a35e35f1e6b3e7a7c975fb6719b8594ee5f3212bc18bfe4a1990d70424a682071551c5971d62d6351a38e36b6f4c4acb9241af1ad2e64ec604ca440394 SHA512 cd6b48ebe7c1dc1224a54f0d32845e598223a3c40c6da11b4639646fb073c6b5a2e54d9625ba0413afb876a83c2d50bdf616f4876154fb33fa941d6cbf053291 +AUX qtbase-6.7.2-float16-sse2.patch 1773 BLAKE2B c5b8bb7065db6186d81fb9267235327eba698c096d3e8051a2671d4655ada21ff063b297b00b8da098bb07b6a4abc9fb42fb7652e9de8aa759a349f8f1e58afc SHA512 af4b3c014ce86de25c02d7846ff0e354762513313d353971e6259da1dea20d6bc5ae7fb475469d29c3251d4e9e6446afda8b21086df50ba1108083d112bbfe73 +AUX qtbase-6.7.2-gcc15-odr.patch 1162 BLAKE2B 640688d21fb70ce67378e0f8ac5ddac12b657a9802c0f2e524e6c210cf055955cda41300dd792949541e085d5e8a7ef19dcceaa36f6f73da651f89e88dab2ff4 SHA512 3dd8f26d02fb11075f97b3284e8c0ed1bcff5feafc6535026078dc5b38ed106ae144c18db1fff502b1cebb06761f55d995a8e31c8a6b701f08d21fdbb170bba1 DIST qtbase-everywhere-src-6.7.2.tar.xz 49364504 BLAKE2B b48b8a8decafe3262d459b9446c25561851fef88b3316107c2909f5964e8122a558b5501a3e59667bdf4776d36ea5ba0d9f227538c45c1f8e94fbc8fff4244a6 SHA512 eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b -EBUILD qtbase-6.7.2-r1.ebuild 9791 BLAKE2B f65954646f705dc3263d711a447c9803e7b967c3c8b35cb4148726aedcfd14edeb2c6b0a408b226c9e58ea26e0304d69a2908fe1b95c9c0e92a11da6736b5165 SHA512 e9cb9a522776e4904d0e715b17385f93f37fa41c309083593d0a0e005fad0f449eebd7a444cabb0c7d0dc82dd59f4d4af2e029090b5de546b2147b81e89cbd81 -EBUILD qtbase-6.7.9999.ebuild 9749 BLAKE2B c9416e34473869963c79ad6b79316d82c7a69256e7f3eb37c6c16ef9388880dbaa1541b2cf333db9d050d3c8067d5469adab7c786c8332d98648c7b151c1a147 SHA512 3a8ba5819a4d0dab097b13726cbd63b82f4ac15a112f6ce07a79d46005ecb09414a48a6763bc95253ac38280cd78179c7f1478e818e34eb99edd10b4d2042489 -EBUILD qtbase-6.8.9999.ebuild 10188 BLAKE2B e11f0819a5fd5b4669cbc20ff54db471709b5ff2cdede20169f2068dae57790e1346bddeb3615ea693417abe0f945860053aa56db5d06d00f441456937c7fe7f SHA512 382447cfd0f81f2de3543cc0bfa62f80de9a124b59d96707e538d44e9db1be6244888fb3d4ef683fc99f09669eb253449ec1036fae2cba563053c3f207d2a301 -EBUILD qtbase-6.9999.ebuild 10188 BLAKE2B e11f0819a5fd5b4669cbc20ff54db471709b5ff2cdede20169f2068dae57790e1346bddeb3615ea693417abe0f945860053aa56db5d06d00f441456937c7fe7f SHA512 382447cfd0f81f2de3543cc0bfa62f80de9a124b59d96707e538d44e9db1be6244888fb3d4ef683fc99f09669eb253449ec1036fae2cba563053c3f207d2a301 +EBUILD qtbase-6.7.2-r2.ebuild 9880 BLAKE2B d0b3a956261bc41e8830b1dc162ae80b1021adad7d68d3b7b2a8959db7c39cfdcb15a2e1160878007030c32d6e1f10f6cd30fca0bb8ec261ed8c0afab4149a6a SHA512 d8f9c1810566f0262b39955d3b2fde6d253012146aba144feb590b82577d7cf0f74a94a28b60bcda8b7ff2281e28a49844ddfa6a385679e2c5cb786240690e3a +EBUILD qtbase-6.7.9999.ebuild 9792 BLAKE2B d72b01ed47ae38fe000328592b241a6a5ac08a48290d0c5daa541201a6fa5b830f9f4c59b7e65744cf580f0c31ed0d6889b4b7b1ba8d5024dfb69fdcf9c28c20 SHA512 90325744d31ed5ba8fe0152306e1407f828f00e06c6667fb2a917bcb905a1e391420e56e3074e9638e136f439e3aa2535de256c0484f1d70037830c789bbe43c +EBUILD qtbase-6.8.9999.ebuild 10231 BLAKE2B 6582a481a27100606457b10a4040c39c6720fe8962ae4b85163adcc05f1052729560c71aab81be01c67754c55abaacc76ef0699c2e195ce29461a53728577979 SHA512 0e19345616ea933eee1650d5f5447ef6d852dd084082cd3e89b748d18e6cc1f8f38548c90eb08475b20468d52c96f743fa67a52f37fcd125483b134e9825f0a5 +EBUILD qtbase-6.9999.ebuild 10231 BLAKE2B 6582a481a27100606457b10a4040c39c6720fe8962ae4b85163adcc05f1052729560c71aab81be01c67754c55abaacc76ef0699c2e195ce29461a53728577979 SHA512 0e19345616ea933eee1650d5f5447ef6d852dd084082cd3e89b748d18e6cc1f8f38548c90eb08475b20468d52c96f743fa67a52f37fcd125483b134e9825f0a5 MISC metadata.xml 1965 BLAKE2B e91aa3bc2379fa587766cfc7c4053b382a8894c0092d075543b2a5d466dfa001105bb0f564008fab8e71d4517954e527618896de41069c6bafb4258f6201cdbe SHA512 a71f6fe0fb01e60716aa6632605a423f765983f41da2c8ca761afca548cd061bd52bc328f7441fa831e890d75bcfc2820112c946802588dab1de706fbb7ac531 diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch b/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch new file mode 100644 index 000000000000..a54c9daa42b9 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.2-float16-sse2.patch @@ -0,0 +1,43 @@ +Backport from 6.7.3 as it may cause major problems for x86 sse2-less +systems using gcc14. + +https://github.com/qt/qtbase/commit/39fa7e7bef90be2940c5f736935f963e3969e0bd +From: Dmitry Shachnev +Date: Sat, 27 Jul 2024 23:03:07 +0300 +Subject: [PATCH] Use _Float16 only when SSE2 is enabled +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The GCC documentation [1] says: “On x86 targets with SSE2 enabled, GCC +supports half-precision (16-bit) floating point via the _Float16 type”. + +On non-SSE2 x86 (such as Debian i386 baseline [2]), __FLT16_MAX__ is +defined starting with GCC 14 [3], however any non-trivial use of the +_Float16 type results in an error: + +error: operation not permitted on type ‘_Float16’ without option ‘-msse2’ + +which makes some packages fail to build on i386 architecture [4]. + +[1]: https://gcc.gnu.org/onlinedocs/gcc/Half-Precision.html +[2]: https://wiki.debian.org/ArchitectureSpecificsMemo#i386-1 +[3]: https://gcc.gnu.org/g:9a19fa8b616f83474c35cc5b34a3865073ced829 +[4]: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1076986 +--- a/src/corelib/global/qtypes.h ++++ b/src/corelib/global/qtypes.h +@@ -264,11 +264,10 @@ + # define QFLOAT16_IS_NATIVE 1 + using NativeFloat16Type = decltype(__FLT16_MAX__); +-#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) ++#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__ARM_FP16_FORMAT_IEEE) + # define QFLOAT16_IS_NATIVE 1 +-# ifdef __ARM_FP16_FORMAT_IEEE + using NativeFloat16Type = __fp16; +-# else ++#elif defined(Q_CC_GNU_ONLY) && defined(__FLT16_MAX__) && defined(__SSE2__) ++# define QFLOAT16_IS_NATIVE 1 + using NativeFloat16Type = _Float16; +-# endif + #else + # define QFLOAT16_IS_NATIVE 0 diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch b/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch new file mode 100644 index 000000000000..64cedb14662a --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.2-gcc15-odr.patch @@ -0,0 +1,32 @@ +https://codereview.qt-project.org/c/qt/qtbase/+/582403 +From: Sam James +Date: Sat, 10 Aug 2024 16:43:05 +0100 +Subject: [PATCH] Fix ODR violation for IsFloatType_v + +With recent GCC 15 trunk, I started to see: +``` +ld: .../kwalletentry.cc.o:(.rodata+0x0): multiple definition of `QtPrivate::IsFloatType_v<_Float16>'; + src/runtime/kwalletd/backend/CMakeFiles/KF6WalletBackend.dir/cbc.cc.o:(.rodata+0x0): first defined here +``` + +The issue is that constexpr is only implicitly inline for functions or +static data members [0], so the two constexpr IsFloatType_v definitions +here cause an ODR violation. + +Explicitly mark them as inline constexpr. + +[0] http://eel.is/c++draft/dcl.constexpr#1.sentence-3 +--- a/src/corelib/global/qcomparehelpers.h ++++ b/src/corelib/global/qcomparehelpers.h +@@ -348,9 +348,9 @@ + + template +-constexpr bool IsFloatType_v = std::is_floating_point_v; ++inline constexpr bool IsFloatType_v = std::is_floating_point_v; + + #if QFLOAT16_IS_NATIVE + template <> +-constexpr bool IsFloatType_v = true; ++inline constexpr bool IsFloatType_v = true; + #endif + diff --git a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild deleted file mode 100644 index 37e0b5c51a97..000000000000 --- a/dev-qt/qtbase/qtbase-6.7.2-r1.ebuild +++ /dev/null @@ -1,357 +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="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 - 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-CVE-2024-39936.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() { - 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 -} diff --git a/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild new file mode 100644 index 000000000000..68a5c8f9e4fa --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.7.2-r2.ebuild @@ -0,0 +1,359 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit 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 + 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-CVE-2024-39936.patch + "${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch + "${FILESDIR}"/${PN}-6.7.2-float16-sse2.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() { + 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 +} diff --git a/dev-qt/qtbase/qtbase-6.7.9999.ebuild b/dev-qt/qtbase/qtbase-6.7.9999.ebuild index 66720e44d615..e4a66f7137f8 100644 --- a/dev-qt/qtbase/qtbase-6.7.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.7.9999.ebuild @@ -145,6 +145,7 @@ PATCHES=( "${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-gcc15-odr.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.8.9999.ebuild b/dev-qt/qtbase/qtbase-6.8.9999.ebuild index 0f0f5cc3cd3a..9af015d9b088 100644 --- a/dev-qt/qtbase/qtbase-6.8.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.8.9999.ebuild @@ -145,6 +145,7 @@ PATCHES=( "${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-gcc15-odr.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 0f0f5cc3cd3a..9af015d9b088 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -145,6 +145,7 @@ PATCHES=( "${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-gcc15-odr.patch ) src_prepare() { diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest index 2705eccf8435..2f41c3ce2787 100644 --- a/dev-qt/qtconnectivity/Manifest +++ b/dev-qt/qtconnectivity/Manifest @@ -1,5 +1,5 @@ DIST qtconnectivity-everywhere-src-6.7.2.tar.xz 1061952 BLAKE2B 2b46b255f5ca5ab7b5363f6e3584dd4318a4e4d120c8595b309fba1354d9e1c763d9fa8e84b22f5c342204b2849b27d08a7f5dbd9d00533e150c2b8fb6561db3 SHA512 381098e406ac18d87d34eb9087d1655c16e604059d69b77c04df9d444cefc77630a212f52b0fc2a1573c524044aa1837379d70460e152cd353731e52c4bd0e67 -EBUILD qtconnectivity-6.7.2.ebuild 1729 BLAKE2B 3583ea54d20ea328acd372c25c4b979669704d2dd927545ac2a07df6b6ea4450309573bb5c5facba3b99d28849adb36fd40d99fb1ea225e459138364a76cbf5b SHA512 b6b2a580e718108dba2df8507b3ef09ebb43b1c31c04e08e9177c104023ccb7b93872e25e7cb59dbe64c5170bdb0c7734a796f9f7bf600508a9f827f92f5e1bf +EBUILD qtconnectivity-6.7.2.ebuild 1734 BLAKE2B 21b1cfd523c635eab9abc358262511a368e362173e3ba7db637b70bd66bfaa53840e93dae3e79c4782b77fc8edfde324750b1d1d5ea7d95642662e4ebeed3e83 SHA512 26dc5f98133d3c734442a9a2d30422042cdd1d41db8b0948a91ac9c5947ecdec2173524c22d20cb359a7e503debee16e1d3686eaee134b2c487bc58599f83753 EBUILD qtconnectivity-6.7.9999.ebuild 1734 BLAKE2B d164b5e96a0d191090f030d10f74024b8d79924b45cf20df9736b0e036a86dd8f30b87521105e6be8d18cc402c209eb0430611da502472d7ad3191b8a53b956c SHA512 70fc092b946fb5ade32de076169722184e7707ea1c7315fd328936870363fe277f70724a944110c7d2e6059fb1a0d4a21b2a54e03732209f516312f419de7838 EBUILD qtconnectivity-6.8.9999.ebuild 1895 BLAKE2B 782530ba9f6eef2143b44bf2538d3ab059dc733c8d8a3a60f683589f49fe07cf103861ca153357662399c87051a856a207b76b49b24ba2dc50e4473474bf5c91 SHA512 cdd850f365293541f00b35be88ccb5fcd10bfc14e6aa5d6bfad6e976fd7ec6f4d25b3c9a4c0a5b9fd94af949006ed7854a6c20b4e5a47684fa852e733b315d25 EBUILD qtconnectivity-6.9999.ebuild 1895 BLAKE2B 782530ba9f6eef2143b44bf2538d3ab059dc733c8d8a3a60f683589f49fe07cf103861ca153357662399c87051a856a207b76b49b24ba2dc50e4473474bf5c91 SHA512 cdd850f365293541f00b35be88ccb5fcd10bfc14e6aa5d6bfad6e976fd7ec6f4d25b3c9a4c0a5b9fd94af949006ed7854a6c20b4e5a47684fa852e733b315d25 diff --git a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild index 3f4404399c47..89f22274689a 100644 --- a/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild +++ b/dev-qt/qtconnectivity/qtconnectivity-6.7.2.ebuild @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="Bluetooth and NFC support library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" fi IUSE="+bluetooth nfc smartcard" diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest index 5761decb9682..74c89c8f4353 100644 --- a/dev-qt/qtspeech/Manifest +++ b/dev-qt/qtspeech/Manifest @@ -2,7 +2,7 @@ DIST qtspeech-5.15.14-gentoo-kde-1.tar.xz 1044 BLAKE2B 9f5feb7168f17fa76e89efa2c DIST qtspeech-everywhere-opensource-src-5.15.14.tar.xz 95916 BLAKE2B 15673759f71d4096e29854caa398a5b72257d77891a568e8e4561403b6d88f584a709ab1281c69ff99b250030c40b85848436254b5b6b2277b95728994b81f14 SHA512 87d021efb5d07704dd5469bb3050e9381e8da47d2ef41bd37a95ac1903410b781283af42694dd1300c84bd0f0ea219e61da0a3aaf6204937578d26044a297f79 DIST qtspeech-everywhere-src-6.7.2.tar.xz 262360 BLAKE2B 0faceb7e8425ccb03574fa6db5a9f8dab967197341fce497fc2600a6200d417dba8b83a6a7616fed7cbce3d2c34b48b77e37814518996f917aeadc7ca628ebff SHA512 f6e598834ab455c9feb5836b0add05802261210be088f7860b746a214a5be7d332a43d7c09bd03eef48d362165f2739b858e966249c061c9ef537346453bd588 EBUILD qtspeech-5.15.14.ebuild 730 BLAKE2B c3941cd7399ec7d5cdffd2ad65611bc094c64d0aafdf08f40dc36e2da2feacd037bb01e32bcc8cc1d470a70b19dc3c71a7356c8b4a3921de65f1db6d800000e4 SHA512 e019cb16105b96d9e5d28ea5aa6e0cdb30572e6fcb5313a9efcf5da5b0c35cb696a2173ecf3f969e738db4b84311659c7b8666fe187e2f538db7366923d79374 -EBUILD qtspeech-6.7.2.ebuild 1185 BLAKE2B 4dc3fb855f441253cf74cdfc6e75c7437d2e38b8be1f1045677b675f8f9da51827a9c9333adb0a05dbc2d4802573be4945815a13a3699b130080823f5c6f88a4 SHA512 e3f1519b15d9d46aeca3a907d71fb811e5bba2e47dc2490f82a3032a1341a3a1f7a6c10fcd5789dec1746b2116c5cc44fe74d4d00f37af804a813fec70c1d05f +EBUILD qtspeech-6.7.2.ebuild 1190 BLAKE2B 082e9498be5b601e0454185ddd3e37d78ddaf9f2fe8854a7611f625d457aa85a8fc2b74f6888d8c62b985d7f1d22ce3de737fe74b416429465de52e52cbcc112 SHA512 8dcf13e5997e420a882a2851c8f0b119e20fe577d8e0e46d0fca42b78359715d8979c0059bd5528706326480dae4e7cca20d56aa9628e7ef53716d30fe0f4f42 EBUILD qtspeech-6.7.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04 EBUILD qtspeech-6.8.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04 EBUILD qtspeech-6.9999.ebuild 1190 BLAKE2B 0438b76487862cee67a2a21abfa9151f244fb72f21038aa3e356057aed292d3505b32371193bd97ef22c1a06a3e9c4bc0be0779b36fb535288f8b6acc1998cf2 SHA512 25ea4b33c05d86906f4e17e44cbbe73456c32dc15e63b014272d28c323e0bd8ef67cb5c80b9e2316b436917c0926fa35aeddfdcac30eb081bb558b9caa0bdf04 diff --git a/dev-qt/qtspeech/qtspeech-6.7.2.ebuild b/dev-qt/qtspeech/qtspeech-6.7.2.ebuild index cbeae1e0894f..246f1b0383b9 100644 --- a/dev-qt/qtspeech/qtspeech-6.7.2.ebuild +++ b/dev-qt/qtspeech/qtspeech-6.7.2.ebuild @@ -13,7 +13,7 @@ inherit qt6-build DESCRIPTION="Text-to-speech library for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86" + KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86" fi IUSE="flite qml +speechd" -- cgit v1.2.3