From 65277f763adcb68cea58abf75cd35eab450a0d15 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Nov 2023 10:51:05 +0000 Subject: gentoo auto-resync : 29:11:2023 - 10:51:05 --- dev-qt/Manifest.gz | Bin 11397 -> 11393 bytes dev-qt/qt-docs/Manifest | 2 +- dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild | 4 +- dev-qt/qtbase/Manifest | 7 +- .../qtbase-6.6.1-forkfd-childstack-size.patch | 23 ++ dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 353 +++++++++++++++++++++ dev-qt/qtbase/qtbase-6.6.1.ebuild | 352 -------------------- dev-qt/qtbase/qtbase-6.6.9999.ebuild | 1 + dev-qt/qtbase/qtbase-6.9999.ebuild | 1 + dev-qt/qtdeclarative/Manifest | 2 +- .../qtdeclarative/qtdeclarative-5.15.11-r2.ebuild | 2 +- dev-qt/qtgui/Manifest | 2 +- dev-qt/qtgui/qtgui-5.15.11-r2.ebuild | 2 +- dev-qt/qtsql/Manifest | 2 +- dev-qt/qtsql/qtsql-5.15.11-r1.ebuild | 2 +- dev-qt/qtwebview/Manifest | 4 + dev-qt/qtwebview/qtwebview-6.6.1.ebuild | 19 ++ dev-qt/qtwebview/qtwebview-6.6.9999.ebuild | 19 ++ dev-qt/qtwebview/qtwebview-6.9999.ebuild | 19 ++ dev-qt/qtwidgets/Manifest | 2 +- dev-qt/qtwidgets/qtwidgets-5.15.11-r1.ebuild | 2 +- 21 files changed, 454 insertions(+), 366 deletions(-) create mode 100644 dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch create mode 100644 dev-qt/qtbase/qtbase-6.6.1-r1.ebuild delete mode 100644 dev-qt/qtbase/qtbase-6.6.1.ebuild create mode 100644 dev-qt/qtwebview/qtwebview-6.6.1.ebuild create mode 100644 dev-qt/qtwebview/qtwebview-6.6.9999.ebuild create mode 100644 dev-qt/qtwebview/qtwebview-6.9999.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 0a346f6deafb..672768018709 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest index 3802157cf4af..f753a03a3850 100644 --- a/dev-qt/qt-docs/Manifest +++ b/dev-qt/qt-docs/Manifest @@ -358,5 +358,5 @@ DIST 6.6.1-0-202311210527qtxml-documentation.tar.xz 341180 BLAKE2B ee1c30702f787 EBUILD qt-docs-5.15.2_p202011130614.ebuild 3213 BLAKE2B f136fa47ed7e9e112d03b4b84df860743afc2ea37e0a080c3d154c0293ef740f416edaa8146e7db5cb327ceb0ecc8662a9a062054acfe0c68b6fd47fd32f518d SHA512 ef34c97b3f4d1f47bb7381d89d0971797725317d07611c2c19d59e13f84332ffe4655501c41e8fb082441371f76fa4b627b9d00d18c1475a9cfe9b1bfc19fa27 EBUILD qt-docs-6.5.3_p202309260341.ebuild 5020 BLAKE2B 7a4bdcc65db31da7efc00ebe0257b8a8138b0c5506d789ae1b3173c66dd77cb55ead63dabf3f87cd7273f0c4f3f08349cb6632064d5b7f4b324ad2783e07e7c3 SHA512 e40562756fe54feda4306d925676824fb637bd6171551037837bc82f2c9f539eeb3279eb5f64d17fdf09512c7c22d5bc73d3b0ba04a37b867b3dd5657c600a55 EBUILD qt-docs-6.6.0_p202310040911.ebuild 5040 BLAKE2B f3183b1b1dce926def6188669f0b740db479a6b7ebcb8c7bc7de15e383069f9d3235d0af23fb7b4f94daf43f6baf6ec38f25e2112c2087256bf63ac4eef2b067 SHA512 51978333efdf3f0135c1cc1d44e3c5aa6eeebbf876344b1387ccfc88731de35b825d6a06bef7477a0d322c7688c861fba92b4f87bf67341bc8f18bb1750737c8 -EBUILD qt-docs-6.6.1_p202311210527.ebuild 5047 BLAKE2B 44721c9b3d4788c72ba0c2b1e20ad62b2710ceeb15512f7f46d6a84d8543c02dcd2877fd9e2b7e8eb070386765d671240b21204d6fbd523fa171a15ab6403bd3 SHA512 a4a445c311450a05a9875640bc6651e5eb86b153b2861d79260e651760fef58318e370938ddf40d9c7a75a8f6eaf8b9e6699ca9c6574d3ebd6ebe0a498d9256d +EBUILD qt-docs-6.6.1_p202311210527.ebuild 5059 BLAKE2B 5f5bef3928c68291c5a6a986e6e9940063e418a2e607dfd70036eadf1959d267662ee20ea1f53c5869f71ced29633d79fdfe86d34f2c9041a1e56a34f027bf9f SHA512 1817435282ca317d348cea56a094cc5b05ccaca13747f7b9a971fd4ee6a044a601e38ab6a35e101203a1fa9a607a90e1211a7e3c1ba922d060613c8cc81786c6 MISC metadata.xml 5290 BLAKE2B 4bd7db247ead833a33ddca3f6d9c81773adfdcf776b02d49de7ca2e3b4a10ea8d9a0b07cd3f7068eecb954b93b0c77cf1d240df3ce33508231c2c3fb35afeb81 SHA512 7f6c6779880d1681e2dcac9273650f20690176bf47d7e3825d7d76b7f6db2cac92a2b1ecf3e2886fa724f5230e9bde703d3341a266ea05f19c2d2f3aee58c81e diff --git a/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild b/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild index ab639aa78f59..095249acc31b 100644 --- a/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild +++ b/dev-qt/qt-docs/qt-docs-6.6.1_p202311210527.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://doc.qt.io/" LICENSE="FDL-1.3" SLOT="6" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~arm ~arm64" IUSE="+examples +html +qch" REQUIRED_USE="|| ( examples html qch )" @@ -97,7 +97,7 @@ qt6_docs_generate_metadata() { +webengine/qtpdf: +webengine/qtwebengine +websockets/qtwebsockets - -webview/qtwebview + +webview/qtwebview ) local entry operator use subdir package exception modules uris diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index bf9940c29f9a..6ad04aaaa3a1 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -3,12 +3,13 @@ AUX qtbase-6.5.2-no-glx.patch 1298 BLAKE2B 83b399a1faa1bb976bc00b7d0b9721b2a2bc6 AUX qtbase-6.5.2-no-symlink-check.patch 152 BLAKE2B 676ff8577f678fe3ed1e34e3fc8f7a9b16145259b2e23c432d4cb08465cb5d3a6685e557c9da862f3abb0d51459c7dc055155d804c3daef768bf0e9bdcc3b162 SHA512 6a82cb63812c7fa6d04e9ba9d017ce23ff1d620ec6ebcd575719678138d74e1298e3962d48e211ee72c9a533f03cb7a0fa47b428592a1402ec7ad1d1c487a4b4 AUX qtbase-6.5.3-forkfd-childstack-size.patch 1121 BLAKE2B a0fdab83b7bbf783352078cfb8111ea5dbcdc47e6435dc9bc85b3c55a4e3f05590abec396ddff466f6a823fbcb4ebcb0947c19b53d5c9f36d0227d6c05d69e2e SHA512 de5ca078206b18d1733906925d438bbe06088560ab10647840db818391f6a7b6a6bd5c112b06c1b6aa2ffbf46f4d749ece5f6f0739c672b4c3f4ce47ae5ff823 AUX qtbase-6.5.3-xkbcommon160.patch 1038 BLAKE2B c6e499343728b78d33f52cefae44c1ef7fc67df0b5e9184920d8a4268c0fd73456ad9fedccf2380c2e22a9347f1da7c1279d3a22125e6f2b389b0cabe73f85c4 SHA512 09f795ad8342e2f7dd13f63ab98b9945e3e1b80e2917b1ef21845cc488bf823598693d53257e7b15ca3b3ee95dce2bfc60dced2e1b8f765337e4db86be73ac8e +AUX qtbase-6.6.1-forkfd-childstack-size.patch 861 BLAKE2B c5b1f471cf91150b6d6a643994284e95721f0739284680ba3e2d5d2332b3e0544c85f6dfb7129fccc3ed3beae24d7d3c919357d160bc9d5004426c68e8fa6321 SHA512 8c619b24cd9b7dd72ee975a66d6919718a0594eaeb0907454a9a9fd68a259db345f685aa9c87cf0c0c27b4194f621306a6f00f20dce95482bce7efe55fae00d6 DIST qtbase-everywhere-src-6.5.3.tar.xz 47142456 BLAKE2B 5b4c774b7199563dc7f2aebf9b2b531d851ee49bc038212f4970eeb43a17c364710432708f82a518eee6692ab123d78b642c234d9548d5b553f689a43aa05ee6 SHA512 31c6c01d466f1e01f18d6dcee593360c08ee83ad0a6be495a8eba023faad628cf07ce7285426fabfd247db306319e9a64da329682c99a712a282e32f7493cdb9 DIST qtbase-everywhere-src-6.6.0.tar.xz 48350308 BLAKE2B 719e265dfafb4fd95f972a317acb95e2d83f8d62175c28ab97837c635435bdcd79bdca113362dea2f04dab799d4749e23056ddb9583908ee20ab23cedeca19b7 SHA512 4e85acefeddc0a3cd6ba615b4768f435c4e237a605172153a1777a10285dab83d9cf220c18ce6d723d051b8b432f3e92be94925b54c2eb972c2c1d9ace849e17 DIST qtbase-everywhere-src-6.6.1.tar.xz 48370760 BLAKE2B 2dd551d15eef30c7d9a5f4c406143d6f8908d7ebade9daf9fbd3d82a25765425956f2cb8689c50f87f6477de2150eee7b820ef25bb4355c51e7e7fad3ef73005 SHA512 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1 EBUILD qtbase-6.5.3-r1.ebuild 9687 BLAKE2B 815eccc4d634fb6216d3d2579bb9a7b06250a7428f2c8ed35e1dd244b512dd2d74f4b2afc552fa4d1bf0d6c936e3137827bc9c414e045c2f533a8d58d904d7d6 SHA512 ede59eb681b14fa4700f5dc719310f66bd8606e14f0d653be8ee7fe21b96332bfbe1597900c885f4a036a45b5677e8352b951fca57efc6f3d4a5c49cb226fb55 EBUILD qtbase-6.6.0-r1.ebuild 9708 BLAKE2B 31b7311dfec4d656cf21e49868474228a563d2de80f014482ab5ad9b3f3ceedd1a1f0792cb0edbf78b365a3c0c4558c6f0f415649eec29efda04a8e077f69ac3 SHA512 3bd956295813a67a5327c594bdea9e384653d4ba31d42c957aead14782f4c59c503de4fe8d228c1a20b5081dec74528593d75f19fad34878683522f5e9f3f742 -EBUILD qtbase-6.6.1.ebuild 9604 BLAKE2B 658491332b60fb4a408981c68bdad6a24c6ed342caa4af6bd0ef51213a4c5772bd28574a004608308bed2d6bf5d0e6cdfdc356aa03eab30200c967dde2b14dad SHA512 89faac1be72daa01a202cb26d31ba4e7f56685f4d875c2e7c5f8da53e8a6e11dee4429fba669dd3c4117c0be1382fa36f17cd9fd51248fa83d6ca9a8ed7cb82e -EBUILD qtbase-6.6.9999.ebuild 9604 BLAKE2B 658491332b60fb4a408981c68bdad6a24c6ed342caa4af6bd0ef51213a4c5772bd28574a004608308bed2d6bf5d0e6cdfdc356aa03eab30200c967dde2b14dad SHA512 89faac1be72daa01a202cb26d31ba4e7f56685f4d875c2e7c5f8da53e8a6e11dee4429fba669dd3c4117c0be1382fa36f17cd9fd51248fa83d6ca9a8ed7cb82e -EBUILD qtbase-6.9999.ebuild 9678 BLAKE2B 6cc553fdd07c1beaac03d8df10531b09296dccf45494e5f2c32664eb09a719fbd8ed942c23c1b763f9a3ac8d89afa5fabd4cfbf2b9111189723b928e8bd66d34 SHA512 c98f13434c213562d13f8eac094ea8e080ae45041e91199ad41bbfd289ef521c777037c492b4b854af3aa13a29a1878aca9aa7dff0cc44d35c4ded69e88a24de +EBUILD qtbase-6.6.1-r1.ebuild 9660 BLAKE2B 204bffdb1b2474d89f620ecc4318d30c78841ad919e8dcc3f3426dff3f6177edfdef5434a42ee801c3718adbfd7d1d736180b0550cd4fb58516a09919762fc9d SHA512 3332ca245c930df3223afd439450d78820a2a3991c16ff1e82e47516cac02fd4aaeee1e5b4402d9b67f0be5ea130b088bb409d809ffd8129656fd901a0db54b2 +EBUILD qtbase-6.6.9999.ebuild 9660 BLAKE2B 204bffdb1b2474d89f620ecc4318d30c78841ad919e8dcc3f3426dff3f6177edfdef5434a42ee801c3718adbfd7d1d736180b0550cd4fb58516a09919762fc9d SHA512 3332ca245c930df3223afd439450d78820a2a3991c16ff1e82e47516cac02fd4aaeee1e5b4402d9b67f0be5ea130b088bb409d809ffd8129656fd901a0db54b2 +EBUILD qtbase-6.9999.ebuild 9734 BLAKE2B fd3466371ba620b3999200a5555237bf920aec697057e2268231085443eccfa46a26edfe6eb4f278be21d34b6b734ec839626532d4fa1bdcc768db69c6bd34ba SHA512 05c3905daf36a9ac43204656ad22644537ef3a97cfdf07fc533e5ccd3057d4eb20e0ec3d15e8e4fd52be5b1ce4ac288956270f63e403db3fd0519c06f1532483 MISC metadata.xml 1655 BLAKE2B 1f3bdbe5f14716d1825ff0ce6d3a9439a87c0c18abd0bb6a2286c9709e815205f2f6911ef5d053b57598aa54471d4316f87c9a4d36004be15f499447785f14bd SHA512 d1479bae177f75991241eacaa1300f43d644730fa3d6d7e6e039b8a212f1289b920b6e1aad7c56576857049f133492f5cf648c7931228c6c4ee272d93437e351 diff --git a/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch b/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch new file mode 100644 index 000000000000..6b0ff1709abb --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.6.1-forkfd-childstack-size.patch @@ -0,0 +1,23 @@ +Avoid crash that happens for some users in qsb, qmake, and +potentially other Qt tools when ran under sandbox leading +to build failures for qtdeclarative and other packages. + +Former fix involved replacing 4096 by SIGSTKSZ but +bug #918664 shown that this may be insufficient so this +tries 32k instead. + +https://bugs.gentoo.org/908809 +https://bugs.gentoo.org/908816 +https://bugs.gentoo.org/913493 +https://bugs.gentoo.org/915695 +https://bugs.gentoo.org/918664 +https://codereview.qt-project.org/c/qt/qtbase/+/513140 +--- a/src/3rdparty/forkfd/forkfd_linux.c ++++ b/src/3rdparty/forkfd/forkfd_linux.c +@@ -158,5 +158,5 @@ + int system_vforkfd(int flags, pid_t *ppid, int (*childFn)(void *), void *token, int *system) + { +- __attribute__((aligned(64))) char childStack[SIGSTKSZ]; ++ __attribute__((aligned(64))) char childStack[32768]; + pid_t pid; + int pidfd; diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild new file mode 100644 index 000000000000..90146aaed3c8 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild @@ -0,0 +1,353 @@ +# Copyright 2021-2023 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 ~x86" +fi + +declare -A QT6_IUSE=( + [global]="+ssl +udev zstd" + [core]="icu" + [modules]="+concurrent +dbus +gui +network +sql +xml" + + [gui]=" + +X accessibility eglfs evdev gles2-only +libinput + opengl tslib vulkan +widgets + " + [network]="brotli gssapi libproxy sctp" + [sql]="mysql oci8 odbc postgres +sqlite" + [widgets]="cups gtk" + + [optfeature]="nls wayland" #810802,864509 +) +IUSE="${QT6_IUSE[*]}" +REQUIRED_USE=" + $( + 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) +RDEPEND=" + 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:= ) + + 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?] ) + ) + tslib? ( x11-libs/tslib ) + widgets? ( + cups? ( net-print/cups ) + gtk? ( + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/pango + ) + ) + ) + network? ( + brotli? ( app-arch/brotli:= ) + gssapi? ( virtual/krb5 ) + libproxy? ( net-libs/libproxy ) + ) + sql? ( + mysql? ( dev-db/mysql-connector-c:= ) + oci8? ( dev-db/oracle-instantclient:=[sdk] ) + odbc? ( dev-db/unixODBC ) + postgres? ( dev-db/postgresql:* ) + sqlite? ( dev-db/sqlite:3 ) + ) +" +DEPEND=" + ${RDEPEND} + 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-glx.patch + "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.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 + fi +} + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_PCH=OFF + + -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" + -DINSTALL_BINDIR="${QT6_BINDIR}" + -DINSTALL_DATADIR="${QT6_DATADIR}" + -DINSTALL_DOCDIR="${QT6_DOCDIR}" + -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" + -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" + -DINSTALL_LIBDIR="${QT6_LIBDIR}" + -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" + -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" + -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" + -DINSTALL_QMLDIR="${QT6_QMLDIR}" + -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" + -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" + + $(qt_feature ssl openssl) + $(qt_feature ssl openssl_linked) + $(qt_feature udev libudev) + $(qt_feature zstd) + + # qtcore + $(qt_feature icu) + + # tools + -DQT_FEATURE_androiddeployqt=OFF + + # modules + $(qt_feature concurrent) + $(qt_feature dbus) + $(qt_feature gui) + $(qt_feature network) + $(qt_feature sql) + -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps + $(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 tslib) + $(qt_feature vulkan) + $(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) + ) + + if use amd64 || use x86; then + # see bug #913400 for explanations + local cpufeats=( + # list of checked cpu features in configure.cmake + avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} + f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes + ) + # handle odd ones out not matching -m* and macros (keep same order) + local cpuflags=( "${cpufeats[@]}" aes sha ) + local cpufeats+=( aesni shani ) + + local -a intrins + IFS=' ' read -ra intrins < <( + : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" + $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 + #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) + #include + #endif + $(printf '__%s__ ' "${cpuflags[@]^^}") + EOF + assert + ) + + # do nothing and leave to qtbase if no macros expanded (test failed?) + if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then + local -i i + for ((i=0; i<${#cpufeats[@]}; i++)); do + [[ ${intrins[i]} == __* ]] && + mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) + done + mycmakeargs+=( -DTEST_x86intrin=ON ) + fi + fi + + 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 + # 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} + # 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_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 at least on BE arches (bug #914033,914371) + tst_qimagereader + tst_qimagewriter + tst_qpluginloader + # 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 + ') + # note: for linux, upstream only really runs+maintains tests for amd64 + # https://doc.qt.io/qt-6/supported-platforms.html + ) + + qt6-build_src_test +} + +src_install() { + qt6-build_src_install + + if use test; then + local delete_bins=( # need a better way to handle this + clientserver copier crashingServer desktopsettingsaware_helper + echo fileWriterProcess modal_helper nospace 'one space' + paster qcommandlineparser_test_helper qfileopeneventexternal + socketprocess syslocaleapp tst_qhashseed_helper 'two space s' + write-read-write + ) + local delete=( # sigh + "${D}${QT6_BINDIR}"/test* + "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" + ) + # using -f given not tracking which tests may be skipped or not + rm -rf -- "${delete[@]}" || die + fi +} diff --git a/dev-qt/qtbase/qtbase-6.6.1.ebuild b/dev-qt/qtbase/qtbase-6.6.1.ebuild deleted file mode 100644 index adbaf526bcf1..000000000000 --- a/dev-qt/qtbase/qtbase-6.6.1.ebuild +++ /dev/null @@ -1,352 +0,0 @@ -# Copyright 2021-2023 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 ~x86" -fi - -declare -A QT6_IUSE=( - [global]="+ssl +udev zstd" - [core]="icu" - [modules]="+concurrent +dbus +gui +network +sql +xml" - - [gui]=" - +X accessibility eglfs evdev gles2-only +libinput - opengl tslib vulkan +widgets - " - [network]="brotli gssapi libproxy sctp" - [sql]="mysql oci8 odbc postgres +sqlite" - [widgets]="cups gtk" - - [optfeature]="nls wayland" #810802,864509 -) -IUSE="${QT6_IUSE[*]}" -REQUIRED_USE=" - $( - 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) -RDEPEND=" - 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:= ) - - 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?] ) - ) - tslib? ( x11-libs/tslib ) - widgets? ( - cups? ( net-print/cups ) - gtk? ( - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/pango - ) - ) - ) - network? ( - brotli? ( app-arch/brotli:= ) - gssapi? ( virtual/krb5 ) - libproxy? ( net-libs/libproxy ) - ) - sql? ( - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sqlite? ( dev-db/sqlite:3 ) - ) -" -DEPEND=" - ${RDEPEND} - 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-glx.patch - "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.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 - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_PCH=OFF - - -DINSTALL_ARCHDATADIR="${QT6_ARCHDATADIR}" - -DINSTALL_BINDIR="${QT6_BINDIR}" - -DINSTALL_DATADIR="${QT6_DATADIR}" - -DINSTALL_DOCDIR="${QT6_DOCDIR}" - -DINSTALL_EXAMPLESDIR="${QT6_EXAMPLESDIR}" - -DINSTALL_INCLUDEDIR="${QT6_HEADERDIR}" - -DINSTALL_LIBDIR="${QT6_LIBDIR}" - -DINSTALL_LIBEXECDIR="${QT6_LIBEXECDIR}" - -DINSTALL_MKSPECSDIR="${QT6_MKSPECSDIR}" - -DINSTALL_PLUGINSDIR="${QT6_PLUGINDIR}" - -DINSTALL_QMLDIR="${QT6_QMLDIR}" - -DINSTALL_SYSCONFDIR="${QT6_SYSCONFDIR}" - -DINSTALL_TRANSLATIONSDIR="${QT6_TRANSLATIONDIR}" - - $(qt_feature ssl openssl) - $(qt_feature ssl openssl_linked) - $(qt_feature udev libudev) - $(qt_feature zstd) - - # qtcore - $(qt_feature icu) - - # tools - -DQT_FEATURE_androiddeployqt=OFF - - # modules - $(qt_feature concurrent) - $(qt_feature dbus) - $(qt_feature gui) - $(qt_feature network) - $(qt_feature sql) - -DQT_FEATURE_testlib=ON # trivial and often needed to build revdeps - $(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 tslib) - $(qt_feature vulkan) - $(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) - ) - - if use amd64 || use x86; then - # see bug #913400 for explanations - local cpufeats=( - # list of checked cpu features in configure.cmake - avx avx2 avx512{bw,cd,dq,er,f,ifma,pf,vbmi,vbmi2,vl} - f16c rdrnd rdseed sse2 sse3 sse4_1 sse4_2 ssse3 vaes - ) - # handle odd ones out not matching -m* and macros (keep same order) - local cpuflags=( "${cpufeats[@]}" aes sha ) - local cpufeats+=( aesni shani ) - - local -a intrins - IFS=' ' read -ra intrins < <( - : "$(test-flags-CXX "${cpuflags[@]/#/-m}")" - $(tc-getCXX) -E -P ${_} ${CXXFLAGS} ${CPPFLAGS} - <<-EOF | tail -n 1 - #if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) - #include - #endif - $(printf '__%s__ ' "${cpuflags[@]^^}") - EOF - assert - ) - - # do nothing and leave to qtbase if no macros expanded (test failed?) - if [[ \ ${intrins[*]} == *\ [^_\ ]* ]]; then - local -i i - for ((i=0; i<${#cpufeats[@]}; i++)); do - [[ ${intrins[i]} == __* ]] && - mycmakeargs+=( -DQT_FEATURE_${cpufeats[i]}=OFF ) - done - mycmakeargs+=( -DTEST_x86intrin=ON ) - fi - fi - - 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 - # 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} - # 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_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 at least on BE arches (bug #914033,914371) - tst_qimagereader - tst_qimagewriter - tst_qpluginloader - # 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 - ') - # note: for linux, upstream only really runs+maintains tests for amd64 - # https://doc.qt.io/qt-6/supported-platforms.html - ) - - qt6-build_src_test -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete_bins=( # need a better way to handle this - clientserver copier crashingServer desktopsettingsaware_helper - echo fileWriterProcess modal_helper nospace 'one space' - paster qcommandlineparser_test_helper qfileopeneventexternal - socketprocess syslocaleapp tst_qhashseed_helper 'two space s' - write-read-write - ) - local delete=( # sigh - "${D}${QT6_BINDIR}"/test* - "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} diff --git a/dev-qt/qtbase/qtbase-6.6.9999.ebuild b/dev-qt/qtbase/qtbase-6.6.9999.ebuild index adbaf526bcf1..90146aaed3c8 100644 --- a/dev-qt/qtbase/qtbase-6.6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.9999.ebuild @@ -136,6 +136,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch "${FILESDIR}"/${PN}-6.5.2-no-glx.patch "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch ) src_prepare() { diff --git a/dev-qt/qtbase/qtbase-6.9999.ebuild b/dev-qt/qtbase/qtbase-6.9999.ebuild index 9516155745e3..4de73e3c0c2f 100644 --- a/dev-qt/qtbase/qtbase-6.9999.ebuild +++ b/dev-qt/qtbase/qtbase-6.9999.ebuild @@ -137,6 +137,7 @@ PDEPEND=" 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 ) src_prepare() { diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest index 649ad23949f5..5b2aee1a6456 100644 --- a/dev-qt/qtdeclarative/Manifest +++ b/dev-qt/qtdeclarative/Manifest @@ -6,7 +6,7 @@ DIST qtdeclarative-everywhere-src-6.5.3.tar.xz 34140352 BLAKE2B 36b2f8de9138a60e DIST qtdeclarative-everywhere-src-6.6.0.tar.xz 34331124 BLAKE2B 3367619a1a9decc09340c8332e8f4f2a619254517030a64407a7ce1334e0f57df472e53f167adcbbc979458ee060607d16a77bd40eace4f30d8b30ff35dc7e69 SHA512 6563d23d48c828a7895279c42befa2275b02301fa16906494ea84a9c80076ea5c7f1be773a52f483dab5d8304feedfd9c5df4ac83cd77284aacae0287760555a DIST qtdeclarative-everywhere-src-6.6.1.tar.xz 34349560 BLAKE2B 399d11d52cbafdb13a21a39a9d98b314d45f39ec5351265f9e6fd08a335c48907cdcd1fde23da079ade6cf9adeafd48ba5cba2233cd54d2f6f51ae05a4979780 SHA512 1a819187519670338df1c308d5980aed985670ee3e79a424e56d8e300855513541f46a1b89d9f595bdab382a0072761f0fda87d78653602041a10a5bd3e7bdcd EBUILD qtdeclarative-5.15.11-r1.ebuild 1537 BLAKE2B 0af4262a6a66031b32a4e1f5de32e94f56e1efb6cd19dadbc4c1cc8a933c34f7b31eecb701e7c431fcb70bc8ecd00d1afcbfd764ae44e1abe7ecd68d7a01d99b SHA512 27da0c6ba1d551bc3fad24891e090f61e56d69c4096ea7c0c39bf22ddeef7e414a211c7c27ec570997f51e001fdcf89165314ea5bd9bfaeff4c62fabc72be1b9 -EBUILD qtdeclarative-5.15.11-r2.ebuild 1540 BLAKE2B 07606784f06c6da588cc1a5fb413641304bd05d24eb17e21a219a4bcfccac429bb982fc4ad2cab6414e531c5fcc557a3d26d545d03279a2bad0438948b286ae2 SHA512 0fdc4aadee2299e2ebb795cf343080200efde02e3cdd95b87537ae306eec27293896298a0e8d8b43e06db8363c0f7bf2d696fcd3ba60f42c915ec536c151826f +EBUILD qtdeclarative-5.15.11-r2.ebuild 1539 BLAKE2B 2f694176df11201341bdaf9daedd80e564487f4d5199de9fd7bec1010a681ab33f1e41ae12afc34c8921d0ddbf071145d97c59ebde8c841ddda7ccbb42d21b35 SHA512 904ea1f1aca55a9bf6021bd5bf9e03ef013a78a2b6a8363ba1cfa1e7f539c8a5974f22a33a8cbfee822986ab69154e6887fbc2924fdfb3c7479be26dc2bf0655 EBUILD qtdeclarative-6.5.3.ebuild 770 BLAKE2B a1566f08b9120c10636c76b1a211498b1625d512171c58747b006529950641f68f55f62f34c42d03e2f57a555e5ed404db23461dd7758bd01f0d3a3d527ea94d SHA512 7db4adca1e2982a4c65418dad0adc27554898b814695fd326c9bb594f08eafe8917946e2f5dc21494abfb4eb09289a636a61df5843711a76ead7153ef9fff4e7 EBUILD qtdeclarative-6.6.0.ebuild 743 BLAKE2B fdc766f843759004d095d12564b736057bf7c2325e6e43dfe6eb21dcd185c0b3a67850496b575ba057e2135d97b4ca8ed04a94b9076e87605d52dc9231f21e17 SHA512 6de77ce9915baa4f25edabbf2601663e54b2e12f407123d163faeaf7c5dd088f74997aaad58482264375d383e1c43d7f43576e297f9857c684c1a6c1df59370b EBUILD qtdeclarative-6.6.1.ebuild 743 BLAKE2B fdc766f843759004d095d12564b736057bf7c2325e6e43dfe6eb21dcd185c0b3a67850496b575ba057e2135d97b4ca8ed04a94b9076e87605d52dc9231f21e17 SHA512 6de77ce9915baa4f25edabbf2601663e54b2e12f407123d163faeaf7c5dd088f74997aaad58482264375d383e1c43d7f43576e297f9857c684c1a6c1df59370b diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.11-r2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.11-r2.ebuild index 24570e92f912..bc19ad39871f 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.11-r2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.11-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=3 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc ~x86" fi PYTHON_COMPAT=( python3_{8..12} ) diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index ebaffd9a87c4..5566aa2c8eb7 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4 DIST qtbase-5.15.11-gentoo-kde-2.tar.xz 327120 BLAKE2B 38cf4106d620b28ab690de52dce7bbcf2da9de1009a0b126a68e19949013458ba788edd92a050410f9e33522be77e09eeeb95d4d696c3e482156dce5e120ee70 SHA512 235fb3baf660c551415300b5cc8a0d6091c7edd0a6f2c28bfb4e14bc63ada50203c0108cd8bd84b931860ee196cf83f68ec82a34509515c439ab989d80167d26 DIST qtbase-5.15.11-gentoo-kde-3.tar.xz 330732 BLAKE2B 2f783249ebbc2381861f1edec560877113a6f63977b856385977b114b654a21d3dd5d7daa8f2d93ab4549266ca75071dfc4f6fe3a7f8e2b3087e45001f5bb53f SHA512 df53c45bcf8f9dbcc8de91748c9b28b7d3d26b401800620ddc1cf244f6b500dd7e867394272f04348f58aa7aaed6e4e8c2edce694b6a6f465542d609f05ebd6e DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f -EBUILD qtgui-5.15.11-r2.ebuild 3989 BLAKE2B 65b8c90d615851f3dbad1ce4f3ce56389d5e9b3c8b47f7c8ef49430173f820ba5c3df2d5eede1723c167be36fc402c9c42d6fb64b723f71ac57c562fc60853a9 SHA512 b392660d50a76a4b1dc7faf0fd37e552ac84e9d2cc8108cb12dfa4ff306cb180f558336c249be753e42dd348aa9c574c3cc3162c83ebdba4b8ad329c30d089b3 +EBUILD qtgui-5.15.11-r2.ebuild 3988 BLAKE2B 5c3f782ea6efc3ce910b0b28807dd96fabbb98e3a01aac4a90f2754ab83dc8b4aaf4f1168d298e9f3eb741087b9eeff01d9f18a33894be8343af614221c95d14 SHA512 2298f9c57f5f36da86dfcc92ad54ae8783b7e1f06a4dd38d6b1646dce40170a2905b5aa0b76e98b937815d9a3fd42c7981b635d56bf1610337da58d9055d12e7 EBUILD qtgui-5.15.11.ebuild 3872 BLAKE2B f2c597379c102656deef5f53ec1f26ad8aaacbaeafaa46677d822ab71b71b6376898a41dfaefaba12c8adf5baf431259e87bd66a06f28ce29d0af1a4793f6a71 SHA512 4e5db64ea049f01cf4bfac5efba839b9ed6f457b51487cfe4426fdd05616b6843e923b8bad71ae8fb0c610144b42514f92206b5c1954440f5eb880baa8eeaea4 MISC metadata.xml 1332 BLAKE2B 9e3b90622029fb3c2345b61a3d5d5c55c9e364f2872cdcbd74d34c2af41a692e8e6e03396799c0ce2ec74d3b0dc3e86e755502217f25a18d6e822389ec8481b7 SHA512 1eb4740fcbdceed313e24e019424d08239539eede918f41964ab092d85ec9f78665a40922f92467eceaf1ac7632c0b12c5368884f7128b8b119550c3c87b5e67 diff --git a/dev-qt/qtgui/qtgui-5.15.11-r2.ebuild b/dev-qt/qtgui/qtgui-5.15.11-r2.ebuild index 31253da9852b..e75b514003df 100644 --- a/dev-qt/qtgui/qtgui-5.15.11-r2.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.11-r2.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=3 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc ~x86" fi QT5_MODULE="qtbase" diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index 35cef726457a..fc2833437d50 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4 DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d DIST qtbase-5.15.11-gentoo-kde-3.tar.xz 330732 BLAKE2B 2f783249ebbc2381861f1edec560877113a6f63977b856385977b114b654a21d3dd5d7daa8f2d93ab4549266ca75071dfc4f6fe3a7f8e2b3087e45001f5bb53f SHA512 df53c45bcf8f9dbcc8de91748c9b28b7d3d26b401800620ddc1cf244f6b500dd7e867394272f04348f58aa7aaed6e4e8c2edce694b6a6f465542d609f05ebd6e DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f -EBUILD qtsql-5.15.11-r1.ebuild 1263 BLAKE2B 0f6087591150dab3363c82baeba69e8147accfe2a0f6e0e3b1d383319f8678fbf44a453ee7b9f19f6592f6a1c23fd278f0cdad7192c7086ba1969f83f4583d1b SHA512 cc87bd1764c992e8958f4b5f3e43dae0fd1b815064c37d7a4194bb267bc4ea5ce469fd48b620dd1b4e11f6cf75faaafddddbef3b152a61ab5622aca33fa9742d +EBUILD qtsql-5.15.11-r1.ebuild 1262 BLAKE2B 9014b94fca83193bc35eeaad78559cf3ed4d696a0146c80fd617643e996c8671c95efa493438b4b1e12c59e2630cdf423e0d109048dc3bbc1d99e39c8d70089d SHA512 2cdf9f15b47478048c78b9b72f7a1ceda0bda1bcceca794e27c07a27309bc21b3e821ee2bd41b90805b2cf76528748bc4db7ff82913a91cdd1397c0392fc6f63 EBUILD qtsql-5.15.11.ebuild 1260 BLAKE2B ab11a2826f1b72ed2f025844b610077093d8c58cf23424b151d996cbdd2f3e166323155f769c2f1d9de152a4b8c3a4e9679e14907e0480328af5424a78b7b0c1 SHA512 17d08dd34218396024ecd09540cb2ccdf2d92008b04a9143000f47f02aa56d0ca7652a3a431cfb43c5fda88c3305eca9580b749e5876532d077183463de0801c MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtsql/qtsql-5.15.11-r1.ebuild b/dev-qt/qtsql/qtsql-5.15.11-r1.ebuild index 206860e43fa0..686fa61028d7 100644 --- a/dev-qt/qtsql/qtsql-5.15.11-r1.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.11-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=3 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc ~x86" fi QT5_MODULE="qtbase" diff --git a/dev-qt/qtwebview/Manifest b/dev-qt/qtwebview/Manifest index e2d9f1956f60..f78be62f2e16 100644 --- a/dev-qt/qtwebview/Manifest +++ b/dev-qt/qtwebview/Manifest @@ -1,3 +1,7 @@ DIST qtwebview-everywhere-opensource-src-5.15.11.tar.xz 136856 BLAKE2B 9bb69128bb74d50e253cc428fc9954f1d62c535132c9281a573a433c3c4c260309603d649f0a97cc085dbc69ad55764533c0d582e0c69df0bbab6373b9bd9d5d SHA512 7a741b3bb79b9aeaca05130ad8346a2dc704a203654754c73953d37a88d4c923375c3db44ddc22ea0b9856abedb7daf99e89d4f387014dfe8fbb31aaea6a7e38 +DIST qtwebview-everywhere-src-6.6.1.tar.xz 147644 BLAKE2B 121496b0c9a6044682a5fb831e9dcd69d1f7e4e916d780bef5d4dd517a9fef568aa498f54cb3447548ce74eef2c7f25ab52075ebbda2d435c6e339a3c1018f99 SHA512 cb3093b233b3c77690be4c0c7cb7c7facd2d62c5a20f5f490a7881d97216ba13320e208dc74b7c02899250caa3d643b70c7ae5996ae15d2b2167fe4619046d3b EBUILD qtwebview-5.15.11.ebuild 476 BLAKE2B 139369c684385e33e519c20c26797f018a623fd58a50ef6e2638abf490f06c5317038b2994f0336f0a81d47a05b4c4da23c250e30c186ff2892910f9786d70a9 SHA512 86fc0dd4bf79a5a4572635d2a20ad0cff5746b18d36f9f10a0f430deb0730f456f4dd363516c261fcffcc422e1ac20b844ee201a3ead133069197ac9458b4d7c +EBUILD qtwebview-6.6.1.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3 +EBUILD qtwebview-6.6.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3 +EBUILD qtwebview-6.9999.ebuild 414 BLAKE2B 37d06c6da7ecc13cdc9ba704acfc9e78a4d222ba679c090bcc94098bd81998ad10eab990b3d89a73471630437edc288a49450aeac12f7eb1ddc9aa4b8a188551 SHA512 4409b79ab5eacce5f621e181f0a173d4c2de92bce1d94dafe2dfb7dd3f2e1ccce06e30a610d5275d5bbe0530514267ace610e874a2f94ec622d157dada687ac3 MISC metadata.xml 482 BLAKE2B 651a49dc4a07f5e5a9c21990868e666d98acdea7d7b0b2c0e4c98eafc3da72c803d380e4abda30f33250f7bbd7654df713833ccdddcb975cbad6f92e488f643b SHA512 192c670abd7da29645513bf1d9297d942efdc49f5cf170861e7689fda47f51daa47f10c7c81c3b045366e0259179c6839ff7747197c9d792e8d0fd1a5818973e diff --git a/dev-qt/qtwebview/qtwebview-6.6.1.ebuild b/dev-qt/qtwebview/qtwebview-6.6.1.ebuild new file mode 100644 index 000000000000..81210cfc2b80 --- /dev/null +++ b/dev-qt/qtwebview/qtwebview-6.6.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 2023 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" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtwebengine-${PV}:6[qml] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild new file mode 100644 index 000000000000..81210cfc2b80 --- /dev/null +++ b/dev-qt/qtwebview/qtwebview-6.6.9999.ebuild @@ -0,0 +1,19 @@ +# Copyright 2023 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" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtwebengine-${PV}:6[qml] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwebview/qtwebview-6.9999.ebuild b/dev-qt/qtwebview/qtwebview-6.9999.ebuild new file mode 100644 index 000000000000..81210cfc2b80 --- /dev/null +++ b/dev-qt/qtwebview/qtwebview-6.9999.ebuild @@ -0,0 +1,19 @@ +# Copyright 2023 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" +fi + +RDEPEND=" + ~dev-qt/qtbase-${PV}:6[gui] + ~dev-qt/qtdeclarative-${PV}:6 + ~dev-qt/qtwebengine-${PV}:6[qml] +" +DEPEND="${RDEPEND}" diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index 601286709fdd..d667dd4575d9 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -2,6 +2,6 @@ DIST qtbase-5.15-gentoo-patchset-4.tar.xz 4884 BLAKE2B ef1f11ea63084b834e19a9bd4 DIST qtbase-5.15.11-gentoo-kde-1.tar.xz 324008 BLAKE2B 3ccd8645b5b727e4794fe4cb605d3db97159bf196b8e3e342ade364b701d6eb41e8e83ed608ec996480d7a82a43ddac098844dcecc9f122d63e9072abc21e9db SHA512 d145af982de89a34eaa15c5dc48ed927b5757e6a6d9bfa064a5cef40618465d7d6139ecaccb71944eac43926b977031034f6c22d4986f1e4a704007de9cb325d DIST qtbase-5.15.11-gentoo-kde-3.tar.xz 330732 BLAKE2B 2f783249ebbc2381861f1edec560877113a6f63977b856385977b114b654a21d3dd5d7daa8f2d93ab4549266ca75071dfc4f6fe3a7f8e2b3087e45001f5bb53f SHA512 df53c45bcf8f9dbcc8de91748c9b28b7d3d26b401800620ddc1cf244f6b500dd7e867394272f04348f58aa7aaed6e4e8c2edce694b6a6f465542d609f05ebd6e DIST qtbase-everywhere-opensource-src-5.15.11.tar.xz 50825756 BLAKE2B 663d370d46a17939b984ef4c541414b81acdb98a2b7e67bb202c46891f9675e921723a025cef88b54b6111f235d94e273b97e1b55e2ca52b91e3eebca5ff7161 SHA512 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f -EBUILD qtwidgets-5.15.11-r1.ebuild 1206 BLAKE2B b741db56ffc988508a7f671a6f9b47464f29539ce565240a738dd1badceb97130987f699db8cd6a8e2c6fa97a74327c3c122081be7d5e2d358b208c856de3d49 SHA512 57c700dcbae5f52ab1b89b3a7ae5dd775c2dafe4fa9ea5ee35a0806c9c941115e0c74c4db63364ee12259970ac6cd8980b3072487d45e8ea464a4de9f4da0643 +EBUILD qtwidgets-5.15.11-r1.ebuild 1205 BLAKE2B ecc9a88c80ebc2dbb29619a38906cfc7c0292f78218c7ac2c293af8322776882cd1e0aa6b00fafd8e85f151dbf48926de0a8b3509549ee0f2d3b13efe6e11271 SHA512 270826ac6d50a617f0f1ba0bde43edfa33858c063ec35081c88cc5403dc9917a2d8311efba95f3f49b7a72e826354e3b12ddc1bb3f43916695abca4dba9fef0b EBUILD qtwidgets-5.15.11.ebuild 1203 BLAKE2B 73b92b4362a209529c2d8f03a68ce6b192937a3e278f61501c969c396781ce9a80576c03500f9f3f21b126183ddb991aa869d954ad2a14cc24d55fd042cbe5c1 SHA512 19a22957b9cb230a8b5d64a55bf1473a5a4750583a8f0c6aa8e6d344d42c2c0d824dd08dd5122a1813db60c21bd8ce62725717895974065e902d04e902d7d7d3 MISC metadata.xml 559 BLAKE2B 3ea80a5e419db32987d68d7e5033fa75fa0ff22b31b0842fd7ead902172cbe83650b0bbdf8657a57e428726e7cdf114d9011bd16066c080bc5f6ecb3f691d42c SHA512 51172365a186fbca09651bfd751284960dda4036390af2afab9812a7ae3fabdd9d60a336dee3cfc5e3d133a0216bf77e29660b9cdee2f0bcd2ce43c27297bdb1 diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.11-r1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.11-r1.ebuild index 3cd705e77013..ef769b7cfa65 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.11-r1.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.11-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 if [[ ${PV} != *9999* ]]; then QT5_KDEPATCHSET_REV=3 - KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~sparc ~x86" fi QT5_MODULE="qtbase" -- cgit v1.2.3