commit: a2fdcad4b4fc23f04d66584329d4cafdc04c9b30 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Wed Sep 25 22:41:58 2024 +0000 Commit: orbea <orbea <AT> riseup <DOT> net> CommitDate: Wed Sep 25 22:41:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=a2fdcad4
dev-qt/qtbase: add 6.7.2-r5 Signed-off-by: orbea <orbea <AT> riseup.net> .../files/qtbase-6.7.2-haswell-no-rdrnd.patch | 100 ++++++ .../files/qtbase-6.7.2-qcontiguouscache.patch | 13 +- .../files/qtbase-6.8.0-qcontiguouscache.patch | 14 + dev-qt/qtbase/qtbase-6.7.2-r5.ebuild | 371 +++++++++++++++++++++ 4 files changed, 490 insertions(+), 8 deletions(-) diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-haswell-no-rdrnd.patch b/dev-qt/qtbase/files/qtbase-6.7.2-haswell-no-rdrnd.patch new file mode 100644 index 0000000..0427315 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.7.2-haswell-no-rdrnd.patch @@ -0,0 +1,100 @@ +https://bugreports.qt.io/browse/QTBUG-129193 +https://forums.gentoo.org/viewtopic-t-1170690.html +https://forums.gentoo.org/viewtopic-t-1169619.html +https://codereview.qt-project.org/c/qt/qtbase/+/593073 +From: Thiago Macieira <[email protected]> +Date: Mon, 23 Sep 2024 13:44:31 -0700 +Subject: [PATCH] qsimd_x86: disable the requirement that CPUs must have RNGs + +Intel CPUs have had this since 2013 (Ivy Bridge), but some older +Bulldozer AMD CPUs appear to be missing it. This creates a mismatch +between when the __haswell__ macro gets declared in qsimd_p.h and the +runtime check using the CpuArchHaswell value. That in turn creates a +condition where qInitDrawhelperFunctions() in qdrawhelper.cpp leaves the +memfill pointers set to null. + +#elif defined(__SSE2__) +# ifndef __haswell__ + qt_memfill32 = qt_memfill32_sse2; + qt_memfill64 = qt_memfill64_sse2; +# endif +... +#if defined(QT_COMPILER_SUPPORTS_AVX2) + if (qCpuHasFeature(ArchHaswell)) { + qt_memfill32 = qt_memfill32_avx2; + qt_memfill64 = qt_memfill64_avx2; + +It does this so the qt_memfillXX_sse2 functions don't have to be defined +anywhere, so the QtGui build won't carry unnecessary dead code. + +This is old code (from Qt 4.x) and several improvements I've made for +QtCore are not applied yet. My work for qSimdDispatcher[1] isn't +complete: it might have avoided this problem here, but it would also +have required major work for the draw helpers to work in the first +place. + +[1] https://codereview.qt-project.org/c/qt/qtbase/+/537384 + +Pick-to: 6.8 6.7 6.5 6.2 +Fixes: QTBUG-129193 +Change-Id: Ia427a9e502b0fb46b2bdfffda8e2131b7091c9e9 +Reviewed-by: Allan Sandfeld Jensen <[email protected]> +--- a/src/corelib/global/qsimd_x86_p.h ++++ b/src/corelib/global/qsimd_x86_p.h +@@ -85,16 +85,14 @@ + #define cpu_snb (cpu_wsm \ + | cpu_feature_avx) + #define cpu_ivb (cpu_snb \ +- | cpu_feature_f16c \ +- | cpu_feature_rdrnd) ++ | cpu_feature_f16c) + #define cpu_hsw (cpu_ivb \ + | cpu_feature_avx2 \ + | cpu_feature_fma \ + | cpu_feature_bmi \ + | cpu_feature_bmi2 \ + | cpu_feature_movbe) +-#define cpu_bdw (cpu_hsw \ +- | cpu_feature_rdseed) ++#define cpu_bdw (cpu_hsw) + #define cpu_bdx (cpu_bdw) + #define cpu_skl (cpu_bdw) + #define cpu_skx (cpu_skl \ +@@ -237,9 +235,9 @@ + #define QT_FUNCTION_TARGET_STRING_ARCH_NHM QT_FUNCTION_TARGET_STRING_ARCH_CORE2 ",sse4.1,sse4.2,popcnt" + #define QT_FUNCTION_TARGET_STRING_ARCH_WSM QT_FUNCTION_TARGET_STRING_ARCH_NHM + #define QT_FUNCTION_TARGET_STRING_ARCH_SNB QT_FUNCTION_TARGET_STRING_ARCH_WSM ",avx" +-#define QT_FUNCTION_TARGET_STRING_ARCH_IVB QT_FUNCTION_TARGET_STRING_ARCH_SNB ",f16c,rdrnd,fsgsbase" ++#define QT_FUNCTION_TARGET_STRING_ARCH_IVB QT_FUNCTION_TARGET_STRING_ARCH_SNB ",f16c,fsgsbase" + #define QT_FUNCTION_TARGET_STRING_ARCH_HSW QT_FUNCTION_TARGET_STRING_ARCH_IVB ",avx2,fma,bmi,bmi2,lzcnt,movbe" +-#define QT_FUNCTION_TARGET_STRING_ARCH_BDW QT_FUNCTION_TARGET_STRING_ARCH_HSW ",adx,rdseed" ++#define QT_FUNCTION_TARGET_STRING_ARCH_BDW QT_FUNCTION_TARGET_STRING_ARCH_HSW ",adx" + #define QT_FUNCTION_TARGET_STRING_ARCH_BDX QT_FUNCTION_TARGET_STRING_ARCH_BDW + #define QT_FUNCTION_TARGET_STRING_ARCH_SKL QT_FUNCTION_TARGET_STRING_ARCH_BDW ",xsavec,xsaves" + #define QT_FUNCTION_TARGET_STRING_ARCH_SKX QT_FUNCTION_TARGET_STRING_ARCH_SKL ",avx512f,avx512dq,avx512cd,avx512bw,avx512vl" +@@ -473,9 +471,9 @@ + CpuArchNHM = cpu_nhm, + CpuArchWSM = cpu_wsm, + CpuArchSNB = cpu_snb, +- CpuArchIVB = cpu_ivb, ++ CpuArchIVB = cpu_ivb, ///< rdrnd + CpuArchHSW = cpu_hsw, ///< hle,rtm +- CpuArchBDW = cpu_bdw, ++ CpuArchBDW = cpu_bdw, ///< rdseed + CpuArchBDX = cpu_bdx, + CpuArchSKL = cpu_skl, + CpuArchSKX = cpu_skx, ///< clwb +--- a/util/x86simdgen/3rdparty/simd-intel.conf ++++ b/util/x86simdgen/3rdparty/simd-intel.conf +@@ -142,9 +142,9 @@ + arch=NHM Core2 sse4.1,sse4.2,popcnt + arch=WSM NHM + arch=SNB WSM avx +-arch=IVB SNB f16c,rdrnd,fsgsbase ++arch=IVB SNB f16c,fsgsbase # rdrnd + arch=HSW IVB avx2,fma,bmi,bmi2,lzcnt,movbe # hle,rtm +-arch=BDW HSW adx,rdseed ++arch=BDW HSW adx # rdseed + arch=BDX BDW + arch=SKL BDW xsavec,xsaves + arch=SKX SKL avx512f,avx512dq,avx512cd,avx512bw,avx512vl #clwb diff --git a/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch index d010222..02219fe 100644 --- a/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch +++ b/dev-qt/qtbase/files/qtbase-6.7.2-qcontiguouscache.patch @@ -1,11 +1,8 @@ -diff '--color=auto' -ruN qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h my/src/corelib/tools/qcontiguouscache.h ---- qtbase-everywhere-src-6.7.2/src/corelib/tools/qcontiguouscache.h 2024-05-07 01:06:44.000000000 +0200 -+++ my/src/corelib/tools/qcontiguouscache.h 2024-08-25 18:20:13.958793266 +0200 -@@ -8,6 +8,7 @@ - #include <QtCore/qassert.h> - #include <QtCore/qtclasshelpermacros.h> +https://bugs.gentoo.org/938475 +Older version of https://codereview.qt-project.org/c/qt/qtbase/+/585668 for 6.7 +--- a/src/corelib/tools/qcontiguouscache.h ++++ b/src/corelib/tools/qcontiguouscache.h +@@ -10,2 +10,3 @@ #include <QtCore/qtcoreexports.h> +#include <QtCore/qglobal.h> #include <QtCore/qtypeinfo.h> - - #include <climits> diff --git a/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch b/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch new file mode 100644 index 0000000..e5f14e0 --- /dev/null +++ b/dev-qt/qtbase/files/qtbase-6.8.0-qcontiguouscache.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/938475 +https://codereview.qt-project.org/c/qt/qtbase/+/585668 +From: Sam James <[email protected]> +Date: Sun, 25 Aug 2024 17:34:22 +0100 +Subject: [PATCH] QContiguousCache: fix include for qMin + +Include `<QtCore/qminmax.h>` for `qMin`. This came up downstream +in Gentoo at https://bugs.gentoo.org/938475. +--- a/src/corelib/tools/qcontiguouscache.h ++++ b/src/corelib/tools/qcontiguouscache.h +@@ -10,2 +10,3 @@ + #include <QtCore/qtcoreexports.h> ++#include <QtCore/qminmax.h> + #include <QtCore/qttypetraits.h> diff --git a/dev-qt/qtbase/qtbase-6.7.2-r5.ebuild b/dev-qt/qtbase/qtbase-6.7.2-r5.ebuild new file mode 100644 index 0000000..6b43077 --- /dev/null +++ b/dev-qt/qtbase/qtbase-6.7.2-r5.ebuild @@ -0,0 +1,371 @@ +# 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.6.0-libressl.patch + "${FILESDIR}"/${PN}-6.5.2-hppa-forkfd-grow-stack.patch + "${FILESDIR}"/${PN}-6.5.2-no-symlink-check.patch + "${FILESDIR}"/${PN}-6.6.1-forkfd-childstack-size.patch + "${FILESDIR}"/${PN}-6.6.3-gcc14-avx512fp16.patch + "${FILESDIR}"/${PN}-6.7.2-CVE-2024-39936.patch + "${FILESDIR}"/${PN}-6.7.2-gcc15-odr.patch + "${FILESDIR}"/${PN}-6.7.2-float16-sse2.patch + "${FILESDIR}"/${PN}-6.7.2-qwindowprivate-crash.patch + "${FILESDIR}"/${PN}-6.7.2-qcontiguouscache.patch + "${FILESDIR}"/${PN}-6.7.2-haswell-no-rdrnd.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() { + # The only component that uses gdk backends is the qgtk3 platformtheme plugin + if use gtk; then + # defang automagic dependencies + use wayland || append-cxxflags -DGENTOO_GTK_HIDE_WAYLAND + use X || append-cxxflags -DGENTOO_GTK_HIDE_X11 + 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) + -DQT_FEATURE_dtls=OFF # Required for LibreSSL + ) + + 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 +}
