diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-10-10 04:03:58 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-10-10 04:03:58 +0100 |
| commit | 3aae425b3c39d02e2dc917db0fae8c225c158ca1 (patch) | |
| tree | 89f296451fba2217a7c18592ecb1762a920dead7 /dev-qt | |
| parent | 6ee17dd82a3bcd0e90af4ebfbb3e411d342761be (diff) | |
gentoo auto-resync : 10:10:2024 - 04:03:57
Diffstat (limited to 'dev-qt')
70 files changed, 38 insertions, 1999 deletions
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz Binary files differindex 56227f730239..aedbbf221e87 100644 --- a/dev-qt/Manifest.gz +++ b/dev-qt/Manifest.gz diff --git a/dev-qt/qt3d/Manifest b/dev-qt/qt3d/Manifest index 2276ceaf67f2..14e280991954 100644 --- a/dev-qt/qt3d/Manifest +++ b/dev-qt/qt3d/Manifest @@ -5,7 +5,6 @@ DIST qt3d-everywhere-src-6.8.0.tar.xz 141837252 BLAKE2B 29aef2274690826e851ee872 EBUILD qt3d-5.15.14.ebuild 948 BLAKE2B 398c6ec0d38bca086daab3d2cae7a7afe107f977bd980cac0dee1c5919d28024ebce2fdf492c3d14c798e229a13d375d22188613da0d067ebbbe526799364e3a SHA512 e9503b5e06159e4a13e1ed08abb181d4cc7162f15398f1d4907c30a85d798c87793cca1e8fbb1a7c0a5759f6f246f60d7fffd3aecf23a2896a6db9090a4c189a EBUILD qt3d-6.7.2.ebuild 819 BLAKE2B 9203d5455ee0d393559998f08a30e3db9f897f841dcfb4aaba947cb1170c1d9ed1e693bfc0dc240e59209d7181849e5ed729e005d354413f1be6cba33d5b3b60 SHA512 5e38c8c4f0ef1d2dd9b6797640fba79da4a00b16979a08a7ea302f028eab8a78eb5153db51aaf4d0e9a6a0d79605948eead999c6f6a98c535a75c02604aafdef EBUILD qt3d-6.7.3.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417 -EBUILD qt3d-6.7.9999.ebuild 823 BLAKE2B 58c9f78dd834a06248de278fc0d9659eb392632515a2882a415c85802be3311f326a5d2bf14d32ee11ca51d63a02d83bfc16a2b2a075ad35d8b2e668e17148db SHA512 9db8c05d09a05428014a03e4a6e97dc1ad79572aae74712a5cf41017f8c5c84f2b289888de9cbcf75a93d153453da85bbbac27846d531235ff50a4969b586417 EBUILD qt3d-6.8.0.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00 EBUILD qt3d-6.8.9999.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00 EBUILD qt3d-6.9999.ebuild 783 BLAKE2B 19cac8876ea39d0cfa4d642a61aadcb254f7273273eeb77311be87023c9e08e47acf70c0e14864a60e9f99b843716a058848141b45c58abe105c4a9697edbccb SHA512 ee627e2dd24c4e4a599d42e36f5120433c3e73fb0bcd545317dd8b07d6b664f67f6419526917dd9d65d7dcb02e339546815476416529eb8d0dde581f129c6b00 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 5e1b7809f57e..000000000000 --- 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 -} diff --git a/dev-qt/qt5compat/Manifest b/dev-qt/qt5compat/Manifest index f7df4f3d2281..dc98bbd4b8ed 100644 --- a/dev-qt/qt5compat/Manifest +++ b/dev-qt/qt5compat/Manifest @@ -3,7 +3,6 @@ DIST qt5compat-everywhere-src-6.7.3.tar.xz 14631404 BLAKE2B 4a48890740a240d2a2a7 DIST qt5compat-everywhere-src-6.8.0.tar.xz 14632668 BLAKE2B 6e4138d681fa40e7365a31fcbed10bca14ceb838094ffef7afd0d7c8588f0bbb84bbe230cd0347ac21addb4843e98f072dd582893de9ac1c430db1d9d5ec4c2f SHA512 c2304da058f0acf3120348dc179080a3dc28c9cf3605a22a2e8fe2816e9f0aea7e38b22966f59ee85ce52d4a8ddf5084a5fd24932f31e5b40cb64fc09dbca100 EBUILD qt5compat-6.7.2.ebuild 700 BLAKE2B 6f317548654d9239fcee6418f5fc75d6b70f1705b279527155e71bd43615038126d765ae2cea78acf4fdbff7195a6f689641da7d54b79a64f097d11b684f2bb9 SHA512 dcf03ffd55f3ec3f394bb8b27bb878c08c403378729a31540c54582e77ed7d0ef44b601d679e766c06cf69cda74147fe793f325bb60fdf042b7c5887eeaed6cf EBUILD qt5compat-6.7.3.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf -EBUILD qt5compat-6.7.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf EBUILD qt5compat-6.8.0.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf EBUILD qt5compat-6.8.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf EBUILD qt5compat-6.9999.ebuild 706 BLAKE2B cde702b26ce3213329e1e6ee6030feef199a81cd89725f65aaf5c350da27de100e5cb1592065c11ce40bb2396b80b9053b56503aa6bdc13baa38774a1788823c SHA512 20c6f09f176449d81646a8d576db355544f4093f24be2ef970bf83d55d2eda867c21e027985fcd309deacda4fad4e6741815ab7b20787f017e5f68d84fffacbf 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 4462f312f154..000000000000 --- 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 -} diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index a21d1e91cd9c..f6af8869a086 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -16,7 +16,6 @@ DIST qtbase-everywhere-src-6.7.3.tar.xz 49426156 BLAKE2B da7eacd64bd122bf2b320c0 DIST qtbase-everywhere-src-6.8.0.tar.xz 49819628 BLAKE2B 8c69e8c8290a414a38641782ad05a1d412adbf27f1feb091743780b36ee3459cdfe6136c75a60b6985f10a1bc7e78697ff8d896752d2b4286198d8a37fb43d6e SHA512 7bd9452d4cb85fad88e7d609de93e7c3d55ddd2ac47005c20aaaf057bf339d944b5211d1897d21f9896fe433b7c6954eaffd0e80e725b2f3335a047fe06b0cd9 EBUILD qtbase-6.7.2-r5.ebuild 10317 BLAKE2B 92c1b6a9bea4277229f80a96c356de139d7809daa37cf7efaa7bb6e9ceba7ddb53dcc7dbe16919d800b379b9bf896c79de5b56378a593cce914c4ab74c433048 SHA512 19d1666bc8022a6c2aa8bf0f6692a9eadce471655876d7930f2043fc9b02d1fbb21ce81f9dd8553167f51eb2b62d36f9baec69753b73cd76e4de833faa7da14b EBUILD qtbase-6.7.3-r2.ebuild 10166 BLAKE2B 770679cfc4d89daa089ab901a5ef6d809eefbb70c567e4696a4a619bda42aadbd36deda758f702a84337556024a4179b1c4f8fd791c0d0e2919de1f8b5a883e1 SHA512 17f8dc38ce5dd85e18e851a5bdbe115f6dabd0860945e70fc7d3cf408c07ac97a7deec5383a4538ef0d0693b35576cc0fbeef08e44d8cb097fb6f0c0c186e7d6 -EBUILD qtbase-6.7.9999.ebuild 10017 BLAKE2B 2d8d281b680059466fd16962380e338dcd115d2e3c77cfc88e0ceae1337f49ede09534bb8f923108bce66a3b993a753744ca99a3c2d9e27d080115a3e1ef6f23 SHA512 f6b94592da24dee07c3a488d45c2c18aa421c47c65180cd954f9252835bdc0109bc9de61b72be9842ceef7b93f30f5c1fc1a0f1006a3bb4e0cfd1246625efdea EBUILD qtbase-6.8.0-r1.ebuild 10650 BLAKE2B 8411d53978118ef4f73c2cb6ac03cb9c25e8e0599b3c6be15025bcc4e3c02a566bae97d2326c72962fb1a74ab8ff02d3b89268a366552edd8fbfb2a1b0e94cdf SHA512 62ff7872a31f1900627b6abe599b0e4b9f9f710d4e00a75221e6641c2f2909cef69f9ab9b592cd92339a5ce15f2eb8fb698c980e34124358ed237f56ce757c41 EBUILD qtbase-6.8.9999.ebuild 10554 BLAKE2B 64b0c95b5763f5e772e643cde8b11118034ddc303707e8c8b2cc7086f2b36f21ccff7b225d5a6aa818c65a63aa89d57127cbb985a486842f6746e0da2b85a0bb SHA512 bb42ddd44da538c8b229d150a02692524065afafe347268c0f2cf1e77cb8a8b310f9d8bac110dce3063d0203c7b74d4fa52b5a72b5eb8cc48e3b00d185d7df11 EBUILD qtbase-6.9999.ebuild 10504 BLAKE2B e5eee3ef59d52086f340b5669ef9cdbb35b31238dc5894860c694677bc0d2150e8204f5933f77495c6435355ce21731be5a5f41310fe8148f9b8919236fcb33c SHA512 861bcf82a0a283ef56265cc707184eba9533e2e351de9bf92cc395b0527075c0476ed7afe341af75205e3f31cbbdabe18f2f903561c34ea12872b2a25fb3b51f 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 85c2de60245c..000000000000 --- 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 -} diff --git a/dev-qt/qtcharts/Manifest b/dev-qt/qtcharts/Manifest index 33bb6fcf7a79..2238aed8cb72 100644 --- a/dev-qt/qtcharts/Manifest +++ b/dev-qt/qtcharts/Manifest @@ -5,7 +5,6 @@ DIST qtcharts-everywhere-src-6.8.0.tar.xz 4662104 BLAKE2B ef811299adbae1a01cebf8 EBUILD qtcharts-5.15.14.ebuild 571 BLAKE2B 77b3d7d6694a55144a16268d173daec87718d580224e62863905ff8e81e29253cb41143252100f84d0628634a086d6320cbda09a047886852d2ef60d210856d5 SHA512 a649aa77b03c17a2e577a3460da5e95ee2effa70c3786f7533d6f64209f790908fa2bc5b1d39cc77673010374592ebaa2423e29519bb6b81a075648a3a97fcef EBUILD qtcharts-6.7.2.ebuild 566 BLAKE2B 55fc6766a2dde2d5d0f5a2a7439b117c1592ab4c5cc07e01eb603c8845cc591638698939d057decb6e23e5b540d54782402d1ccfc540b4fd9bee715ffe7a4ce6 SHA512 75f01666c2d25a17255360fdec2c0a4f3ee1f8624705de12138a10959341a4d62bf0cb73688b84adb3d5e6e14585830457bc8f9514c4d1826984e76fd06935c0 EBUILD qtcharts-6.7.3.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 -EBUILD qtcharts-6.7.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 EBUILD qtcharts-6.8.0.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 EBUILD qtcharts-6.8.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 EBUILD qtcharts-6.9999.ebuild 572 BLAKE2B 2a66f1efed7d379f9ccf64644560d8058b4ff0e93891f70aeb05f83d908f0ceb7f6dbca008c34fc097bc3460ce9a08a91c85abb43de57b8b537f4c05b18d415c SHA512 5f42c00286e8efb41b97e5ccc609f0390d7f75cd8c1c6744f89c248e6e22d2b5cb69a4064c21b010ca3ad684ac2cfa24ddb374065b8334276f2f03036bcdf215 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 264ac86f8886..000000000000 --- 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 -} diff --git a/dev-qt/qtconnectivity/Manifest b/dev-qt/qtconnectivity/Manifest index 80e2ad9b1bd7..24f9b68e46cc 100644 --- a/dev-qt/qtconnectivity/Manifest +++ b/dev-qt/qtconnectivity/Manifest @@ -3,7 +3,6 @@ DIST qtconnectivity-everywhere-src-6.7.3.tar.xz 1062684 BLAKE2B 69a10c7c9e6ad257 DIST qtconnectivity-everywhere-src-6.8.0.tar.xz 1066392 BLAKE2B ec45b909202e84aea530d4a0d8cad00c74dc98ae72b85ca91a3780bffa6f641c11c99c77b7b7ca02cffba4d6d114c0bfbe30d7a4f44c44553588b6676b430a23 SHA512 c5c780c3f30d366d4845b4ce497ded6603423d0c42f025dd90d54342ff4b536d065d8d1541fa86ae9ca6fcde930e48cbef09216b8cbdabd73d864ce04a7979c9 EBUILD qtconnectivity-6.7.2.ebuild 1734 BLAKE2B 21b1cfd523c635eab9abc358262511a368e362173e3ba7db637b70bd66bfaa53840e93dae3e79c4782b77fc8edfde324750b1d1d5ea7d95642662e4ebeed3e83 SHA512 26dc5f98133d3c734442a9a2d30422042cdd1d41db8b0948a91ac9c5947ecdec2173524c22d20cb359a7e503debee16e1d3686eaee134b2c487bc58599f83753 EBUILD qtconnectivity-6.7.3.ebuild 1739 BLAKE2B 1b838a40dd3edf95f2d18767409880412bd70eb3bff7e6bb2ad89b59935b33aafdd339e47965976acade4b392924cb5eb928e381be4cf3bb34fc6747236a5506 SHA512 7d6cbb7d9577a95111ad15b758ddcb0a0d3ed9c54279b1b0825d0d925f8c4133b6a0cf25adf0b2a0a03856af2a1cd6ae97f811754cc38ef5890c7afdf81b51cf -EBUILD qtconnectivity-6.7.9999.ebuild 1739 BLAKE2B 1b838a40dd3edf95f2d18767409880412bd70eb3bff7e6bb2ad89b59935b33aafdd339e47965976acade4b392924cb5eb928e381be4cf3bb34fc6747236a5506 SHA512 7d6cbb7d9577a95111ad15b758ddcb0a0d3ed9c54279b1b0825d0d925f8c4133b6a0cf25adf0b2a0a03856af2a1cd6ae97f811754cc38ef5890c7afdf81b51cf EBUILD qtconnectivity-6.8.0.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd EBUILD qtconnectivity-6.8.9999.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd EBUILD qtconnectivity-6.9999.ebuild 1900 BLAKE2B 793c75a1ad6163c68f41ac12cc4878a490126ac48197de40fb644df49e95299af53f32cd8a734dc2873f2d21528c787c92352db01ea5395ba646312976b517c4 SHA512 8ce94f9e5d17a0a5052e8c7fa84aba0924a275184e6c3630f1a48d13c44abf1980664eafed9e2718ab6553ad110b84ab5ced95a8ef21532fd34d3e3fcebf01fd 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 c9923654ba1c..000000000000 --- 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 -} diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 058e5b1d9f80..cc2ca5ed40a3 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -1,5 +1,6 @@ AUX qtdeclarative-5.14.2-QQuickItemView-fix-maxXY-extent.patch 1566 BLAKE2B b6436c9be0a7de092635e1fc3999c3142fc3e916cbcc69f472691bbd559f611b4d5741f3627c47162a5ac86126382507add72a25a121235e856b1de802ee19be SHA512 dd5193f8d8a051238dabf63306cc77e3a5696fc12241c27f35cadfd30763ddfeb2af7d640849dcc7a810b7087173b8e9af17341ea1b68440906f2c2f1f96fee3 AUX qtdeclarative-6.7.3-QTBUG-125053.patch 9583 BLAKE2B d7bdfe4d0a002e5d17f57604dbece3294596a76d03bc3c12a05622d2c95a16bde4bb128d19c63e4856270a875c5b6b866c9cfed9f30a346b441a2b81e7cdf2d1 SHA512 3811879d972ff5a0dbfca98c2c2931f50dd9906dc0ecf75f13e59eae71d9d27dfc9279ba9952a00be81cab83e8f8e42e798d9b43d7d3d6974a1676f4e8e401ea +AUX qtdeclarative-6.8.0-QTBUG-129797.patch 1236 BLAKE2B edfa939f1438031c1a0b168dc493806d372f072d3b104975da56711c2ee2df402aba076ca7071576ed98a8bdb0668af2f7258c6d2a9f4ae68192473b1630fb39 SHA512 9cc280dccc08aa0bacd0d5ce34dbd1ab6cebf3bcc3cbe4854b03c1e12971619993845d9689b146cb89557c2dbe7b0a44870e6bb0cb1e1d6b4a89924a19b8be7d DIST qtdeclarative-5.15.14-gentoo-kde-1.tar.xz 26628 BLAKE2B 2b8302b96e5a8cae374da43dfaa5c5c7bf66ddfaa4fed055850fe7b39b995b1416268b94fb98fbc7074b6a0da47e8f9232751dba34b6021e095d7f9339fbfdd9 SHA512 3d4f3cc023e9da32105520bbe74847bb438ec3af85cf6203321400d451902071115ed3cc0c42e8cf995d0304f86cda11096223ad99b09a7dd95b3d83291a7b4a DIST qtdeclarative-everywhere-opensource-src-5.15.14.tar.xz 21595408 BLAKE2B c88388bd04636bc55cad17d97a9f3ee2d3bda6b585cad59d70106bd4e14bf37570bba5edc21627bc08852034adcb483b4c23d7f21ba523dc9e7b6c1f0386a994 SHA512 06c48938c5ab96c4a9e010fdf4a8fbf2b84b7669a486298044363048de3b7da01aa5d9284d1b08b563331887e326befb25566f9972f5143ca3cde47016394bbd DIST qtdeclarative-everywhere-src-6.7.2.tar.xz 35629324 BLAKE2B a2c5a17e2f88dd91dd7ae21950d8bb7bc0856f1f05a093405c68e1b3b584a75fee474a9a7116a1797c464e2ca92778ebec774d4afa5ac6eebb1022daabad8868 SHA512 ca172e79af317f481d6f5e6388dc074fc6f99966b896135ab9991fa1a9502e46b0ac21b7f2bc38278448939e77882c5fd17252e3e6460c1665f8156fa99bceaf @@ -8,8 +9,7 @@ DIST qtdeclarative-everywhere-src-6.8.0.tar.xz 37029068 BLAKE2B 272c673eb06ad28b EBUILD qtdeclarative-5.15.14.ebuild 1537 BLAKE2B 9515ce8d7c01fa8119ecc030871048dece2da2051a67cc1bf61907db5fb1ceeee7ca52503068a9059c3822df398d90e2fec630529a2f88a1ca707ac1c9ef9250 SHA512 d684a28aeda630154eb7c1023dbf231baf5cde528788cb3fbaab35e24a349dd585519aff99d44c405fc6f5f92e9f52d49f30cbbb11c908cf5f42e8d7f5826543 EBUILD qtdeclarative-6.7.2.ebuild 1175 BLAKE2B 4f4d132a22d7987afcb7164ce83e35358b664cc70013f269af95e72b353cfc0103d3953fa308532dfbd00ce0f703c33e341e8a829c1a6bb62a09c07ec8cb7910 SHA512 48af79fdeff33c7d2da696364e1dc1a6694d9a6428a8aae11c5bd2ad2046f7a82bb780824da9a1aef1741322680534cd0d261a50acf235ae3b4fb0f8346d7dc7 EBUILD qtdeclarative-6.7.3-r2.ebuild 1798 BLAKE2B e08a04183d4de74c334058ed703c786ea1f82068707c80f1d009433fba9da289fd94759ba5c537a96d2cee8ebc838c9e2fdebda53246231cb80f4def98ac1a54 SHA512 7717d74451e24072b2fba8737a8ce4e546c3d600209d9d30e6277f3cc60f255a4306120084a21be63d817dc44e4e4866849bfa1128421985d4ca292a7b5ac180 -EBUILD qtdeclarative-6.7.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35 -EBUILD qtdeclarative-6.8.0-r2.ebuild 1798 BLAKE2B e08a04183d4de74c334058ed703c786ea1f82068707c80f1d009433fba9da289fd94759ba5c537a96d2cee8ebc838c9e2fdebda53246231cb80f4def98ac1a54 SHA512 7717d74451e24072b2fba8737a8ce4e546c3d600209d9d30e6277f3cc60f255a4306120084a21be63d817dc44e4e4866849bfa1128421985d4ca292a7b5ac180 +EBUILD qtdeclarative-6.8.0-r3.ebuild 1844 BLAKE2B 7905155582401cc1915abcf7416928ed0da568548d3f56eebb2fc2dcae0c2fa0ae497640132ae8031bfda9e013c256e6dcc9940d683cc209c83c91f2e4785734 SHA512 9ea142da22eee98ca2d8e3d2f1056d9a5da20776b750cea5d6423a7bdc8e3dd68d662ded08e8d6c9d5e20104bbc98bd744484d90f3c6d8ff29ee14e558a0f404 EBUILD qtdeclarative-6.8.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35 EBUILD qtdeclarative-6.9999.ebuild 1739 BLAKE2B 434181ff4ee1fcb2d11b034c977b73bc23225cfe44d0ac5ee048620e2940fb0273c682defe6247d90a1052ad935e418c8c81881a5378d8f5b5f466a147f42120 SHA512 057e76f4969535d8437cbc02e8999aa70656e8256e95ba1e20f3a1bcab34a1bef0fe80812799eb608f3c9c0cb18eb06ad0a3ca04e7e6537997f81ff0136ddd35 MISC metadata.xml 945 BLAKE2B 8a5d26ab3274cb9ca8b7cf3dceddcd33d9690cd20194adc63b80cd5e13e11d222d48473232b4e2cb41cecf1f51b33df4458811b6fb622a41519f0f3f0223b578 SHA512 a4c587afdbb0320e0f23f47a3ae58e2f69e86a0f539bf613c275ab0be7b9490d33d9c9de35ace02d3cfef903f3e6c7caf492cfdfa53c989b2d56e6c7288f4552 diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch b/dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch new file mode 100644 index 000000000000..e43e65c992d6 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-6.8.0-QTBUG-129797.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/941172 +https://bugs.kde.org/show_bug.cgi?id=494281 +https://bugreports.qt.io/browse/QTBUG-129797 +https://codereview.qt-project.org/c/qt/qtdeclarative/+/596457 +--- a/src/qmlcompiler/qqmljscodegenerator.cpp ++++ b/src/qmlcompiler/qqmljscodegenerator.cpp +@@ -78,6 +78,6 @@ + return u"QQmlPrivate::compositeListMetaType(aotContext->compilationUnit, "_s + + (m_jsUnitGenerator->hasStringId(elementName) +- ? QString::number(m_jsUnitGenerator->getStringId(elementName)) +- : u'"' + elementName + u'"') + u")"_s; ++ ? QString::number(m_jsUnitGenerator->getStringId(elementName)) + u')' ++ : u"QStringLiteral(\"%1\"))"_s.arg(elementName)); + } + +@@ -86,6 +86,6 @@ + return u"QQmlPrivate::compositeMetaType(aotContext->compilationUnit, "_s + + (m_jsUnitGenerator->hasStringId(elementName) +- ? QString::number(m_jsUnitGenerator->getStringId(elementName)) +- : u'"' + elementName + u'"') + u")"_s; ++ ? QString::number(m_jsUnitGenerator->getStringId(elementName)) + u')' ++ : u"QStringLiteral(\"%1\"))"_s.arg(elementName)); + } + 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 724f992b0453..000000000000 --- 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 -} diff --git a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild index 749123d1c04f..41fbd3c4f304 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-6.8.0-r3.ebuild @@ -35,6 +35,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-6.7.3-QTBUG-125053.patch + "${FILESDIR}"/${PN}-6.8.0-QTBUG-129797.patch ) src_configure() { diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest index 354863d96826..622126073530 100644 --- a/dev-qt/qthttpserver/Manifest +++ b/dev-qt/qthttpserver/Manifest @@ -3,7 +3,6 @@ DIST qthttpserver-everywhere-src-6.7.3.tar.xz 163692 BLAKE2B 4181301caaf80b4c6f9 DIST qthttpserver-everywhere-src-6.8.0.tar.xz 177428 BLAKE2B b1343b72ce518cf96474b757f90bf7e2898c30bd232bebf40035cbb6a1f23dc79fe46896d956590ab4841c8480b305515ec275669032f1cecec360b83202b435 SHA512 92afcbb3294a3734bf47e53d3088f67722c5a72839f3f3f7208894af9e8356fbdc5aadf7858acf24d98c9594bfe6e5ca93ccca6f4b2190b5ac635f1a80ab771b EBUILD qthttpserver-6.7.2.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be EBUILD qthttpserver-6.7.3.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf -EBUILD qthttpserver-6.7.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da EBUILD qthttpserver-6.8.0.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf EBUILD qthttpserver-6.8.9999.ebuild 575 BLAKE2B affabe9fa30b9ee370823bdd6b7a34480c50a5d0371b3570aa25611d2a0b963e5239068f8d484647ef1bc8fa6fa52c635b9aaba3a087e2c70e6a3946562eeab0 SHA512 0348549a66c33c6720cc09ebe491ce04a54058254ab70be63725a94c7efa41869f660a79eeca5da91e3a59ea149b697a128804ae81f321c2920557cd9727eacf EBUILD qthttpserver-6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da 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 49febbf2b658..000000000000 --- 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 -} diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest index b71d68c2f199..0588de277ee6 100644 --- a/dev-qt/qtimageformats/Manifest +++ b/dev-qt/qtimageformats/Manifest @@ -6,7 +6,6 @@ DIST qtimageformats-everywhere-src-6.8.0.tar.xz 2024480 BLAKE2B c51ea6a6ec3f22af EBUILD qtimageformats-5.15.14.ebuild 704 BLAKE2B 1605a4ca9b659cf90d68e28ec61141794a01e996c42d56178fa040ed01daec10ed3f1a4742285f7815aeb0714773148e7e871a4a20f068e1951e3a3f808bf7ce SHA512 28017ce3fb5a5a3bba55ede588db6333a577656771bae3dfa5df9ea80819535e2db2aba31220fea89f8e6433b8cc07fc226702283e120fa9ad34d20d5a28bf41 EBUILD qtimageformats-6.7.2.ebuild 846 BLAKE2B 73d140d34187d0bb89bfd7ab4d74a99d5243727820b4ee1426578c1f2b1df6690e7d608f2512971b762b385b791879f832e01e9ffdfeea03ee9b9ad46be2f4e9 SHA512 82c35a7c4939cf3318ca3324941099f30cc747aa034764fdcc01014e025e6cea48e44eca2f33c20d189e2b30ad98830ce7b56538d76552b2c27b590304591e7a EBUILD qtimageformats-6.7.3.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e -EBUILD qtimageformats-6.7.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e EBUILD qtimageformats-6.8.0.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e EBUILD qtimageformats-6.8.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e EBUILD qtimageformats-6.9999.ebuild 851 BLAKE2B 105a8533f57e5182d3e2442b436a6709dcd438c6f9c76fed44b13b8414fbaa51341bebfb75b60911b59a4b65467186d11cef202edd1ee63305afcdf39efe9fe8 SHA512 41b629aaa477787039ee26b77501398557ff034a9c1c49f06c48eeb2ff4d07ab3ca32c4ecc04acf6b07c1bde25d8528c4dfc2fa96efc9bfefaecabe35ab9253e 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 9d1a9a6f9685..000000000000 --- 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 -} diff --git a/dev-qt/qtlanguageserver/Manifest b/dev-qt/qtlanguageserver/Manifest index d4d05367b38d..f809eb75f252 100644 --- a/dev-qt/qtlanguageserver/Manifest +++ b/dev-qt/qtlanguageserver/Manifest @@ -3,7 +3,6 @@ DIST qtlanguageserver-everywhere-src-6.7.3.tar.xz 145752 BLAKE2B 895c9bcb4333fde DIST qtlanguageserver-everywhere-src-6.8.0.tar.xz 146340 BLAKE2B f193668a8a5e2a4644f629b14c4e56b856e4535ac3a29825d75b17533b4d0fde8c51959343abe6c884f0d31aa8cb26322a4b6dd47ecdea235f6802336ee18a3d SHA512 717b9844cb86d5ee2e88d09b8764f47a290c4b13284361600e0e08d834c2d3957dde11ce9d1cc6b1025367e3bad1868cd3fdd0ed45056030c7cd037e79c67254 EBUILD qtlanguageserver-6.7.2.ebuild 315 BLAKE2B 20841e633743aaeaf6f61a5ccf0ef80d88e4eaeef957b03fa4cdbb4acfba6349dd6208003ddde02092b00b818e17d25d3410b33f34e8e5fe40c544b2594a1bd7 SHA512 4eac32e1244a4a4d68061860ad0d7b6454d7485b825ce57deac8c715417a8ebffaec7ad23e3ddce840348ba96d73d3a5093f178038e4a3ae7f6f751792a26ff7 EBUILD qtlanguageserver-6.7.3.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 -EBUILD qtlanguageserver-6.7.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 EBUILD qtlanguageserver-6.8.0.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 EBUILD qtlanguageserver-6.8.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 EBUILD qtlanguageserver-6.9999.ebuild 316 BLAKE2B d430cbe5402d5ddef39cc6f2434cff80c96bdb1b509f1867512e5088a79c10e19af907512a36710051538408ad6003e8a883e9cf2a0703d8c982e855514374ba SHA512 44bf60549f9ee619904517be2112cd4f730a16d89dde3187c4a775446ff6e84dc77a25c184414594663cf62accad605ef14b33d0d76d934556ccefa55f39cd17 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 b02596ef5aab..000000000000 --- 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}" diff --git a/dev-qt/qtlocation/Manifest b/dev-qt/qtlocation/Manifest index 8ae9845b180a..cabd6a91b163 100644 --- a/dev-qt/qtlocation/Manifest +++ b/dev-qt/qtlocation/Manifest @@ -9,7 +9,6 @@ EBUILD qtlocation-5.15.14-r1.ebuild 1629 BLAKE2B 93af70522115073f42fcc8b073cd515 EBUILD qtlocation-5.15.14.ebuild 1629 BLAKE2B e5552627571a6b161e8fa025d5d8b21d96d8aba6b407efcaef5ccd6a17d656975904e2f927ef1218662a74dc28aa19811f2614298e3c1e653388e830d80db177 SHA512 dfe5123c519a24ae26cecb5d92b7a6a7c73722b78ed73cf66e6ebe45e09260ab119512fa6d2a48371a0830bf60e129321a2ea3b36fb13a67df04391bbe3ab7ea EBUILD qtlocation-6.7.2.ebuild 1367 BLAKE2B 7b74bb6c4539fa58b6d2b6153909d37eb9dcfa0a0ba9fd9145329519b5fae4196b53ff8a12d004f98717b7d43762a90742740e0755f89bc090bf0ded151d7fff SHA512 e8ce507d2ec96be88e69a7161e9e3e4bc3e142ab4bdb10572d4b73d31c8803be9d773a06481d5f0da1261c03e5dc6fe5e6ef36e6a038dea4b7cd4a6ce2545951 EBUILD qtlocation-6.7.3.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 -EBUILD qtlocation-6.7.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 EBUILD qtlocation-6.8.0.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 EBUILD qtlocation-6.8.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 EBUILD qtlocation-6.9999.ebuild 1372 BLAKE2B 0f3a72169d3cfc8e7424897727ea19b19b0484ef4ce1b07db9b3118d921d6cfeeaac3267ac6bf27a1caa37b444e513187afb5e492fa5fd5f6e004be53bfec82d SHA512 5dcffbcb3237af0ef18f2fd962d77ee412141ee9a1e7531d7fef916738a8a20ae37946052632ca7b7c4193342a3c7067a74df6122306e605e0de527befc3cb26 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 d407e2f12e54..000000000000 --- 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 -} diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest index 62ef0413e4d3..da370bda65ca 100644 --- a/dev-qt/qtmultimedia/Manifest +++ b/dev-qt/qtmultimedia/Manifest @@ -8,8 +8,7 @@ DIST qtmultimedia-everywhere-src-6.8.0.tar.xz 9591692 BLAKE2B fd55d8a97573c6eef6 EBUILD qtmultimedia-5.15.14.ebuild 1511 BLAKE2B 81fd1f3d666a9c3da203ccc37ef635954c25d00e1928be7d2250fe7a8bbf564da4e61c2e1be07afc7bc51ac340c0605d241ef5bbcf5e1ec846e528886b8f6aea SHA512 5dd3b3f0b22029dadf98e404d4be3557eb335e666fc08ea7bd39134f9770433fe5e35524ca9df6e89deb342e2b8e03a679e0e7718d534693cb0191c618162b91 EBUILD qtmultimedia-6.7.2-r2.ebuild 3286 BLAKE2B 59566faeeb43449047c4829393193bb3f23ccf0bb02cc79885d3e8ff103c5bc191f79b26677ca460c18f3709802e310ef8abbdc414937f1141045f0848d43ba2 SHA512 4b99fb509091805e90d022c08e5f0de87fe6dc378318500cba843aacfb4a6cd613f0069d34286c3510f05282391be1b92618e0fe6f21badfa5e6433193e2cd84 EBUILD qtmultimedia-6.7.3.ebuild 3608 BLAKE2B 1ee127fe1352a46e26f487800599baf10a7317362921a31a09721738e007236c3382b7223b90a345aab40a627db6213e5bc3a424c8437796159eec5082d5b2cd SHA512 713a37bde7cd80849d350b054df8e9f466397025d368e1b466948079d0cc50d7a46dcc03d1b7c1125bfc61219b905a48f274244972c31c296e504c78a4fd9967 -EBUILD qtmultimedia-6.7.9999.ebuild 3608 BLAKE2B 1ee127fe1352a46e26f487800599baf10a7317362921a31a09721738e007236c3382b7223b90a345aab40a627db6213e5bc3a424c8437796159eec5082d5b2cd SHA512 713a37bde7cd80849d350b054df8e9f466397025d368e1b466948079d0cc50d7a46dcc03d1b7c1125bfc61219b905a48f274244972c31c296e504c78a4fd9967 -EBUILD qtmultimedia-6.8.0.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f -EBUILD qtmultimedia-6.8.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f -EBUILD qtmultimedia-6.9999.ebuild 3897 BLAKE2B f937f76181691a4533062d584722c1cb59143c9b5f5dda6ff3f358ff6897e52b7ae872fc2e7b6fbfdae252a15a71187db0392697db815a55176182a4744c3aa0 SHA512 6f18cf3bb54f58b3e0437b2ac5f5038423283af926b041bfac2914bf3fdcbe9cd44a993e9cb56cd477e5b360bcf8df00274487ecdb766ac07a1806846941e81f +EBUILD qtmultimedia-6.8.0.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77 +EBUILD qtmultimedia-6.8.9999.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77 +EBUILD qtmultimedia-6.9999.ebuild 3912 BLAKE2B b0ed9aab566b05dea5de27decd4a6a908da2db9c45132202898ffb18ab4a12e5972cc3e733d83d15c31cddc82f1883d5116bac65590014dd5dd7d8eb982060aa SHA512 5b88bec9cb387c6053df1e4855004483a604a8c7f1e98391f4b3d16541285047a014db42a6ef7e9ddb0734d31c6ed01c9bc026d82a86377bc343aa71127b0e77 MISC metadata.xml 888 BLAKE2B bf3f5b1376585d4aa9021aa838b486b8143e5fbf7c5bf7c7324500de96ab86fd0176993567f97f5e5d115284f8c3ccc16475f787407d747689aefa82cf9a9534 SHA512 98e962234f1ed462444e5f7f3e77a08794b2d0480df7773e822a5671cdfbf708b51edfafacffade2ad5f8b177d89cc0d53b975ef181be66b885c17db2a4a542b 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 2921a408326e..000000000000 --- 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 -} diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild index abc7252aee13..90448d9168fe 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.0.ebuild @@ -92,7 +92,7 @@ CMAKE_SKIP_TESTS=( src_configure() { # normally passed by the build system, but needed for 32-on-64 chroots - use x86 && append-cppflags -DPFFFT_SIMD_DISABLE + use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild index abc7252aee13..90448d9168fe 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.8.9999.ebuild @@ -92,7 +92,7 @@ CMAKE_SKIP_TESTS=( src_configure() { # normally passed by the build system, but needed for 32-on-64 chroots - use x86 && append-cppflags -DPFFFT_SIMD_DISABLE + use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index abc7252aee13..90448d9168fe 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -92,7 +92,7 @@ CMAKE_SKIP_TESTS=( src_configure() { # normally passed by the build system, but needed for 32-on-64 chroots - use x86 && append-cppflags -DPFFFT_SIMD_DISABLE + use x86 && append-cppflags -DDISABLE_SIMD -DPFFFT_SIMD_DISABLE local mycmakeargs=( $(cmake_use_find_package qml Qt6Qml) diff --git a/dev-qt/qtnetworkauth/Manifest b/dev-qt/qtnetworkauth/Manifest index f27bcf7de742..33456752df4d 100644 --- a/dev-qt/qtnetworkauth/Manifest +++ b/dev-qt/qtnetworkauth/Manifest @@ -6,7 +6,6 @@ DIST qtnetworkauth-everywhere-src-6.8.0.tar.xz 253404 BLAKE2B b807b8f99d5f68d1a0 EBUILD qtnetworkauth-5.15.14.ebuild 601 BLAKE2B c431059ebe441ffcc6b1b7f63d1835a8312532befbd64510de5fea00b5d2b8d3db9431d022ce60feacc16434a06400002a89951254b6e6ee6ff1c76a509df915 SHA512 8d12c5f7c18cafe553bf338f454c19b496f1eb2ceba8665668653aed7fffb75f276014728ffb9c0ad391ea445bbda279f7958c1aa6e43529c0de26bb7dc393ff EBUILD qtnetworkauth-6.7.2.ebuild 350 BLAKE2B 207a1fe348d0c5b0b94537aa9c77c789d53b622b7c865318c73615c099ffa050806d4554953b64c218b0cfaa027fa84c11137f700098cad513d9736c659d1327 SHA512 c0acf003d69ffc679fc7475d6eaae4f2ccbea8098612f870ebf654ddbd4db93c091534920fd6a8ea7944d8f1fc92326c3743de434fc4b804ef1451e62a2a819d EBUILD qtnetworkauth-6.7.3.ebuild 354 BLAKE2B 147c4a1b609cd478ef1cf34fcbba9fe2ee476e7bc987b39b64b383b083f3a050591ec0ea4134051e1a01b55199a227503a248e050e0b4ec39945b437637b4188 SHA512 94dbfa735d67addc18d5b8fcfba8f6721da1e7784227ac8218f297b276cc72b987284e8704b7a91fb267f96fe5a28ee01b4f01efb947b37280d9ab3f2cb1999c -EBUILD qtnetworkauth-6.7.9999.ebuild 354 BLAKE2B 147c4a1b609cd478ef1cf34fcbba9fe2ee476e7bc987b39b64b383b083f3a050591ec0ea4134051e1a01b55199a227503a248e050e0b4ec39945b437637b4188 SHA512 94dbfa735d67addc18d5b8fcfba8f6721da1e7784227ac8218f297b276cc72b987284e8704b7a91fb267f96fe5a28ee01b4f01efb947b37280d9ab3f2cb1999c EBUILD qtnetworkauth-6.8.0.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145 EBUILD qtnetworkauth-6.8.9999.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145 EBUILD qtnetworkauth-6.9999.ebuild 358 BLAKE2B 3c7c84223bb8da524851b41b82eaec6ed51dc12f1658127a36fd9728903bb2c204b10d7a6e6866cfe975bb9b1e2692fc62299d8943735bcc8602dff04c0927bd SHA512 508dd20e4ae66ee07dc85c5bac4e14f7d3ee6b63edb534becd25bba15d1942a0de4ad70863e41ea60f1c58a970bb5fac7c744aaad80f744adf5d93362391d145 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 606ca90b42f8..000000000000 --- 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}" diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest index ce5082e80228..1faabac3f4b8 100644 --- a/dev-qt/qtpositioning/Manifest +++ b/dev-qt/qtpositioning/Manifest @@ -5,7 +5,6 @@ DIST qtpositioning-everywhere-src-6.8.0.tar.xz 660512 BLAKE2B d35ed4993dee2188e2 EBUILD qtpositioning-5.15.14.ebuild 877 BLAKE2B faaba7ce4da8906b08b10a326f4f9a211f9eae86a12135dc0f58396342b82c91a1bb2aa1e8bac4b5fb2cf6e55733d12d77cbab56b6b26ba955036f5f072ce32d SHA512 f342bfdbb38c7f13c37087b544e07cccb6c7655774e9547caff9bbf3517e02d9b1e82fd3ba47b319a17fcac1e2476134f0d71368f5af792e8579c90a5a25dc67 EBUILD qtpositioning-6.7.2.ebuild 1570 BLAKE2B d6667399f47cd0fc13627c2141a587f3f31fdf8e45a474f8c82ec477ed9075ac902d6eed05c9cd84959de42f3db85e609ff62d31a1d2b1cc5cb17c6f93349f82 SHA512 b33849cdf0ae471c35b53e48b6c6d8ae1e9b5e45750e699688795775cf11bfb8faddb7a919c221113b3c428064ac4e1b9eabf092baefc75ef0f53ed5ac02d3a3 EBUILD qtpositioning-6.7.3.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 -EBUILD qtpositioning-6.7.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 EBUILD qtpositioning-6.8.0.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 EBUILD qtpositioning-6.8.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 EBUILD qtpositioning-6.9999.ebuild 1576 BLAKE2B 0a902084d44ef71dff03de73ca9d692b1fbe5bef21b1ce962b7ea892a707d9db46f63012d7c7378bd9314ed702a2c5d108d5c41a0a86e395033bcccb2dc029a8 SHA512 bfe20d4028ab0c0c1365db3d5f2ded0c1fe5e9e3e703cede4ca1ff57450cec65bf3b022ed364373b65c87e0bc776a9eca28a4607ef95ebdf661a17d89c3b6c56 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 c872768c9bd8..000000000000 --- 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 -} diff --git a/dev-qt/qtquick3d/Manifest b/dev-qt/qtquick3d/Manifest index bab5f372cb97..fde54fb6cadb 100644 --- a/dev-qt/qtquick3d/Manifest +++ b/dev-qt/qtquick3d/Manifest @@ -6,7 +6,6 @@ DIST qtquick3d-everywhere-src-6.7.3.tar.xz 66208152 BLAKE2B d165ea6d61c3b7e0253e DIST qtquick3d-everywhere-src-6.8.0.tar.xz 75282076 BLAKE2B 828708dabbc05ce4f00235274bae3b5ebf93b5430c267e18d3d77f69f79b0085324531b55997b7850bbea5fb775dc6c6f32a7a273e4eb33634d173c63abce841 SHA512 961f38845a07cb3792a1dc2c15784f526eb4da4ab6bb69825f7708076acff323ab9364434ad1099ac79a0f047b094f1b9bcd41e038f9520bda3dc361dc2f9529 EBUILD qtquick3d-6.7.2.ebuild 1081 BLAKE2B 8a505568442fdcee697baecae2cd545ab213da2a1f3fc426052f3d24e1e235cf53f9852cb454a7b03943e863a049b376ac80c3edfadb49b68a136f6e176e482b SHA512 60b53323dbbc48d8f2c41f91f805fda4d85c86d6a9467a0b97a31c4698b5249682e0eb3d0a57e2d79de6012f4151cc9b96d91d6c09c38d9aa0089ef17393c612 EBUILD qtquick3d-6.7.3.ebuild 1086 BLAKE2B ec9e9a80e9607210074d4f2bb1dd3bbb2848b6df3f4e384c911a4d4d6125bfdd6cb93a525c0c483f00017f0e6b3fa3bde6cb92b5a19330a3f07211e61134cfe7 SHA512 abda722ed0932fd45e83ff776c0f21197bc96b5f763092cf7f82b33e297787d558ebb704939944808a58dce99a0d7b697793c7ef1155eb8c77456478d073fded -EBUILD qtquick3d-6.7.9999.ebuild 1086 BLAKE2B ec9e9a80e9607210074d4f2bb1dd3bbb2848b6df3f4e384c911a4d4d6125bfdd6cb93a525c0c483f00017f0e6b3fa3bde6cb92b5a19330a3f07211e61134cfe7 SHA512 abda722ed0932fd45e83ff776c0f21197bc96b5f763092cf7f82b33e297787d558ebb704939944808a58dce99a0d7b697793c7ef1155eb8c77456478d073fded EBUILD qtquick3d-6.8.0.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868 EBUILD qtquick3d-6.8.9999.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868 EBUILD qtquick3d-6.9999.ebuild 1276 BLAKE2B 35e81e6de6b4116647d85ed52868b8ff917bb79b2224e6b3a46e3768c8c3cf15887275df92b9f940e569166d26f2473d83f6c6eec9d134a68f8b0454dfff801b SHA512 b8847ec6f08f9719ad3f150c4ec07463407125cf50a48afd39c64905b8066d3042b8a6c2f2f8824345ea88a14ecd43d58964343cfc91f8c38bfd025d9b859868 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 21502bc53a04..000000000000 --- 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 -} diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest index 2e310dcf4af6..f4ecd5f55a64 100644 --- a/dev-qt/qtquicktimeline/Manifest +++ b/dev-qt/qtquicktimeline/Manifest @@ -5,7 +5,6 @@ DIST qtquicktimeline-everywhere-src-6.8.0.tar.xz 110192 BLAKE2B 95f70b73245ceae1 EBUILD qtquicktimeline-5.15.14.ebuild 367 BLAKE2B 177d100c4cd775817bc42b853190722920cf6453a773c12de253907fcf730af3e1b146b40e519619850162c1fd6a841b32ea99926276bf05f05d0f546b4edd13 SHA512 80c731f2b961d1191f8a3573748fafd23ed73bc93b5645e107d9c4138f07d8139b47484b15d1289b0c9546de46a5e4876e33cdd4e3a899d31d1de2ce65d7bb93 EBUILD qtquicktimeline-6.7.2.ebuild 389 BLAKE2B ff876ea9bce98b1093d8bf580150581d77ed7fbecc1c8db13c7869014e6ea5a0c85acab1527c0d323557a1eb9c546ac169bbea962fb30129e2e14c8165285de9 SHA512 c543dd8a5b220b5d264ef04b986e4e91147b54e169d8f747d962b2ada540e261ad3932489dab3d3f519e3f6ebdce6e711ad7773188363ccfde2b3ff2ec8d8452 EBUILD qtquicktimeline-6.7.3.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 -EBUILD qtquicktimeline-6.7.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 EBUILD qtquicktimeline-6.8.0.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 EBUILD qtquicktimeline-6.8.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 EBUILD qtquicktimeline-6.9999.ebuild 395 BLAKE2B a6abf0944d3eb0c738d8455fde448b8418badfd9151dd30acc1ed80dbc7b65057bd88091e6372097c0470387c5d62850798fa1f08020435a5534b05b1278ae5d SHA512 29e70391521b8db27df1ac6db72797a4785ede1270136644433ac39c88ddac079aa17faf703b002eb6785510ba7c7d8df6312964fc1e798d295fa9c0f4f2c040 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 393a5c2037bc..000000000000 --- 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}" diff --git a/dev-qt/qtremoteobjects/Manifest b/dev-qt/qtremoteobjects/Manifest index e616ab088ead..b595b416df19 100644 --- a/dev-qt/qtremoteobjects/Manifest +++ b/dev-qt/qtremoteobjects/Manifest @@ -1,7 +1,6 @@ DIST qtremoteobjects-everywhere-src-6.7.3.tar.xz 537012 BLAKE2B 81363b9ce519dad0ac94109243dffd3043c010d125cb738f1dc49c31b0aa6324a28c055c0126b5992e63b5296781af87f59236c759f3e82121d8cf663d0950e6 SHA512 42b744dc946296bbd57ed31509b720285fd50760484243eede06ac25205fced40060601bef257745635ab4e15a59ddc8bd207dec52246adfde94078706d23e0f DIST qtremoteobjects-everywhere-src-6.8.0.tar.xz 537064 BLAKE2B 750f62abb1da3daf5d029c4930054b243b88db0fe6ec738fdce223dae3070c614b946f10f7e6b6e0485cabb8611575df818ecf35ef9b6934797a55691e2784e8 SHA512 5c7899a49daa6ce751394b829d3cf7d12e3cfa74f8fdde6ae9aa74d6346b273901e44700fca5873a957e49b9546ebc964a93fbb8152206723c873ce8139348c6 EBUILD qtremoteobjects-6.7.3.ebuild 1025 BLAKE2B 777bea738700f730b465ad7e5e9de69e54666e3c0e1b015ef1f26bc425531f8dbfaf05203a3127628d79a24857ed90d0bad3df249d95fbde5810d3a9d3351869 SHA512 3f3239bf275e48b15c094040766f1485768e38481070886b1ab1d162499705d460f02f3adf84a465fe811b07678cb6edbbbc994b28ccb71b807012edf995bb94 -EBUILD qtremoteobjects-6.7.9999.ebuild 1025 BLAKE2B 777bea738700f730b465ad7e5e9de69e54666e3c0e1b015ef1f26bc425531f8dbfaf05203a3127628d79a24857ed90d0bad3df249d95fbde5810d3a9d3351869 SHA512 3f3239bf275e48b15c094040766f1485768e38481070886b1ab1d162499705d460f02f3adf84a465fe811b07678cb6edbbbc994b28ccb71b807012edf995bb94 EBUILD qtremoteobjects-6.8.0.ebuild 1025 BLAKE2B 777bea738700f730b465ad7e5e9de69e54666e3c0e1b015ef1f26bc425531f8dbfaf05203a3127628d79a24857ed90d0bad3df249d95fbde5810d3a9d3351869 SHA512 3f3239bf275e48b15c094040766f1485768e38481070886b1ab1d162499705d460f02f3adf84a465fe811b07678cb6edbbbc994b28ccb71b807012edf995bb94 EBUILD qtremoteobjects-6.8.9999.ebuild 1025 BLAKE2B 777bea738700f730b465ad7e5e9de69e54666e3c0e1b015ef1f26bc425531f8dbfaf05203a3127628d79a24857ed90d0bad3df249d95fbde5810d3a9d3351869 SHA512 3f3239bf275e48b15c094040766f1485768e38481070886b1ab1d162499705d460f02f3adf84a465fe811b07678cb6edbbbc994b28ccb71b807012edf995bb94 EBUILD qtremoteobjects-6.9999.ebuild 1025 BLAKE2B 777bea738700f730b465ad7e5e9de69e54666e3c0e1b015ef1f26bc425531f8dbfaf05203a3127628d79a24857ed90d0bad3df249d95fbde5810d3a9d3351869 SHA512 3f3239bf275e48b15c094040766f1485768e38481070886b1ab1d162499705d460f02f3adf84a465fe811b07678cb6edbbbc994b28ccb71b807012edf995bb94 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 49b703f47ebd..000000000000 --- 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 -} diff --git a/dev-qt/qtscxml/Manifest b/dev-qt/qtscxml/Manifest index ec9329013837..d98a0cf6d148 100644 --- a/dev-qt/qtscxml/Manifest +++ b/dev-qt/qtscxml/Manifest @@ -5,7 +5,6 @@ DIST qtscxml-everywhere-src-6.8.0.tar.xz 557512 BLAKE2B 9d56aae62dee54155a9cae87 EBUILD qtscxml-5.15.14.ebuild 397 BLAKE2B 51caa0740ef74f457378f5f276ff3d4fd29bdeb7881f906cb17c11d3fb625e869bcfb62d45c3ed940363b67d192ff36c94893e93a99b817477578bb74f4b1c46 SHA512 3bb9882d106168b0e30d0d96a9005a1d8a91f42da90c13b6020643cff878dc0a45ea92e7675733faf42901e2627b9a88acc3f8b37a53bd9a9ed7779f39eff512 EBUILD qtscxml-6.7.2.ebuild 710 BLAKE2B bbd105c679bff1928af4d14c4af530c28ce44b26f88e6d78d9f95240bd06cb85c47e9589b52a263392666ef94bac37f68f30d4f0e9bdfc9522b11639d1c62c6f SHA512 ff4e669ae0319b95c83aafa3bd831fcf2c4c1c21e37842fe1eed4954b2bcfe072ca1c6ebb89f5858f22733bd57131de03a25d0e7baa1618919266dbc4836bb4b EBUILD qtscxml-6.7.3.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 -EBUILD qtscxml-6.7.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 EBUILD qtscxml-6.8.0.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 EBUILD qtscxml-6.8.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 EBUILD qtscxml-6.9999.ebuild 715 BLAKE2B 087b7c91c5a79194a118136a153620779d6e0180b75ceeb879f290d5c14249ad8cefd6181cd377c965faeb214b7f701051b0bdf1d9d1b198f8a1e5bc11f867cb SHA512 208d13d443bbbcdbf7d2e5f0068bfd2da2f4f521982ad627113f4f7dd28351ba824504807720d3eb5c22840b9993d2a12314c06214f125d1863a820892f0a3d6 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 0f087eb496fc..000000000000 --- 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 -} diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest index 3d5521c4f912..34fa8ac067bc 100644 --- a/dev-qt/qtsensors/Manifest +++ b/dev-qt/qtsensors/Manifest @@ -5,7 +5,6 @@ DIST qtsensors-everywhere-src-6.8.0.tar.xz 1497268 BLAKE2B 3c0cfee9c07b878397412 EBUILD qtsensors-5.15.14.ebuild 566 BLAKE2B 1448b9978f85ba18bcccb00f356458bcd30d0610d48c172002c0fea61252a9966f8e6c7a9323499a6110e8d5bbe41e74744f37bd56d8601ec2c2f57b72362e14 SHA512 14e7dfe121cde2f5603c7d19d8c4d30abec0d9aa303938a57d0e3919c45e4500ca16f7e369cac8cb0b33f239c3325674815d1ac50a04d38145b16c1a7335f9b1 EBUILD qtsensors-6.7.2.ebuild 534 BLAKE2B e3d26f2197c4776078c309a1bc8241fb3a7de843a6896b6557a4f7da2bd3dd2577b5944f1f29c8a1181dacb5a3949d750c1b968330dfc2d66aec5de4c83bff3a SHA512 2664df744724a0748afacddc005daba4ef037b7a58f961aa5daebf98272fc8fd7acfc80e1f8d09ddc1e8c1f2590bc0790629d40d078fd75ee756e59f89399568 EBUILD qtsensors-6.7.3.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb -EBUILD qtsensors-6.7.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb EBUILD qtsensors-6.8.0.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb EBUILD qtsensors-6.8.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb EBUILD qtsensors-6.9999.ebuild 540 BLAKE2B 10b7175ade199662f3358875d58ba9541b68aa03fb7e5c72098bfc3aae7f17bdf22cfcae44c80749016b029fc34087bec80f0ac1b7be94156be4eda863b8a152 SHA512 16cdb89c926c2cea6e21550a351a51bb358baf345e1b3bcd0c9544f235d4edfb949e215ea7c0761419e7467ea884380a18e378bc21bd6b6f2d4eb9a47d503ebb 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 5a576fcfd7cc..000000000000 --- 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 -} diff --git a/dev-qt/qtserialbus/Manifest b/dev-qt/qtserialbus/Manifest index b76af7d8b76d..33c18a5793ce 100644 --- a/dev-qt/qtserialbus/Manifest +++ b/dev-qt/qtserialbus/Manifest @@ -5,7 +5,6 @@ DIST qtserialbus-everywhere-src-6.8.0.tar.xz 547876 BLAKE2B e00b8cb89b46cf240fa4 EBUILD qtserialbus-5.15.14.ebuild 430 BLAKE2B 11ca9b29a206685addc9929eb1bdd1f0f2be4235ca4f8d1a374f96b8984cc9009836c158909d6fabf3d710a06f00d2becffb6bfee6ecc52fa8b793db8f61e40d SHA512 526c137d6e04dbbf06ca280b9a35403b2d05499ff1eb9cfc79cf805bc025a7e20a495f3d16858a25ebbe075c1e6d48d4020edd20457cb4ea9e4b3331a2cef9b3 EBUILD qtserialbus-6.7.2.ebuild 900 BLAKE2B a8212f5f347a83f277a94b61f552b34ada5574fde237693e1415c7cf8be8d1895386ffec3c88e8b8add5ce05f02ec799966ed0b7978d4caa4c6d5d34a4fd6183 SHA512 2283d8ad2911a159b34f8af5b0b3dac1788072a21502b5afeecef815345384170feb42d46bea5b685c9093fbbb96073533e9ed9dd02cbfb722cf69ad9ef18aff EBUILD qtserialbus-6.7.3.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 -EBUILD qtserialbus-6.7.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 EBUILD qtserialbus-6.8.0.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 EBUILD qtserialbus-6.8.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 EBUILD qtserialbus-6.9999.ebuild 902 BLAKE2B c393a7bb277582de80fbdbac3f74031d50f2f9e2a65b697211c9f1c3bc43134fa5d0f770ed843c06458b3680ef1951b522c51827d28034e0753ea32124a9c135 SHA512 9ecd004c28e1cade57ccd33be257b6937bda9f475f581aa09fa0cc7dbb73e3e6c690569a565ffdb4f7b62082e4f4356d63a75beff528e9b3ee3cca38bee11050 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 7f316fa23bbc..000000000000 --- 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 -} diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest index 4d2d94fcf6c3..14a3691752b1 100644 --- a/dev-qt/qtserialport/Manifest +++ b/dev-qt/qtserialport/Manifest @@ -5,7 +5,6 @@ DIST qtserialport-everywhere-src-6.8.0.tar.xz 271308 BLAKE2B 538c8ed8f6df3aaa95c EBUILD qtserialport-5.15.14.ebuild 565 BLAKE2B 683036990929b3ceed4ead89d9a5d77b84494675bc8f7acdfd24f899781009785c91fd0c515f621d8d1cc489c363aaeed228d946d58758de28a54e012c042543 SHA512 484bfec55cb2329151f7e62e4530239b461177d760275b5af5424084664abc37974e6286f2f0621570d60ded7149e2e62a306649441b1552030110def0df602f EBUILD qtserialport-6.7.2.ebuild 386 BLAKE2B edf782f739e2ab208f66d9312943af46ea791526fcab53f393500eb5c1f5370ae2046714e32469e9e8eebf0b1352f88bcedaeb5e341e8b35ecb3983c892e69a1 SHA512 47a166753a785778c77b21579824c917e8eee0c63c16f0247b8634ebbf1706cd6f16db52d7912ec4547da4f59a03f75304ab47f85473a35b58d2dd09ac41d950 EBUILD qtserialport-6.7.3.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 -EBUILD qtserialport-6.7.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 EBUILD qtserialport-6.8.0.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 EBUILD qtserialport-6.8.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 EBUILD qtserialport-6.9999.ebuild 392 BLAKE2B 65750c8281a3febc2289e59f64f7eeb0eca466b773521e7ef801f0d3918b8d813cf59882bb1ab46ff3e962e1ba8b4c52033138dafa3ec10756daf689acd6dbe9 SHA512 b5ef4491f2babf2e5e775d537123aa1139d32a469c834832d264b61cf5f0c72a4fc59c0b32b41bccea2080cea52565cbb5aa8677c4a4079d6bb1b237f02a1c58 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 95b360fac6cf..000000000000 --- 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}" diff --git a/dev-qt/qtshadertools/Manifest b/dev-qt/qtshadertools/Manifest index 12ca9b67ec8c..d73628badfa0 100644 --- a/dev-qt/qtshadertools/Manifest +++ b/dev-qt/qtshadertools/Manifest @@ -4,7 +4,6 @@ DIST qtshadertools-everywhere-src-6.7.3.tar.xz 1111640 BLAKE2B dd1084c88469c881a DIST qtshadertools-everywhere-src-6.8.0.tar.xz 1136332 BLAKE2B 5ac216b47cfed6857c78e048ae175b6e431c1709a622f85b8066a40285f04684add38ba12953f321c0446810f8592f0c4dc452ddb3b855b8bb355e66c03d88f9 SHA512 fc15e7df6806c29f7c185dfb81a83d45bc0e65887812e09432b992d0606eb0477a6897ee611d490f671d2b2f8f492e0a74a7271b2d0397b5d37596d6217a7b7b EBUILD qtshadertools-6.7.2.ebuild 418 BLAKE2B aa94ccc444eb43698df85a293053c4a6b50cb628dc15106bc819b3b61e3870f981c212e242422434a28844fa2d8cf153fbada062a9e498033e38da642edc0be7 SHA512 e8c60de397498f70975efa9294b5d6f8dff796287bbdf0062e725cc37f45d202b576b68daa726fe8eb8a111e1931fde56348b154297b178edd0f3bd0d369d0c8 EBUILD qtshadertools-6.7.3.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 -EBUILD qtshadertools-6.7.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 EBUILD qtshadertools-6.8.0.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 EBUILD qtshadertools-6.8.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 EBUILD qtshadertools-6.9999.ebuild 424 BLAKE2B b9ab34a9eef76d7b44fb89094b7da9ff195ac4964843efd198cc9a56bac05a4f16100bdb496b890fbe862ad859431e812af3eb2edbe551f8ad0a113faa6c1729 SHA512 665c6dcbc05106adae48ca03fbf250fda9bf4224f4ce6d2e5a158c0c3fa73d5a15376b776847af1042e184ed237d7ca9e4a864e6d1f12c24515d525f286eade6 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 15f54c185b88..000000000000 --- 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 -) diff --git a/dev-qt/qtspeech/Manifest b/dev-qt/qtspeech/Manifest index 7944827ffdae..110efa88474a 100644 --- a/dev-qt/qtspeech/Manifest +++ b/dev-qt/qtspeech/Manifest @@ -6,7 +6,6 @@ DIST qtspeech-everywhere-src-6.8.0.tar.xz 262308 BLAKE2B e75b0ef821b303532f2db8c EBUILD qtspeech-5.15.14.ebuild 730 BLAKE2B c3941cd7399ec7d5cdffd2ad65611bc094c64d0aafdf08f40dc36e2da2feacd037bb01e32bcc8cc1d470a70b19dc3c71a7356c8b4a3921de65f1db6d800000e4 SHA512 e019cb16105b96d9e5d28ea5aa6e0cdb30572e6fcb5313a9efcf5da5b0c35cb696a2173ecf3f969e738db4b84311659c7b8666fe187e2f538db7366923d79374 EBUILD qtspeech-6.7.2.ebuild 1190 BLAKE2B 082e9498be5b601e0454185ddd3e37d78ddaf9f2fe8854a7611f625d457aa85a8fc2b74f6888d8c62b985d7f1d22ce3de737fe74b416429465de52e52cbcc112 SHA512 8dcf13e5997e420a882a2851c8f0b119e20fe577d8e0e46d0fca42b78359715d8979c0059bd5528706326480dae4e7cca20d56aa9628e7ef53716d30fe0f4f42 EBUILD qtspeech-6.7.3.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3 -EBUILD qtspeech-6.7.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3 EBUILD qtspeech-6.8.0.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3 EBUILD qtspeech-6.8.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3 EBUILD qtspeech-6.9999.ebuild 1195 BLAKE2B d16df9bd58482ec742dd2744f6595ccf9869f4aa127afc3b6f2d5030c3647fe4a44a465bbb4e3d53915d5b3cff22989b5f6de3dc79d844541672685d750495f9 SHA512 98827c741fc6b092d18bf0f6b8d99f8757966958f9178b412756dd5a329d95b84bcfc9be2e38c5c39a47808b6d6d60539db8dd5ebf3e753100d8280c66c0b6c3 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 1b13d4434223..000000000000 --- 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 -} diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest index 1f24f5575342..1d5f0eedd605 100644 --- a/dev-qt/qtsvg/Manifest +++ b/dev-qt/qtsvg/Manifest @@ -6,7 +6,6 @@ DIST qtsvg-everywhere-src-6.8.0.tar.xz 2004952 BLAKE2B b1bb4ba3674dd6812f2fceb93 EBUILD qtsvg-5.15.14.ebuild 496 BLAKE2B 973507084399af01f2f442cbfd3a6c9dfe91c8185ddb483c9b7b8cc1f7cf135e80e4c7c1286f22bc59a5209a87144310780d0c380681b963d42204c46a228e07 SHA512 d8500010ff86d3d03f18210b771fe0961b99d16efebbba0c428ffcc49dda115814538f6d8b20801671ee5a0de7b1e643eed6101c7f37dbf42795d1a5c6dfd978 EBUILD qtsvg-6.7.2.ebuild 654 BLAKE2B 868b671ad183a7fe54943560e5a3498212d973c57ec5ff5b8b50e443f6666d59c723d1848378a75205b0d43b7979fd6c2b2e93720a3048566fd7c4bab879debd SHA512 f680b4b711d32a94de2f400499ae4d25c9a2b53938591684e49b75e96047d69ac1691c0acef8279009fe603a17c299fcdbe97edc3677626b16716db1fe674751 EBUILD qtsvg-6.7.3.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef -EBUILD qtsvg-6.7.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef EBUILD qtsvg-6.8.0.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef EBUILD qtsvg-6.8.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef EBUILD qtsvg-6.9999.ebuild 660 BLAKE2B 5321a21eced92e802d7dd62ee7bf485a57f7f4ba95696e2a6fdf12d5e15bec14f9bce2e3b1301fd567f7ea54a9d6ee95dddb331c1f7b454bd3da6d08361885c2 SHA512 6c27314d9bec6e8e1a13826d18b3b8ef0ec791a331773bf5ca54a4f183ecafaf5bba144f6ed01849977f1c6746b3f765a861cb669ac09b1879f4756d532908ef 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 e7ea7c613b25..000000000000 --- 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 -} diff --git a/dev-qt/qttools/Manifest b/dev-qt/qttools/Manifest index fd93bdee8c22..41f93f793abe 100644 --- a/dev-qt/qttools/Manifest +++ b/dev-qt/qttools/Manifest @@ -3,7 +3,6 @@ DIST qttools-everywhere-src-6.7.3.tar.xz 9022820 BLAKE2B e1eafdbc9a08b031a514807 DIST qttools-everywhere-src-6.8.0.tar.xz 9059032 BLAKE2B 83ec98a8cbaf049649b8df0ac6c478e5b1867b0034d8e8f57120dbc9b4c17b3b708bb14c9a7030bcca9330bc4eb1c0e54f44a249c5303f84129b14f42376d19d SHA512 e477c980446fe421484481537fb9997eca6595dae19e9bc7809d24e7685efb802fb704c97bacc77214070e6b7a0f7346f1537cc143e3fccb309bf14e9c8e8d75 EBUILD qttools-6.7.2.ebuild 4646 BLAKE2B 4a77d671a5311fcd7e6170bc29764560993be958cc8ea58d6c31d8132372a5f65197a69acd3eee45d211cbbf95ee653849faa7d98a302db07f60e3b79b3e4912 SHA512 69930be9d05a6fbb10c616b8ec8b664d40428abbf516777ac5fcf85adc4a2ed39a82bcbfbb988aef8568ac0a3adcb4939fb89e531e90bbda97c751c6ff0e3e49 EBUILD qttools-6.7.3.ebuild 4668 BLAKE2B aa642a2efd9c1aff8d3cba88a5be07983b2d914bf3258c689eb1426399efa250faa84d88acab47eb2d1e1bd017b5eba80c38991d20ffab900bba31a4e3146db6 SHA512 1ea708153a48fdce72de03cbc50dd53ab20c56081dd19fc7b55476320d36406a50114170fcfeb5857c953b14e37ccdd252663cd827b5da199e6df9f320e563e0 -EBUILD qttools-6.7.9999.ebuild 4668 BLAKE2B aa642a2efd9c1aff8d3cba88a5be07983b2d914bf3258c689eb1426399efa250faa84d88acab47eb2d1e1bd017b5eba80c38991d20ffab900bba31a4e3146db6 SHA512 1ea708153a48fdce72de03cbc50dd53ab20c56081dd19fc7b55476320d36406a50114170fcfeb5857c953b14e37ccdd252663cd827b5da199e6df9f320e563e0 EBUILD qttools-6.8.0.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679 EBUILD qttools-6.8.9999.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679 EBUILD qttools-6.9999.ebuild 4918 BLAKE2B eead259f4909d79ef42d1fcbaa5e2a8d4dc8d68deb09de6b7677b0f88242715433e02a4bc898f4b2883d9bc5dc33b97ce4127c8d275291e462e8343a2f304e3f SHA512 44095d57e066cca26132c5dea3aa3309365e2bf7e7004d27161f91ccecb55ad99a939a3088b0b8fd1e02a36317fe2a8720f81c94ec3245d9301e82f319f1a679 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 da97fd670c79..000000000000 --- 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 -} diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest index 7c70e5786358..7d1029302093 100644 --- a/dev-qt/qttranslations/Manifest +++ b/dev-qt/qttranslations/Manifest @@ -5,7 +5,6 @@ DIST qttranslations-everywhere-src-6.8.0.tar.xz 1550184 BLAKE2B 588b29e15adff2b1 EBUILD qttranslations-5.15.14.ebuild 379 BLAKE2B 4e8592ec1a5ee9571ebf1eb9fc40b2b593a8448d6a600f7ec61813a8416fbf6492759ee1b93e36137d994166f30d0ddc1a95b2971c0f4fa61779b37c37b2514b SHA512 483a60952a599acea2c0a6b4916fb7566120e552812469f7a0291ba8b7a063be4afd1a7ce2f8e56271a24f34fb8750eff99c03814b0c92f38cdec1a005c0d6e3 EBUILD qttranslations-6.7.2.ebuild 412 BLAKE2B d08fc60c197e7a0349b64fefb0351ca74a71120efa4bd339d5e0350e44436d9ee1aee9b993a76eca13624f3327ff86ab1c6036be785169f40a297301bb99647f SHA512 4e00238cd3a999111c233a96021b1a98783c9edb0a3345313c750713f99aacc78b8b35a6092de4ab5a6490b569f52a6d19cb947850689269303874541ed7cc90 EBUILD qttranslations-6.7.3.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf -EBUILD qttranslations-6.7.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf EBUILD qttranslations-6.8.0.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf EBUILD qttranslations-6.8.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf EBUILD qttranslations-6.9999.ebuild 418 BLAKE2B 295cea378d3a94f73b4bbd0430ad900f1e3f8478a863da1f5af987b55946909c6efcfe5840570a0f348bddbeb7f6ce25adcb04b1caff19140b6053cfc477b791 SHA512 d4fd0d708a0c7ea4b2e4c55c7aa19891ed771d86a45a108f7f3a4e1558751c5824dd4e0b18807902605c9df5b7d1ebfeeeab8730a5c45e3e2b7abbb3a2ad2baf 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 4957b280c2a2..000000000000 --- 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]" diff --git a/dev-qt/qtvirtualkeyboard/Manifest b/dev-qt/qtvirtualkeyboard/Manifest index b07dc78aca91..f613acb12ead 100644 --- a/dev-qt/qtvirtualkeyboard/Manifest +++ b/dev-qt/qtvirtualkeyboard/Manifest @@ -5,7 +5,6 @@ DIST qtvirtualkeyboard-everywhere-src-6.8.0.tar.xz 3722484 BLAKE2B 9c213c477837d EBUILD qtvirtualkeyboard-5.15.14.ebuild 1214 BLAKE2B a2d1b8ccf58d8236afd410c626b28d6ef7cbbbd678620335d0f9f1f0f623d36c5185e5d7cb469d5e48a0759135a045c83afe88c409a764d87c97de88d5513ad3 SHA512 a5ee55fa5a05d94e62e6c5ee5d5abb10f3243985f9d04d9b57df175864ef2c73fb82ba0ece7bf2710e4ad4ad47c8da190a7f085f291e6f5f5786df681c76b08d EBUILD qtvirtualkeyboard-6.7.2.ebuild 1128 BLAKE2B 5e2e9cc78e01cbd695a92b5bcfa28158106ca8a20318b7afaaa9e2bd368246b9d3d3e5901874c08aa6460010f3789c5d16fb1c0340793713f439d58cf7ff5b77 SHA512 634a516fe913cc5ada1862aefb7c0023bc749fa040ea29a1ecdcc3609af7d3fbedc1769332fc5abc2beeba5cf3d15fbf3d6dc7c415fb98f1ac31567cd046a506 EBUILD qtvirtualkeyboard-6.7.3.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b -EBUILD qtvirtualkeyboard-6.7.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b EBUILD qtvirtualkeyboard-6.8.0.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b EBUILD qtvirtualkeyboard-6.8.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b EBUILD qtvirtualkeyboard-6.9999.ebuild 1133 BLAKE2B 7d5eac988baec1f6defd7cdc46541ad8e05aa2dd0410f63fbe816e6b6702561ef2be2b5d8b0c6d2cc75580217c321e5150d5b6032eafe61632c39292338e2b39 SHA512 48522d0243e86467e49e18c22cb29669642a232a3d4b07a3ea46f228b73f5493b8bf6bca64fae43e8ad3af5d4d42ef7de395e3c0a8479938d021086eec1e241b 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 4639b2cf069d..000000000000 --- 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 -} diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest index da3f22d6f6b5..7349274631c2 100644 --- a/dev-qt/qtwayland/Manifest +++ b/dev-qt/qtwayland/Manifest @@ -12,7 +12,6 @@ DIST qtwayland-everywhere-src-6.8.0.tar.xz 1133584 BLAKE2B 2889e651544846e4f854f EBUILD qtwayland-5.15.14.ebuild 1214 BLAKE2B 4d974a96e807dfbad6bf480bb6faf022828c9cab0fd5bc82b6c6455344fafd7a349f1f232fa62a00e32cc073cda39aead004657e7b4072f49890442baeda3252 SHA512 75966f4a890e77a29937d63ed50a8095d579fab4871f2d091bb410443a0101fabc592a6cfbe033b12d6f0663c196930a32c85a062a10de4f8dc13eee4103b86b EBUILD qtwayland-6.7.2-r3.ebuild 1641 BLAKE2B d709c378c8eea57e1533b4451676016b0945369150953e3c5610e767826d843ae845c1ecdd87be052d216def7b28150615df50dee45364e4c10e0a866fcd6b7f SHA512 d774570816601f3e81e9c535d2916ef60f6de61ec6bdd4cb18c6da93bb871e4b98e6217aa41504cb51e8c939775005aed25c612e96ac3a99fc59a7ea348184fd EBUILD qtwayland-6.7.3-r1.ebuild 1546 BLAKE2B ec95d0495292addfd14a1ee68f4f2192c16555de06d3296230f5ba2ca4f52358b6d239202a1e7f8b081cdd8f60e592db6e4bfe8ef722371e9f378f053c7eab63 SHA512 ef6e9ab9bc4d6b7eb2d543b030a8a991d599ad6a6efc328c95647be6d84b2e3faae407e3d375ce41b6320d49c334215834b69c4f3d00a4ef9517b21c22fb75cf -EBUILD qtwayland-6.7.9999.ebuild 1546 BLAKE2B ec95d0495292addfd14a1ee68f4f2192c16555de06d3296230f5ba2ca4f52358b6d239202a1e7f8b081cdd8f60e592db6e4bfe8ef722371e9f378f053c7eab63 SHA512 ef6e9ab9bc4d6b7eb2d543b030a8a991d599ad6a6efc328c95647be6d84b2e3faae407e3d375ce41b6320d49c334215834b69c4f3d00a4ef9517b21c22fb75cf EBUILD qtwayland-6.8.0-r1.ebuild 1669 BLAKE2B 669f28bc549085675d1b846af2f3665d35e84dfa3cfae4098efc6b912f51f80151c53a1024907d1f844708f2d55b4b48adf7cabc7294402000f2a8cdb84d8a32 SHA512 90146a5961292eb49722978d52d8b0d8458a2c15576b052b52d181f1209509c75b2a88034db82b52749e15352e1f7f009a941ff1d19c6874b0c732c71308467c EBUILD qtwayland-6.8.9999.ebuild 1669 BLAKE2B 669f28bc549085675d1b846af2f3665d35e84dfa3cfae4098efc6b912f51f80151c53a1024907d1f844708f2d55b4b48adf7cabc7294402000f2a8cdb84d8a32 SHA512 90146a5961292eb49722978d52d8b0d8458a2c15576b052b52d181f1209509c75b2a88034db82b52749e15352e1f7f009a941ff1d19c6874b0c732c71308467c EBUILD qtwayland-6.9999.ebuild 1604 BLAKE2B 955233e9dce7287eab5e8ccb13b548e44bc31dc71a195f665c1422a33045a309a131cf4443714a31799a2c1a387fc0ffc1d4f653c6b7bd25de77cae8f92c2e68 SHA512 374607e7b5f0e65e89ce1dc9e2cb714212a876c556826ca92cfb347a6a7bea8dd2f94e3455dd3e2fd66cf16a5e23350e2ca4fb316139626eb0c7bc46f66fb800 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 635ccf3a4a9c..000000000000 --- 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 -} diff --git a/dev-qt/qtwebchannel/Manifest b/dev-qt/qtwebchannel/Manifest index d038edf55e5b..e54b1a349fe3 100644 --- a/dev-qt/qtwebchannel/Manifest +++ b/dev-qt/qtwebchannel/Manifest @@ -6,7 +6,6 @@ DIST qtwebchannel-everywhere-src-6.8.0.tar.xz 207360 BLAKE2B b25b78a687aa7d77ce6 EBUILD qtwebchannel-5.15.14.ebuild 599 BLAKE2B 73cf6f6f51eadeaada9e9a50fd4ca14f1b7cb0b9822f793c016e4059fc1fa8a32332e2e5318370c8806d03affc9de63b38dc0511e8c01cc631b01df21dc75cfe SHA512 f0a6f32a6791c4c66bdf6cee33b1349b80f60560575cd72684d600a831f98c44e0d406eb074aaf0a50b7df7de44f06db9489659ca041013bac3d1714d540a6e8 EBUILD qtwebchannel-6.7.2.ebuild 559 BLAKE2B 592c74b3e20fd7b6733987bc830aa0e96c1c5acc2b88add79938aeddbb801d057a561ea6f996b88a3256e38b5b0c28da24816d0e32016b9bdce0c3c5a2e4ebef SHA512 ec033de27d6e77b83f141cd73ea56b85df144b2ce53f09cd11672fc65f09459f6cb8ac3188251bee6dba2b278434a50b0373c985590aa4380d9cb52373f44aa0 EBUILD qtwebchannel-6.7.3.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 -EBUILD qtwebchannel-6.7.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 EBUILD qtwebchannel-6.8.0.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 EBUILD qtwebchannel-6.8.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 EBUILD qtwebchannel-6.9999.ebuild 565 BLAKE2B b1280cae03d3db874b48a73b9aac02a47dab09bdf73d88a122b0f114cbeaf56c534e694a4e16487b30f1beab1186affacdc6411befefca65cd6e915aad226861 SHA512 0ff730e7da3b4b8f274698bf451e4ee9aad7a732bdf2e930ca73cf33f80506e518602b6d7a8eecb30c8195e3b9e9b0d14e676f92cfa60a651e78bb90ac688553 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 e0cac52a6b5d..000000000000 --- 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 -} diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index cd07bb7ae121..6bafd92aaf27 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -8,14 +8,14 @@ DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027 DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f +DIST qtwebengine-6.8-patchset-5.tar.xz 7540 BLAKE2B afb0bdeffeb5c83237e1bf72c092e786b3d6e1e5cba3b3b12eb3a5575c32761e3a8def04f18b9103a89be3c29b8dd0bc8a4e302cf357f43fd1393f5962e7ad33 SHA512 e9880cca3d1c43f290083ed237be2f77f062aa87acce4e4521ec44e6ab60a32426facc0a64581984652a723ad7ce66eca16dd6ff6aa19a09fe1cd6d2aed5aab7 DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7 DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe DIST qtwebengine-everywhere-src-6.8.0.tar.xz 566569136 BLAKE2B af2ccc4900ff96d36900bfd4bcb370017231776e211af512e73944dc47b62e6517e85658c436e91f904efae013c4a9035122f78694b4a3fc696f0790725862e0 SHA512 80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4 EBUILD qtwebengine-5.15.14_p20240510.ebuild 7758 BLAKE2B f1c2e30680f12164b8a1a55ecaecc6b7a786cd173ae3500825c7ef04ebd53bd579d2c74a7648ff65c3c302a0f2955313814e0fd1223d564fde76ff7e0039d6d5 SHA512 37591ca47d0df49df995be8af07da94f32ee3d5e03bf9acf987b9966092e48e481d8fac5c3af920265a4736e95f8200be24cf75683e577ef135249555ad6efa1 EBUILD qtwebengine-6.7.2.ebuild 10382 BLAKE2B 6f20f921189366edc8f501ee0e1d3811fb1e57dfa75b2ff4ac80a50028e6394068415f65ae1bfb84dd9ae7d08a546fdb13050a4c42035dbe0ce6baa1c753534f SHA512 2292f3a7e9b24cdb312b6e9c725d8ad1ed33ee160038bd15d8fac568e53473ef18fe3f4f8bf484009221521325933b7e568b90546a157d10c74faa119c6bf44d EBUILD qtwebengine-6.7.3.ebuild 9876 BLAKE2B 377ec524b8bc1e8cabdb20b69b45235e55ad78b7d024f15659cb1c37079655d39230ded79e3b91707cc48ee79f0aed0a90f3fa4dad4a19bb69bc7def0f91a301 SHA512 8ea0ace56259dbd9d2ed2f426a1265729187d23567f467edc83c803ffbe22f785115e49766f345bc25502f6f8867ea51915fa84d3c6ee734ed167fe7811b3ad9 -EBUILD qtwebengine-6.7.9999.ebuild 9876 BLAKE2B 377ec524b8bc1e8cabdb20b69b45235e55ad78b7d024f15659cb1c37079655d39230ded79e3b91707cc48ee79f0aed0a90f3fa4dad4a19bb69bc7def0f91a301 SHA512 8ea0ace56259dbd9d2ed2f426a1265729187d23567f467edc83c803ffbe22f785115e49766f345bc25502f6f8867ea51915fa84d3c6ee734ed167fe7811b3ad9 EBUILD qtwebengine-6.8.0.ebuild 10027 BLAKE2B efd6905762b7572ed824bde13dc03716215433fc8edb757a18acc094e970f7ad6974f5b121ee9f8160c26cb90765698f2ab0f5ca3c21aa60c9cf7e860e354271 SHA512 6bb13b648c1a4498f137efb88de5320531b7b7b826f51368c4b7cf10fe47f3eb795e697cac5b80ab9032a81ad6968703208805fb23f81dd713fbe4275a2e6e1a -EBUILD qtwebengine-6.8.9999.ebuild 10027 BLAKE2B efd6905762b7572ed824bde13dc03716215433fc8edb757a18acc094e970f7ad6974f5b121ee9f8160c26cb90765698f2ab0f5ca3c21aa60c9cf7e860e354271 SHA512 6bb13b648c1a4498f137efb88de5320531b7b7b826f51368c4b7cf10fe47f3eb795e697cac5b80ab9032a81ad6968703208805fb23f81dd713fbe4275a2e6e1a -EBUILD qtwebengine-6.9999.ebuild 10027 BLAKE2B efd6905762b7572ed824bde13dc03716215433fc8edb757a18acc094e970f7ad6974f5b121ee9f8160c26cb90765698f2ab0f5ca3c21aa60c9cf7e860e354271 SHA512 6bb13b648c1a4498f137efb88de5320531b7b7b826f51368c4b7cf10fe47f3eb795e697cac5b80ab9032a81ad6968703208805fb23f81dd713fbe4275a2e6e1a +EBUILD qtwebengine-6.8.9999.ebuild 10027 BLAKE2B 832346594fbe74d7ca914c434f616a7e8a2647d749c6f854fae6f88ed5f6a8f0f69fbf7e3a0c6582f6321ef45def2bcf85772c74dd54cb64219ffdffce3a1573 SHA512 fbaa4130f39672aec9227200e40bc874e4ccfd9cf9df6992ae84ba54a803bb8f190079983049ef9c31ddf0327ed7c10a744ad536a06e255652e10f6a1cb28268 +EBUILD qtwebengine-6.9999.ebuild 10027 BLAKE2B 832346594fbe74d7ca914c434f616a7e8a2647d749c6f854fae6f88ed5f6a8f0f69fbf7e3a0c6582f6321ef45def2bcf85772c74dd54cb64219ffdffce3a1573 SHA512 fbaa4130f39672aec9227200e40bc874e4ccfd9cf9df6992ae84ba54a803bb8f190079983049ef9c31ddf0327ed7c10a744ad536a06e255652e10f6a1cb28268 MISC metadata.xml 1236 BLAKE2B 9a47d6cb2641ee53f22926095457c11f8da65a3705863a3ae0496d5bb656ac65acb744b5420deb95afee6ac9f141933b4f45690459e92c71089fe72727854a28 SHA512 9a640a386cc03804858fc02b24299896c03eff53a07db00862bab9d7dd259ca839e890921fcf222c8275cad16b418e423e7e485c03e74e01ab86979553251b4c 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 07490b941cb3..000000000000 --- 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." -} diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild index 6b40caa515b0..baac705a7f5d 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild @@ -10,7 +10,7 @@ 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.8-patchset-4.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-5.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index 6b40caa515b0..baac705a7f5d 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -10,7 +10,7 @@ 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.8-patchset-4.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-5.tar.xz " if [[ ${QT6_BUILD_TYPE} == release ]]; then diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest index b7598150cba5..ff8651407b0e 100644 --- a/dev-qt/qtwebsockets/Manifest +++ b/dev-qt/qtwebsockets/Manifest @@ -6,7 +6,6 @@ DIST qtwebsockets-everywhere-src-6.8.0.tar.xz 459880 BLAKE2B bb7da153815061da3f5 EBUILD qtwebsockets-5.15.14.ebuild 578 BLAKE2B a2f9c91925d8c60877cb1913fe32b4789b3ba2245c8c2e7dbe21bcbf79929ff3b8b2ebc35ce6041d9a6484eada12a56a3a66749626f8f78257f562e96155b7b6 SHA512 f5ed35b96c058ca3a60515a29a4d46821cc706db7901959ab1e46e461cb471eb554656b94d8d54cb16c985354a04f45db46b266b40e9ba1e466a018df2570b47 EBUILD qtwebsockets-6.7.2.ebuild 559 BLAKE2B 9b2e30c6559234b0a5489a79a2dd6c3e62702de945703a2490cba704b3e5e73338b1e7d5aee3057399a3f6cb38d719296ac86d8ed0f729db4a1ac5cf9c2d3596 SHA512 b8170c0b84848bc6a4bee20d545a21a4320befdb6ce8d188abc709e0908915dc9b06cecef7a371cede19ca0a6f783c9353292e85d7d1a0b7293048deae7ae0b2 EBUILD qtwebsockets-6.7.3.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 -EBUILD qtwebsockets-6.7.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 EBUILD qtwebsockets-6.8.0.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 EBUILD qtwebsockets-6.8.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 EBUILD qtwebsockets-6.9999.ebuild 565 BLAKE2B f3004841e3c405268952ef54d638e45877056312d2ae1c8cf27da9cf6b0d6d56e1b4b2b564c93f808f04157b66c8fcd253c5a31cf2ab7770344ad39a17588327 SHA512 5ea0ac9173a0e46dc7869ea03ceb26daecbe62f09c1d3c1e75b0b5441b2b1a3d7983d126a3450f54b094f7ae0f31b9c358517cda054967284c88ad8e20923226 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 d7e808f49cf7..000000000000 --- 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 -} diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest index 60364562ca57..416833ec44e5 100644 --- a/dev-qt/qtwebview/Manifest +++ b/dev-qt/qtwebview/Manifest @@ -5,7 +5,6 @@ DIST qtwebview-everywhere-src-6.8.0.tar.xz 138956 BLAKE2B 74005c05875ac9e8b4d143 EBUILD qtwebview-5.15.14.ebuild 464 BLAKE2B 6ab5da91708d6d3d65e303eb3c700bd2c528b5b802bd5cc6b18df39730bd76a82b61ecc0193b664865010f261275e3bb7c68331dabfb6e5246b4adf77efd1039 SHA512 0cbb7b9974dda9431cda7d5a634633a1e9e485e2f6ed3993a4965b0fb5f36ae2e290a31d142d4da828c9e6007d4f88e41dcef59229d092602076bb3766d2d3bc EBUILD qtwebview-6.7.2.ebuild 424 BLAKE2B 86e3c7fd77a21cf01d75f05ca479c626ff1c7ef0676e97ab501acab0d5643d027bc9c34cddf294986c18e7cfd44158bf52407ec38c73fb2cc6eef5f954a2155a SHA512 78ae1e47c4d63c01b4defda29cde53d3fc0ad74cab32abf5e43e6ed022d7d8030ddfae059cc7e066205dda60014b0eefa5bafc8a07f7560c9359ba678984b957 EBUILD qtwebview-6.7.3.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 -EBUILD qtwebview-6.7.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 EBUILD qtwebview-6.8.0.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 EBUILD qtwebview-6.8.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 EBUILD qtwebview-6.9999.ebuild 426 BLAKE2B 1b0f16550615267fb19493899bfd98a16be579edc184bb007eb2109d40b940d15cb0d1bcde3c8675dcabcfa1c4e74435648b1ebd9913a81baad3b0faf0615050 SHA512 1b13e77465674b5885adb9416dce839bb9e3f6342c0c2eac633f7a8beb0f96f82ac5a43d7fdf59be4ef37449841a0a89d00e5ee0a2e0b5b8d093388ac23544f2 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 76539b793b79..000000000000 --- 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}" |