From 1e1e7636b59380beebd325e8d256875e4f824230 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 8 Jan 2024 18:59:30 +0000 Subject: gentoo auto-resync : 08:01:2024 - 18:59:30 --- dev-qt/Manifest.gz | Bin 11576 -> 11581 bytes dev-qt/qt-creator/Manifest | 2 - dev-qt/qt-creator/qt-creator-12.0.0.ebuild | 254 ----------------- dev-qt/qtbase/Manifest | 3 +- dev-qt/qtbase/qtbase-6.6.1-r1.ebuild | 361 ------------------------- dev-qt/qtbase/qtbase-6.6.1-r3.ebuild | 2 +- dev-qt/qthttpserver/Manifest | 2 +- dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild | 4 +- dev-qt/qtwebengine/Manifest | 8 +- dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 7 + dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 7 + dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 7 + dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 + 13 files changed, 37 insertions(+), 627 deletions(-) delete mode 100644 dev-qt/qt-creator/qt-creator-12.0.0.ebuild delete mode 100644 dev-qt/qtbase/qtbase-6.6.1-r1.ebuild (limited to 'dev-qt') diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz index 18e3af0fe252..68a153cbb10b 100644 Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest index d3913cad98fb..c1c52c625324 100644 --- a/dev-qt/qt-creator/Manifest +++ b/dev-qt/qt-creator/Manifest @@ -1,8 +1,6 @@ AUX qt-creator-11.0.2-musl-no-execinfo.patch 1305 BLAKE2B 14fba3e72188403cf457de46c50960bb69336023e74173a2a67c0e3101cbf8367cc0d0a31118efdaf715a184e558b6f2277fe8025035de482f6913e139660792 SHA512 707d09268cff8981d1baf7fa08c48a2c02edf044a7a76594d545a2a020616090c8b61851dff8d8a8350c024b39be932c9f7bc266e01b87680c7982759b1d96c4 AUX qt-creator-12.0.0-musl-no-malloc-trim.patch 343 BLAKE2B 9c4b87a0de20616dc8cf5da4523c347f963c3459efdd9a716387690775f96abe0bb60bf0e147dd01ded79a110d1222b4009b17cece71998b46d62dd8b83eeac6 SHA512 6a0807bab971a795a156f974dab2b12699a4c90a6c7380e2dd0a136ba44354791ef7a178f79e61100c3165ec7667a72d6ca7f3c43f4958ccf9e8611995ca191d -DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382 SHA512 e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd SHA512 03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7 -EBUILD qt-creator-12.0.0.ebuild 6826 BLAKE2B 6b159102812867402f6c98fd145829bf4b8d429a25ff7ef66c2bf993d7249ae4cdabd4751eca850f710ac63e2874c46c8a8bf58f8a71fb45c3bb9136d2189777 SHA512 6c01a855fb5885bb47edec6c61ab4b76731ffbea3b7a85d1988d1c130cfc52a4c159f5a857edad2efeccfa3bd6a12f4b8a04cd756b3c70f9c8707cfc83cdf6c9 EBUILD qt-creator-12.0.1.ebuild 6826 BLAKE2B 6b159102812867402f6c98fd145829bf4b8d429a25ff7ef66c2bf993d7249ae4cdabd4751eca850f710ac63e2874c46c8a8bf58f8a71fb45c3bb9136d2189777 SHA512 6c01a855fb5885bb47edec6c61ab4b76731ffbea3b7a85d1988d1c130cfc52a4c159f5a857edad2efeccfa3bd6a12f4b8a04cd756b3c70f9c8707cfc83cdf6c9 EBUILD qt-creator-9999.ebuild 6826 BLAKE2B 6b159102812867402f6c98fd145829bf4b8d429a25ff7ef66c2bf993d7249ae4cdabd4751eca850f710ac63e2874c46c8a8bf58f8a71fb45c3bb9136d2189777 SHA512 6c01a855fb5885bb47edec6c61ab4b76731ffbea3b7a85d1988d1c130cfc52a4c159f5a857edad2efeccfa3bd6a12f4b8a04cd756b3c70f9c8707cfc83cdf6c9 MISC metadata.xml 1242 BLAKE2B b0b082554e88fe15e707583e01c9883ac2c695244328eec8cfdcb948c1cd0f782940c429efaf83828fafd10c05ac468054039e8c73cc8fbf79dde1d5a2e990bc SHA512 7d877389c81c815a2691a6463b2ee122766bcd93f75fffd5faab014e06f901efa77f500bef2c67ece5fb37d5fc41e916668e38e282b72c1825cfec53c3c73e51 diff --git a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild b/dev-qt/qt-creator/qt-creator-12.0.0.ebuild deleted file mode 100644 index 74deb347c1bd..000000000000 --- a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI=( - "https://code.qt.io/qt-creator/qt-creator.git" - "https://github.com/qt-creator/qt-creator.git" - ) - EGIT_SUBMODULES=( - perfparser - src/libs/qlitehtml - src/libs/qlitehtml/src/3rdparty/litehtml - ) -else - QTC_PV=${PV/_/-} - QTC_P=${PN}-opensource-src-${QTC_PV} - [[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development - SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz" - S=${WORKDIR}/${QTC_P} - KEYWORDS="~amd64" -fi - -DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt" -HOMEPAGE="https://www.qt.io/product/development-tools" - -LICENSE="GPL-3" -SLOT="0" -IUSE=" - +clang +designer doc +help qmldesigner serialterminal - +svg test +tracing webengine -" -RESTRICT="!test? ( test )" - -LLVM_MAX_SLOT=17 -QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN - -# := is used where Qt's private APIs are used for safety -COMMON_DEPEND=" - >=dev-qt/qt5compat-${QT_PV} - >=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml] - >=dev-qt/qtdeclarative-${QT_PV}= - clang? ( - dev-cpp/yaml-cpp:= - =dev-qt/qttools-${QT_PV}[designer] ) - help? ( - >=dev-qt/qttools-${QT_PV}[assistant] - webengine? ( >=dev-qt/qtwebengine-${QT_PV} ) - ) - qmldesigner? ( - >=dev-qt/qtquick3d-${QT_PV}= - >=dev-qt/qtsvg-${QT_PV} - ) - serialterminal? ( >=dev-qt/qtserialport-${QT_PV} ) - svg? ( >=dev-qt/qtsvg-${QT_PV} ) - tracing? ( - app-arch/zstd:= - dev-libs/elfutils - >=dev-qt/qtshadertools-${QT_PV} - ) -" -# qtimageformats for .webp in examples, semi-optfeature but useful in general -RDEPEND=" - ${COMMON_DEPEND} - help? ( >=dev-qt/qtimageformats-${QT_PV} ) - qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} ) -" -DEPEND="${COMMON_DEPEND}" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-qt/qttools-${QT_PV}[linguist] - doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch - "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch -) - -llvm_check_deps() { - has_version -d "sys-devel/clang:${LLVM_SLOT}" -} - -pkg_setup() { - python-any-r1_pkg_setup - use clang && llvm_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # needed for finding docs at runtime in PF - sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \ - -i cmake/QtCreatorAPIInternal.cmake || die -} - -src_configure() { - # -Werror=lto-type-mismatch issues, needs looking into - filter-lto - - # temporary workaround for musl-1.2.4 (bug #903611), this ideally - # needs fixing in qtbase as *64 usage comes from its headers' macros - use elibc_musl && append-lfs-flags - - local mycmakeargs=( - -DBUILD_WITH_PCH=no - -DWITH_DOCS=$(usex doc) - -DBUILD_DEVELOPER_DOCS=$(usex doc) - -DWITH_TESTS=$(usex test) - - # TODO?: try to unbundle with =no when syntax-highlighting:6 exists - -DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes - - # Much can be optional, but do not want to flood users (or maintainers) - # with too many flags. Not to mention that many plugins are merely - # wrappers around still optional tools (e.g. cvs) and any unwanted - # plugins can be disabled at runtime. So optional flags are limited - # to plugins with additional build-time dependencies. - -DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual - -DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing) - - -DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang) - -DBUILD_PLUGIN_CLANGFORMAT=$(usex clang) - -DBUILD_PLUGIN_CLANGTOOLS=$(usex clang) - -DCLANGTOOLING_LINK_CLANG_DYLIB=yes - - -DBUILD_PLUGIN_DESIGNER=$(usex designer) - - -DBUILD_PLUGIN_HELP=$(usex help) - -DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine) - -DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine)) - # TODO?: package litehtml, but support for latest releases seem - # to lag behind and bundled may work out better for now - # https://bugreports.qt.io/browse/QTCREATORBUG-29169 - $(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes) - - -DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal) - - -DENABLE_SVG_SUPPORT=$(usex svg) - - -DWITH_QMLDESIGNER=$(usex qmldesigner) - - -Djournald=no # not really useful unless match qtbase (needs systemd) - - # not packaged, but allow using if found - #-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes - #-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes - ) - - cmake_src_configure -} - -src_test() { - local -x QT_QPA_PLATFORM=offscreen - - local CMAKE_SKIP_TESTS=( - # skipping same tests+label as upstream's CI by default - # `grep ctest .github/workflows/build_cmake.yml` - tst_perfdata - ) - - cmake_src_test --label-exclude exclude_from_precheck -} - -src_compile() { - cmake_src_compile - - use doc && cmake_build {qch,html}_docs -} - -src_install() { - cmake_src_install - - if use doc; then - dodoc -r "${BUILD_DIR}"/doc/html - dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch - docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch - fi - - local DISABLE_AUTOFORMATTING=yes - local DOC_CONTENTS="\ -Some plugins (if used) may need optional extra dependencies/USE. - -This list provides associations with Gentoo's packages (if exists) -ordered as in Qt Creator's Help -> About Plugins (not exhaustive). - -dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or -else the example tab will be empty alongside missing documentation. - -Build Systems: -- CMakeProjectManager (dev-util/cmake) -- MesonProjectManager (dev-util/meson) -- QbsProjectManager (dev-util/qbs) - -C++: -- Beautifier (dev-util/astyle and/or dev-util/uncrustify) -- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics) -- ClangFormat (USE=clang) - -Code Analyzer: -- ClangTools (USE=clang) -- Cppcheck (dev-util/cppcheck) -- CtfVisualizer (USE=tracing) -- PerfProfiler (USE=tracing) -- Valgrind (dev-util/valgrind) - -Core: -- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\") - -Device Support: -- Android (virtual/jdk, will also want the unpackaged Qt for Android) - -Other Languages: -- Nim (dev-lang/nim) -- Python (dev-lang/python) - -Qt Creator: -- Designer (USE=designer) - -Qt Quick: -- Insight (USE=qmldesigner) -- QmlDesigner (USE=qmldesigner) -- QmlProfiler (USE=tracing) - -Utilities: -- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used) -- Conan (dev-util/conan) -- Docker (app-containers/docker) -- Haskell (dev-lang/ghc) -- ScreenRecorder (media-video/ffmpeg) -- SerialTerminal (USE=serialterminal) -- SilverSearcher (sys-apps/the_silver_searcher) -- StudioWelcome (USE=qmldesigner) - -Version Control: -- CVS (dev-vcs/cvs) -- Fossil (dev-vcs/fossil) -- Git (dev-vcs/git) -- Mercurial (dev-vcs/mercurial) -- Subversion (dev-vcs/subversion)" - readme.gentoo_create_doc -} - -pkg_postinst() { - xdg_pkg_postinst - readme.gentoo_print_elog -} diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 138ebf19947f..9556e1286f10 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -5,8 +5,7 @@ AUX qtbase-6.6.1-CVE-2023-51714.patch 2168 BLAKE2B dd30b68aea17c3a2d4d57327226cb AUX qtbase-6.6.1-forkfd-childstack-size.patch 861 BLAKE2B c5b1f471cf91150b6d6a643994284e95721f0739284680ba3e2d5d2332b3e0544c85f6dfb7129fccc3ed3beae24d7d3c919357d160bc9d5004426c68e8fa6321 SHA512 8c619b24cd9b7dd72ee975a66d6919718a0594eaeb0907454a9a9fd68a259db345f685aa9c87cf0c0c27b4194f621306a6f00f20dce95482bce7efe55fae00d6 DIST qtbase-6.6.1-QTBUG-116905.patch.xz 7132 BLAKE2B 5ad6108f3d278c7014a124733a7e0151d79ab9b82256948c09f2d7d93494020131ec52bae0a0c9ae1959afe724bc033805b28f12676b018dce7d04668d8dec01 SHA512 61c13a96b19bd9c06056681101c2c9d301a5d014c4a155b82ba9b7bce2ba0e715041cd6c3e8e45c9ec3d52c3b77bcf3145fbbf502a72ffbaac02f4eb6b82c912 DIST qtbase-everywhere-src-6.6.1.tar.xz 48370760 BLAKE2B 2dd551d15eef30c7d9a5f4c406143d6f8908d7ebade9daf9fbd3d82a25765425956f2cb8689c50f87f6477de2150eee7b820ef25bb4355c51e7e7fad3ef73005 SHA512 93e77b9b077a3acd5607b643db282fdd7ed0bdfa07df74c3f0d2285afeb1672a6fa229a7e7a6c8a462701305fc22ffef20c212d906484e50fb5cdb706a7b72e1 -EBUILD qtbase-6.6.1-r1.ebuild 9827 BLAKE2B 35113f1f790be17a68775902d954aba7518ac4e4eefe6dde2b4ceb0f567bc947590efdf12ff2dd625fcabf56db8000c3e8c06d915b3b00eecf7c2a3e1d8ca7a3 SHA512 0077d3813ae8b86aa09dc2999efd7fd5a4146de21c268af94c26f8d7ee6992f6f2274725c4942a42deae1119f4fb1e3afced1d82dfb215a0c624d96de3dbd4c4 -EBUILD qtbase-6.6.1-r3.ebuild 10060 BLAKE2B ba140f257789dfc9617594a4072f9e760258c8516184843f09a1193eabef12fad206c5a92dc334e63b67383b4c6cfb5c049b0e96387505054f67f6e34dbe4cb6 SHA512 bf3a41afb1c7c6203187428ecfa0263be251c26b049ee9feff3e6eb9799729f26d5ad599db86cb3294c0dc718f002720e441c4a0d48f5f6d73b151a3eb467024 +EBUILD qtbase-6.6.1-r3.ebuild 10059 BLAKE2B 2965044f7fe417437202f37c4b004ef01569e675a429c68ba9d7c59ef0c12ae1e41433580b1eb15ec6ab41b8d0bf5f9a2ec8a607409f9c4c18794b509d16d1ed SHA512 bb5e11a91e7bb73a1e5bec93c1753eb851b99862daad6ef499393e0ac8bab156e80ce13e9a5e6bf8c651d0371c8f715ff672c5386cc309472913bfe1f36ce34d EBUILD qtbase-6.6.9999.ebuild 9876 BLAKE2B a3db7fca81b9d8c2aae0b13c8d2c8a6992ba8c578cb22bd083b81157d3377b280f5940acb6a90d380075e86cee1c29817a1176903cc6104a975fa166d70914b4 SHA512 985331ff6fc5485f820008797eda3d7fc5c891801306c4a0c3479dfb9ba6ce4df919e416da053ed05f025bbdb4e9eaf7ce4b456d5fbbf8be7a740e0993032535 EBUILD qtbase-6.7.9999.ebuild 9967 BLAKE2B 92be7de80b4e31a948b3f8ceadfe591beeb006e7e2746761f7829c62095d6379765d6cacd3c73f3d844d841ca31fd5e41a77a177127ed57ff29c24a9efb785c7 SHA512 61e74b2f10995d2706f77c099aca4053ca7060ab81610292b540d83c2ba5447bd75cdc8e1cb6e725ecc59fc6c3950a27aefc524ede061bc4ccb011dd214b887d EBUILD qtbase-6.9999.ebuild 9967 BLAKE2B 92be7de80b4e31a948b3f8ceadfe591beeb006e7e2746761f7829c62095d6379765d6cacd3c73f3d844d841ca31fd5e41a77a177127ed57ff29c24a9efb785c7 SHA512 61e74b2f10995d2706f77c099aca4053ca7060ab81610292b540d83c2ba5447bd75cdc8e1cb6e725ecc59fc6c3950a27aefc524ede061bc4ccb011dd214b887d diff --git a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild deleted file mode 100644 index e6a2b849eb51..000000000000 --- a/dev-qt/qtbase/qtbase-6.6.1-r1.ebuild +++ /dev/null @@ -1,361 +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 ~ppc ~ppc64 ~riscv ~sparc ~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) - # 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 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 on BE arches (bug #914033,914371,918878) - tst_qimagereader - tst_qimagewriter - tst_qpluginloader - tst_quuid - # 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_qprocess - tst_qtconcurrentiteratekernel - ') - # note: for linux, upstream only really runs+maintains tests for amd64 - # https://doc.qt.io/qt-6/supported-platforms.html - ) - - qt6-build_src_test -} - -src_install() { - qt6-build_src_install - - if use test; then - local delete_bins=( # need a better way to handle this - clientserver copier crashingServer desktopsettingsaware_helper - echo fileWriterProcess modal_helper nospace 'one space' - paster qcommandlineparser_test_helper qfileopeneventexternal - socketprocess syslocaleapp tst_qhashseed_helper 'two space s' - write-read-write - ) - local delete=( # sigh - "${D}${QT6_BINDIR}"/test* - "${delete_bins[@]/#/${D}${QT6_BINDIR}/}" - ) - # using -f given not tracking which tests may be skipped or not - rm -rf -- "${delete[@]}" || die - fi -} diff --git a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild index 4ff680df2dbf..838a64070d8f 100644 --- a/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild +++ b/dev-qt/qtbase/qtbase-6.6.1-r3.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Cross-platform application development framework" SRC_URI+=" https://dev.gentoo.org/~ionen/distfiles/${P}-QTBUG-116905.patch.xz" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi declare -A QT6_IUSE=( diff --git a/dev-qt/qthttpserver/Manifest b/dev-qt/qthttpserver/Manifest index b86e5a0adb87..52ae71e6fa39 100644 --- a/dev-qt/qthttpserver/Manifest +++ b/dev-qt/qthttpserver/Manifest @@ -1,5 +1,5 @@ DIST qthttpserver-everywhere-src-6.6.1.tar.xz 171104 BLAKE2B 76a26b59147656cd2463f420417a8f40b24b7749ed35c266fecd4e13c51f1351497df2a73dc71122f001254dd8841e0e99ec51c51da6616d556d5a7939b6c84d SHA512 f851c8f5ea9cd4067474dee30ca797a2acb70ecaab2d993afe6abba3622fe3139acc6245b78f7d12b7e5dca5fc90aabd5144a3429c58a5f13cf23c6fbb023c24 -EBUILD qthttpserver-6.6.1.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da +EBUILD qthttpserver-6.6.1.ebuild 574 BLAKE2B 6cf58709afc0e04b157dab96c0c48f00e613eb751e50a741752b97cf6a934f99556f3c580645eb40431915d9376eaba9f3d47be99c962b7f11051ac84ff331cb SHA512 e06111695c353ee1b2991d4f0c492b1e504a29802b7177d3046690825e3b7f0a6c8e632b7eba3e100c47a6a5178826cc202ea3c0cd382c59dadbb4d530d5c4be EBUILD qthttpserver-6.6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da EBUILD qthttpserver-6.7.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da EBUILD qthttpserver-6.9999.ebuild 570 BLAKE2B 0d650d9a207c6c601dad662e173f099ca29a4b1e67c909d23617c06546849d951651489034b908182fb95a21c3299361517433f25f5aadf4cfcae56eec99b9ff SHA512 65867d14d6a7c004ce0d162af91c940bffd07c5c0eee76719e93960860fb24e3691e76740a606e68a7261d41684a8269d0330d88d33a13871fc69ee81bd2f6da diff --git a/dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild b/dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild index 49febbf2b658..a4b020165245 100644 --- a/dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild +++ b/dev-qt/qthttpserver/qthttpserver-6.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,7 +8,7 @@ inherit qt6-build DESCRIPTION="HTTP server functionality for the Qt6 framework" if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" + KEYWORDS="amd64" fi IUSE="+ssl websockets" diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 50af8dcda7a1..b338e924214e 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -13,8 +13,8 @@ DIST qtwebengine-6.7-patchset-2.tar.xz 8252 BLAKE2B 00e0c6b6ea596dc314c5897012e8 DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0 EBUILD qtwebengine-5.15.11_p20231120.ebuild 8990 BLAKE2B 656f598967556321a32e1cc0d83cc0e0013563d15e140171074f760792fa2852dfb304928e0a4c93fac1798afa757853b4ba6d0fe77a43ccf14bf8d620032736 SHA512 9096c5c67fe5e7a689dbd802ff2b8874ca1bab3dbea4b759cb8887f5be0592a2bdd4c7d62e84210356f0f3d6b1aff77d5e7b7da9cc977eb76abee6c12ee6f91a EBUILD qtwebengine-5.15.12_p20231219.ebuild 8871 BLAKE2B da155bcc6d59fb2ffe0343aa7e5cb9af2c62c359ba2adc5d7df68fe4685ab0d7567e50305d0c70a85a17cf66ca374e2bae0b4d4cf561528dcd14c4e8bfc62be4 SHA512 de3b1b14f527a43fb8559ab715226855afa5605aaef2ca2135fd8648b8c11efee1fd741094ba11927851e0c11193889d76a758501bff27db7004f72d2d1d7326 -EBUILD qtwebengine-6.6.1.ebuild 9029 BLAKE2B 839d4254221dc5b1a9772962fe08e00d9db1ca3511a2e9d4f3b4a0f928231af28ad2d384639274eb8170e1658905179a25e8afdb804f90b1351c5d3763468517 SHA512 cab88e39ad7d91f164f76e7e98b92b1c7c0954ad7f264a472f95325d4520951b6648a38c1996b71f45d36324bf34554976c10b3dcb136810d66a7b4be1c14b3f -EBUILD qtwebengine-6.6.9999.ebuild 9023 BLAKE2B e83842eb8f8934cc08e75b233331141923b0045fb50b416f6340d871b30d224af788f052d257e5429496535554c628a5145c34d460adf996d48b01c03284d804 SHA512 23417648d9a698f6a3b4f6a24342eaf57afd02ac26b4a775bc1d6fbc82e082c46accc62c9e4bd35fc71f24a613c0a262d599fccaaf27108989f823aef443d640 -EBUILD qtwebengine-6.7.9999.ebuild 9027 BLAKE2B 776ec4cd229dab4b60c18d173c8d00945bb16bb493a689a92e467e55c1a196c15aa0e3e1e03e7a47c0a9fa7245178786729852a53fb7b2fa02e9049850be205d SHA512 d3c56d8dd31e863ada4d59d9a1a280529b8b9a4d3c95f419dd717aefd0e8db18c7544860a8dea78a64a1a25be79de15c7f8c6a353b262f8f25e08ea14f8fb6f6 -EBUILD qtwebengine-6.9999.ebuild 9027 BLAKE2B 776ec4cd229dab4b60c18d173c8d00945bb16bb493a689a92e467e55c1a196c15aa0e3e1e03e7a47c0a9fa7245178786729852a53fb7b2fa02e9049850be205d SHA512 d3c56d8dd31e863ada4d59d9a1a280529b8b9a4d3c95f419dd717aefd0e8db18c7544860a8dea78a64a1a25be79de15c7f8c6a353b262f8f25e08ea14f8fb6f6 +EBUILD qtwebengine-6.6.1.ebuild 9228 BLAKE2B 139941a265981842ab78f95410dcbb02ff393609dc1188c390fa75c2f82791f00283ac4a7cec36f93b458c5c35508f774f28a6af33fbd94d30256e821dd2d892 SHA512 c5a0b5adfce8590599af31a598120d9a0e31ad34d8e2065f412552b256401442a8db308f2eac3e7683b19eb25f14e65289be401b9d4928978833870bbf7edfa1 +EBUILD qtwebengine-6.6.9999.ebuild 9222 BLAKE2B b1defad9e69cb715d0eae9a0106253f8d30da2c421b311ba105eba9de2a1ebdf65c0070e555b2d2540b2b4a7b10a2f7a18ec3d8b680832b11597c9b24714511c SHA512 91153cb177bb1d53f446f947ff3dce4325573304a748fa23402312b3bd347444fb83ecbb60ccbfd87161c9d48eed65104d474964e7a42c8ca517af1cd095e065 +EBUILD qtwebengine-6.7.9999.ebuild 9226 BLAKE2B 0edb518893bf9e92e7099588c4fc098fe1a3e0bd94a7019705e7b87d92383ab39c4af873a642f515a8719d16c992b0c5b28921f19d55e586885e5d06c8c97be8 SHA512 83a058151b94aa0ebc4e0e37a9bd47727ea6451c1f3d20cafbf8ab3cabafd999b1865adb10e7cb4b801e7f66d2d6a41130f70fb11e2e41a068392a5d76fed921 +EBUILD qtwebengine-6.9999.ebuild 9226 BLAKE2B 0edb518893bf9e92e7099588c4fc098fe1a3e0bd94a7019705e7b87d92383ab39c4af873a642f515a8719d16c992b0c5b28921f19d55e586885e5d06c8c97be8 SHA512 83a058151b94aa0ebc4e0e37a9bd47727ea6451c1f3d20cafbf8ab3cabafd999b1865adb10e7cb4b801e7f66d2d6a41130f70fb11e2e41a068392a5d76fed921 MISC metadata.xml 1312 BLAKE2B 4473aad7240926735bbabbeaeff862f3bc253c3e79e09086c17fb9b603ba5e9dc25ecbbc423a60a344bf471e11634c9b4728222e66f3d19022e3f3d2c9cc2f60 SHA512 797e67cf05a37dcb5ad5712cabef051b4a8f5dcb9601b627bcf029e4c99d0a09fa62b03cb9dcb64b5b6e5f29104e72711136d4c9aa79928c34f6bfe212742e2d diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild index 7557170168d7..52405bc44e44 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild @@ -281,6 +281,13 @@ src_test() { 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/" +} + pkg_postinst() { # plugin may also be found in $HOME if provided by chrome or firefox use amd64 && diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild index 46450368b95d..a2fb38c98575 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild @@ -281,6 +281,13 @@ src_test() { 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/" +} + pkg_postinst() { # plugin may also be found in $HOME if provided by chrome or firefox use amd64 && diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild index c5e7a9912cc0..e7cca530e966 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild @@ -281,6 +281,13 @@ src_test() { 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/" +} + pkg_postinst() { # plugin may also be found in $HOME if provided by chrome or firefox use amd64 && diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild index c5e7a9912cc0..e7cca530e966 100644 --- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild @@ -281,6 +281,13 @@ src_test() { 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/" +} + pkg_postinst() { # plugin may also be found in $HOME if provided by chrome or firefox use amd64 && -- cgit v1.2.3