From 115dcc7054f5934a2c8e26fd8a8eed5f3e29e9ce Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 28 Mar 2023 09:49:11 +0100 Subject: gentoo auto-resync : 28:03:2023 - 09:49:10 --- dev-qt/qtbase/Manifest | 3 - dev-qt/qtbase/files/qtbase-6-march.patch | 46 -------- dev-qt/qtbase/qtbase-6.4.2.ebuild | 189 ------------------------------- 3 files changed, 238 deletions(-) delete mode 100644 dev-qt/qtbase/files/qtbase-6-march.patch delete mode 100644 dev-qt/qtbase/qtbase-6.4.2.ebuild (limited to 'dev-qt/qtbase') diff --git a/dev-qt/qtbase/Manifest b/dev-qt/qtbase/Manifest index 31d8e3088d52..b3931ad64d02 100644 --- a/dev-qt/qtbase/Manifest +++ b/dev-qt/qtbase/Manifest @@ -1,6 +1,3 @@ -AUX qtbase-6-march.patch 1985 BLAKE2B 0ef98173d63ad882489ed37256971a4213807c88d8863f37593e73451d258d23c491ffcb59d068f3843b358cca3cdc803c9813c774df4f9b63fe1e76d6db8d53 SHA512 11137df13f9145fed72a4d157ef7fd9d9db15650c6519695743756c24605f3a32279fba0621165ec78f5b3349a5481e9ba723973f5c03545d3b37bc0c84bc78f -DIST qtbase-everywhere-src-6.4.2.tar.xz 47987188 BLAKE2B 5d25d8b912ba775faa5855ad4326cbd19580cc7f98b997a9bbdb4a2216550a60b2c8a7a2ef1741a5dfd66ebde0d1cf5d0394215474c39c7779648b03c3892812 SHA512 b00cce7bfc29d3a34c9a2f08db147c4bfd962e178916d60033e1845b25eaeaa4fbd42f5c1d7e39453ddb412a4e91c22c8eae52745eda8a47e35a691054d5496e DIST qtbase-everywhere-src-6.4.3.tar.xz 48078536 BLAKE2B 36d693535479677ca319485634c3eea9dc3c8e8870c8e3cab7693cab601f26c6f792ec056b66488db290defc771b65cdffdea16b420a24ea55e5c4f250119a70 SHA512 a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43 -EBUILD qtbase-6.4.2.ebuild 4969 BLAKE2B f60db5e9adf74a653734311049ac38e1cf057033c5e9113afc2352a000cac177375e9f216fcb037ec3271e15d061d4990c406cbfd12553e5693c3deedef19efb SHA512 1c8de19016f36bb0fd41b32dff570ec13c8efccf48ef207f74b53cafabf167355758b27f70d3e306988f0ef5c233c1ea619ee6862f2d39cc87f7441e7a699a88 EBUILD qtbase-6.4.3.ebuild 4902 BLAKE2B 748a446df419923ce9ed5c0efcc5546ef7d6353dbc06d4f458c36eca68d4f87d30a2686c9d1debaa97d3cd931878e06ba5175462f1b3c503c98b364c1779d84f SHA512 dca6f7eb38366deb28c5ce79a5d5555974c05edaedf422cc9b8e3ccffc1cde7e653c01b0fe03b5f568fb8519c824c1d49e0b48d3270fa3f816ec286cda98b3f8 MISC metadata.xml 1817 BLAKE2B 8f5b89970837847b5a81326445309f706316943d65ab909c0f0407e95dd5770d9d02a16ad1380a8b1eaee3d251bdc79fba4fee49be688f6db84c1c598de959e0 SHA512 1e650288d6f9e53560163e911ac9f80017e35eaed6b77031f66996e7f7bc3811735e5d9fccd6cddead4c5aaa88ccc032277bb4db45df227ca3a34a643d41c918 diff --git a/dev-qt/qtbase/files/qtbase-6-march.patch b/dev-qt/qtbase/files/qtbase-6-march.patch deleted file mode 100644 index 2c5cb0a010cb..000000000000 --- a/dev-qt/qtbase/files/qtbase-6-march.patch +++ /dev/null @@ -1,46 +0,0 @@ -https://bugreports.qt.io/browse/QTBUG-111698 -https://bugs.gentoo.org/898644 - -From 5fe96c901cd1ecd3e53acedeb97efd38b6af49a4 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Wed, 1 Mar 2023 21:31:22 -0500 -Subject: [PATCH] Don't error on partial support for x86-64 v3/v4 - -Bug: https://bugs.gentoo.org/898644 ---- - src/corelib/global/qsimd_p.h | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/src/corelib/global/qsimd_p.h b/src/corelib/global/qsimd_p.h -index 1d12902a0a..1449d75d5c 100644 ---- a/src/corelib/global/qsimd_p.h -+++ b/src/corelib/global/qsimd_p.h -@@ -227,11 +227,7 @@ asm( - // macOS's fat binaries support the "x86_64h" sub-architecture and the GNU libc - // ELF loader also supports a "haswell/" subdir (e.g., /usr/lib/haswell). - # define ARCH_HASWELL_MACROS (__AVX2__ + __BMI2__ + __FMA__ + __LZCNT__) --# if ARCH_HASWELL_MACROS != 0 --# if ARCH_HASWELL_MACROS != 4 --# error "Please enable all x86-64-v3 extensions; you probably want to use -march=haswell or -march=x86-64-v3 instead of -mavx2" --# endif --static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which features are missing."); -+# if ARCH_HASWELL_MACROS == 4 - # define __haswell__ 1 - # endif - # undef ARCH_HASWELL_MACROS -@@ -243,11 +239,7 @@ static_assert(ARCH_HASWELL_MACROS, "Undeclared identifiers indicate which featur - // with AVX512 support and it includes all of these too. - // - # define ARCH_SKX_MACROS (__AVX512F__ + __AVX512BW__ + __AVX512CD__ + __AVX512DQ__ + __AVX512VL__) --# if ARCH_SKX_MACROS != 0 --# if ARCH_SKX_MACROS != 5 --# error "Please enable all x86-64-v4 extensions; you probably want to use -march=skylake-avx512 or -march=x86-64-v4 instead of -mavx512f" --# endif --static_assert(ARCH_SKX_MACROS, "Undeclared identifiers indicate which features are missing."); -+# if ARCH_SKX_MACROS == 5 - # define __skylake_avx512__ 1 - # endif - # undef ARCH_SKX_MACROS --- -2.39.2 - diff --git a/dev-qt/qtbase/qtbase-6.4.2.ebuild b/dev-qt/qtbase/qtbase-6.4.2.ebuild deleted file mode 100644 index c6545a5f1a0c..000000000000 --- a/dev-qt/qtbase/qtbase-6.4.2.ebuild +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 2021-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit qt6-build - -DESCRIPTION="Cross-platform application development framework" - -if [[ ${QT6_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64" -fi - -# Qt Modules -IUSE="+concurrent +dbus +gui +network +sql opengl +widgets +xml zstd" -REQUIRED_USE=" - opengl? ( gui ) - widgets? ( gui ) - X? ( || ( evdev libinput ) ) -" - -QTGUI_IUSE="accessibility egl eglfs evdev gles2-only +jpeg +libinput tslib tuio vulkan +X" -QTNETWORK_IUSE="brotli gssapi libproxy sctp +ssl vnc" -QTSQL_IUSE="freetds mysql oci8 odbc postgres +sqlite" -IUSE+=" ${QTGUI_IUSE} ${QTNETWORK_IUSE} ${QTSQL_IUSE} cups gtk icu systemd +udev" -# QtPrintSupport = QtGui + QtWidgets enabled. -# ibus = xkbcommon + dbus, and xkbcommon needs either libinput or X -REQUIRED_USE+=" - $(printf '%s? ( gui ) ' ${QTGUI_IUSE//+/}) - $(printf '%s? ( network ) ' ${QTNETWORK_IUSE//+/}) - $(printf '%s? ( sql ) ' ${QTSQL_IUSE//+/}) - accessibility? ( dbus X ) - cups? ( gui widgets ) - eglfs? ( egl ) - gtk? ( widgets ) - gui? ( || ( eglfs X ) || ( libinput X ) ) - libinput? ( udev ) - sql? ( || ( freetds mysql oci8 odbc postgres sqlite ) ) - vnc? ( gui ) - X? ( gles2-only? ( egl ) ) -" - -# TODO: -# qtimageformats: mng not done yet, qtimageformats.git upstream commit 9443239c -# qtnetwork: connman, networkmanager -DEPEND=" - app-crypt/libb2 - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/libpcre2:=[pcre16,unicode] - dev-util/gtk-update-icon-cache - media-libs/fontconfig - >=media-libs/freetype-2.6.1:2 - >=media-libs/harfbuzz-1.6.0:= - media-libs/tiff:= - >=sys-apps/dbus-1.4.20 - sys-libs/zlib:= - brotli? ( app-arch/brotli:= ) - evdev? ( sys-libs/mtdev ) - freetds? ( dev-db/freetds ) - gles2-only? ( media-libs/libglvnd ) - !gles2-only? ( media-libs/libglvnd[X] ) - gssapi? ( virtual/krb5 ) - gtk? ( - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) - gui? ( media-libs/libpng:= ) - icu? ( dev-libs/icu:= ) - !icu? ( virtual/libiconv ) - jpeg? ( media-libs/libjpeg-turbo:= ) - libinput? ( - dev-libs/libinput:= - >=x11-libs/libxkbcommon-0.5.0 - ) - libproxy? ( net-libs/libproxy ) - mysql? ( dev-db/mysql-connector-c:= ) - oci8? ( dev-db/oracle-instantclient:=[sdk] ) - odbc? ( dev-db/unixODBC ) - postgres? ( dev-db/postgresql:* ) - sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( dev-libs/openssl:= ) - systemd? ( sys-apps/systemd:= ) - tslib? ( >=x11-libs/tslib-1.21 ) - udev? ( virtual/libudev:= ) - vulkan? ( dev-util/vulkan-headers ) - X? ( - x11-libs/libdrm - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - >=x11-libs/libxcb-1.12:= - >=x11-libs/libxkbcommon-0.5.0[X] - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-renderutil - x11-libs/xcb-util-wm - ) - zstd? ( app-arch/zstd:= ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/qtbase-6-march.patch" -) - -src_configure() { - local mycmakeargs=( - -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_ARCHDATADIR}/mkspecs - -DINSTALL_PLUGINSDIR=${QT6_PLUGINDIR} - -DINSTALL_QMLDIR=${QT6_QMLDIR} - -DINSTALL_SYSCONFDIR=${QT6_SYSCONFDIR} - -DINSTALL_TRANSLATIONSDIR=${QT6_TRANSLATIONDIR} - -DQT_FEATURE_androiddeployqt=OFF - $(qt_feature concurrent) - $(qt_feature dbus) - $(qt_feature gui) - $(qt_feature gui testlib) - $(qt_feature icu) - $(qt_feature network) - $(qt_feature sql) - $(qt_feature systemd journald) - $(qt_feature udev libudev) - $(qt_feature xml) - $(qt_feature zstd) - ) - use gui && mycmakeargs+=( - $(qt_feature accessibility accessibility_atspi_bridge) - $(qt_feature egl) - $(qt_feature eglfs eglfs_egldevice) - $(qt_feature eglfs eglfs_gbm) - $(qt_feature evdev) - $(qt_feature evdev mtdev) - -DQT_FEATURE_gif=ON - $(qt_feature jpeg) - $(qt_feature opengl) - $(qt_feature gles2-only opengles2) - $(qt_feature libinput) - $(qt_feature tslib) - $(qt_feature tuio tuiotouch) - $(qt_feature vulkan) - $(qt_feature widgets) - $(qt_feature X xcb) - $(qt_feature X xcb_xlib) - ) - use widgets && mycmakeargs+=( - $(qt_feature cups) - $(qt_feature gtk gtk3) - ) - if use libinput || use X; then - mycmakeargs+=( -DQT_FEATURE_xkbcommon=ON ) - fi - use network && mycmakeargs+=( - $(qt_feature brotli) - $(qt_feature gssapi) - $(qt_feature libproxy) - $(qt_feature sctp) - $(qt_feature ssl openssl) - $(qt_feature vnc) - ) - use sql && mycmakeargs+=( - $(qt_feature freetds sql_tds) - $(qt_feature mysql sql_mysql) - $(qt_feature oci8 sql_oci) - $(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_install() { - qt6-build_src_install - - # https://bugs.gentoo.org/863395 - dosym ../$(get_libdir)/qt6/bin/qmake /usr/bin/qmake6 -} -- cgit v1.2.3