diff options
Diffstat (limited to 'dev-qt')
27 files changed, 107 insertions, 3 deletions
diff --git a/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch b/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch new file mode 100644 index 000000000000..7c27730574b6 --- /dev/null +++ b/dev-qt/qtbluetooth/files/qtbluetooth-5.15.2-gcc11.patch @@ -0,0 +1,19 @@ +From 0ae88b90f857bfcc2d0ea33d16753d8eed5db9e1 Mon Sep 17 00:00:00 2001 +From: Jeff Law <law@redhat.com> +Date: Oct 16 2020 20:08:46 +0000 +Subject: Add missing #include for gcc-11 + + +diff --git a/src/bluetooth/lecmaccalculator.cpp b/src/bluetooth/lecmaccalculator.cpp +index b150466..507603c 100644 +--- a/src/bluetooth/lecmaccalculator.cpp ++++ b/src/bluetooth/lecmaccalculator.cpp +@@ -38,6 +38,8 @@ + ****************************************************************************/ + #include "lecmaccalculator_p.h" + ++#include <limits> ++ + #include "bluez/bluez_data_p.h" + + #include <QtCore/qbytearray.h> diff --git a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild b/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild index 86342f95e592..f4571c977b8d 100644 --- a/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild +++ b/dev-qt/qtbluetooth/qtbluetooth-5.15.2.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtconnectivity" inherit qt5-build @@ -24,6 +25,8 @@ DEPEND="${RDEPEND} ~dev-qt/qtnetwork-${PV} " +PATCHES=( "${FILESDIR}/${P}-gcc11.patch" ) # bug 752012 + src_prepare() { sed -i -e 's/nfc//' src/src.pro || die diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtconcurrent/Manifest +++ b/dev-qt/qtconcurrent/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild index bdaa4c333573..d5caa7070696 100644 --- a/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild +++ b/dev-qt/qtconcurrent/qtconcurrent-5.15.2.ebuild @@ -2,10 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -21,3 +23,5 @@ RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/concurrent ) + +PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012 diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtcore/Manifest +++ b/dev-qt/qtcore/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild index 7344af87a4cb..e3a3aa50ca15 100644 --- a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild +++ b/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild @@ -7,6 +7,8 @@ QT5_MODULE="qtbase" inherit linux-info qt5-build DESCRIPTION="Cross-platform application development framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" + SLOT=5/$(ver_cut 1-3) if [[ ${QT5_BUILD_TYPE} == release ]]; then @@ -50,6 +52,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.15.1-timezone-{1,2}.patch # bug 737914 "${FILESDIR}"/${P}-fix-UB-in-QDateTime.patch # QTBUG-88656 "${FILESDIR}"/${P}-fix-alloc-mem-of-QByteArray.patch # QTBUG-87010 + "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 ) pkg_pretend() { diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtdbus/Manifest +++ b/dev-qt/qtdbus/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild b/dev-qt/qtdbus/qtdbus-5.15.2.ebuild index 8977561146a3..c86dfe3f7201 100644 --- a/dev-qt/qtdbus/qtdbus-5.15.2.ebuild +++ b/dev-qt/qtdbus/qtdbus-5.15.2.ebuild @@ -2,10 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="Qt5 module for inter-process communication over the D-Bus protocol" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -37,6 +39,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :dbus-linked ) +PATCHES=( "${WORKDIR}"/qtbase-${PV}-gcc11.patch ) # bug 752012 + src_configure() { local myconf=( -dbus-linked diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch new file mode 100644 index 000000000000..c5dd916912d1 --- /dev/null +++ b/dev-qt/qtdeclarative/files/qtdeclarative-5.15.2-gcc11.patch @@ -0,0 +1,31 @@ +From 543594243ad0006bf4d98998ecfa52b46242f0ed Mon Sep 17 00:00:00 2001 +From: Jeff Law <law@redhat.com> +Date: Oct 16 2020 21:12:18 +0000 +Subject: Fix missing #include for gcc-11 + + +diff --git a/src/qml/jsruntime/qv4regexp.cpp b/src/qml/jsruntime/qv4regexp.cpp +index 76daead8..4f707703 100644 +--- a/src/qml/jsruntime/qv4regexp.cpp ++++ b/src/qml/jsruntime/qv4regexp.cpp +@@ -37,6 +37,7 @@ + ** + ****************************************************************************/ + ++#include <limits> + #include "qv4regexp_p.h" + #include "qv4engine_p.h" + #include "qv4scopedvalue_p.h" +diff --git a/src/qmldebug/qqmlprofilerevent_p.h b/src/qmldebug/qqmlprofilerevent_p.h +index a7e37d19..21c3b465 100644 +--- a/src/qmldebug/qqmlprofilerevent_p.h ++++ b/src/qmldebug/qqmlprofilerevent_p.h +@@ -40,6 +40,8 @@ + #ifndef QQMLPROFILEREVENT_P_H + #define QQMLPROFILEREVENT_P_H + ++#include <limits> ++ + #include "qqmlprofilerclientdefinitions_p.h" + + #include <QtCore/qstring.h> diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild index 9fc2ba097000..c325eb78600c 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.15.2.ebuild @@ -30,6 +30,7 @@ RDEPEND="${DEPEND} PATCHES=( "${FILESDIR}/${PN}-5.14.2-QQuickItemView-fix-maxXY-extent.patch" # QTBUG-83890 + "${FILESDIR}/${P}-gcc11.patch" # bug 752093 ) src_prepare() { diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtgui/Manifest +++ b/dev-qt/qtgui/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild b/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild index 359da8b9c378..720dcd1cbb3e 100644 --- a/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.2-r1.ebuild @@ -7,6 +7,8 @@ QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="The GUI module and platform plugins for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" + SLOT=5/$(ver_cut 1-3) # bug 707658 if [[ ${QT5_BUILD_TYPE} == release ]]; then @@ -14,7 +16,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then fi # TODO: linuxfb - IUSE="accessibility dbus egl eglfs evdev +gif gles2-only ibus jpeg +libinput +png tslib tuio +udev vnc vulkan wayland +X" REQUIRED_USE=" @@ -135,6 +136,7 @@ PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 "${FILESDIR}/${P}-bogus-xcb-util-dep.patch" # QTBUG-86287, QTBUG-88688 + "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 764038 ) src_prepare() { diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtnetwork/Manifest +++ b/dev-qt/qtnetwork/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild index 55fbc57eb16c..cc9144c0b3ff 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r1.ebuild @@ -7,6 +7,7 @@ QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="Network abstraction library for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -51,6 +52,7 @@ QT5_GENTOO_PRIVATE_CONFIG=( PATCHES=( "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063 "${FILESDIR}"/${PN}-5.15.2-libressl.patch # Bug 562050, not upstreamable + "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012 ) pkg_setup() { diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtopengl/Manifest +++ b/dev-qt/qtopengl/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtopengl/qtopengl-5.15.2.ebuild b/dev-qt/qtopengl/qtopengl-5.15.2.ebuild index c9a50e5247cd..bae6df383265 100644 --- a/dev-qt/qtopengl/qtopengl-5.15.2.ebuild +++ b/dev-qt/qtopengl/qtopengl-5.15.2.ebuild @@ -2,11 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" VIRTUALX_REQUIRED="test" inherit qt5-build DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -26,6 +28,8 @@ QT5_TARGET_SUBDIRS=( src/opengl ) +PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 + src_configure() { local myconf=( -opengl $(usex gles2-only es2 desktop) diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtprintsupport/Manifest +++ b/dev-qt/qtprintsupport/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild index 66b3dcfe6145..ff5a0074ff71 100644 --- a/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild +++ b/dev-qt/qtprintsupport/qtprintsupport-5.15.2.ebuild @@ -2,11 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" VIRTUALX_REQUIRED="test" inherit qt5-build DESCRIPTION="Printing support library for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -33,6 +35,8 @@ QT5_GENTOO_CONFIG=( cups ) +PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 + src_configure() { local myconf=( $(qt_use cups) diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtsql/Manifest +++ b/dev-qt/qtsql/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtsql/qtsql-5.15.2.ebuild b/dev-qt/qtsql/qtsql-5.15.2.ebuild index 97938c24fdbf..c48f5e3479d6 100644 --- a/dev-qt/qtsql/qtsql-5.15.2.ebuild +++ b/dev-qt/qtsql/qtsql-5.15.2.ebuild @@ -2,10 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="SQL abstraction library for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" + SLOT=5/$(ver_cut 1-3) # bug 639140 if [[ ${QT5_BUILD_TYPE} == release ]]; then @@ -38,6 +41,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :sql ) +PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 + src_configure() { local myconf=( $(qt_use freetds sql-tds plugin) diff --git a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild index b9c249781d39..d92dec7cb9c1 100644 --- a/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311.ebuild +++ b/dev-qt/qtstyleplugins/qtstyleplugins-5.0.0_p20170311-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ KEYWORDS="~amd64" DEPEND=" dev-qt/qtcore:5= - dev-qt/qtgui:5= + dev-qt/qtgui:5=[dbus] dev-qt/qtwidgets:5= x11-libs/gtk+:2 x11-libs/libX11 diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qttest/Manifest +++ b/dev-qt/qttest/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qttest/qttest-5.15.2.ebuild b/dev-qt/qttest/qttest-5.15.2.ebuild index be418ca46bcf..c6083dd1b8d3 100644 --- a/dev-qt/qttest/qttest-5.15.2.ebuild +++ b/dev-qt/qttest/qttest-5.15.2.ebuild @@ -2,11 +2,13 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" VIRTUALX_REQUIRED="test" inherit qt5-build DESCRIPTION="Unit testing library for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -31,3 +33,5 @@ QT5_TARGET_SUBDIRS=( QT5_GENTOO_PRIVATE_CONFIG=( :testlib ) + +PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtwidgets/Manifest +++ b/dev-qt/qtwidgets/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild index e0ac54d48404..ab3b436b6ecb 100644 --- a/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild +++ b/dev-qt/qtwidgets/qtwidgets-5.15.2.ebuild @@ -7,6 +7,7 @@ QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="Set of components for creating classic desktop-style UIs for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -45,6 +46,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :widgets ) +PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 + src_configure() { local myconf=( -opengl $(usex gles2-only es2 desktop) diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest index 8d47df5d648d..c298c0aa243b 100644 --- a/dev-qt/qtxml/Manifest +++ b/dev-qt/qtxml/Manifest @@ -1 +1,2 @@ +DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4 DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 diff --git a/dev-qt/qtxml/qtxml-5.15.2.ebuild b/dev-qt/qtxml/qtxml-5.15.2.ebuild index 57acaeaa59ae..140dd50a8a60 100644 --- a/dev-qt/qtxml/qtxml-5.15.2.ebuild +++ b/dev-qt/qtxml/qtxml-5.15.2.ebuild @@ -2,10 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + QT5_MODULE="qtbase" inherit qt5-build DESCRIPTION="Implementation of SAX and DOM for the Qt5 framework" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz" if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86" @@ -27,3 +29,5 @@ QT5_TARGET_SUBDIRS=( QT5_GENTOO_PRIVATE_CONFIG=( :xml ) + +PATCHES=( "${WORKDIR}/qtbase-${PV}-gcc11.patch" ) # bug 752012 |
