commit: 599928def81f1bdf6a832e72950244e14f84cc8a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jun 14 11:52:55 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jun 14 18:21:17 2022 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=599928de
dev-qt/qtgui: Cleanup and make use of gentoo-patchset Ends the which-hunt. Bug: https://bugs.gentoo.org/828100 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtgui/Manifest | 1 + dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch | 29 ------------- .../qtgui-5.14.1-cmake-macro-backward-compat.patch | 50 ---------------------- dev-qt/qtgui/qtgui-5.15.4.9999.ebuild | 5 --- 4 files changed, 1 insertion(+), 84 deletions(-) diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest new file mode 100644 index 00000000..1e41118d --- /dev/null +++ b/dev-qt/qtgui/Manifest @@ -0,0 +1 @@ +DIST qtbase-5.15-gentoo-patchset-1.tar.xz 4204 BLAKE2B 1399eb6f4c776d370e1837351a72b604440658a3a2d1bd0c725b9ef149b09d236347f5f4b37f652c33310048a0a7df54e24453b404dc45507fd4f7c5fdf144cd SHA512 c857fc746bacb047321cdb762f3c7c48ce2a0d24045a9e708edd38532568dbbc74e9e971425a72a3c2a5ca0662b3e6333831f6c1b7746525b99d46000b63111f diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch deleted file mode 100644 index 41814c06..00000000 --- a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <flop...@gentoo.org> -Date: Fri, 1 Mar 2019 21:37:52 -0500 -Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2 - -Resolves a build failure when QMAKE_CXXFLAGS contains -march=native -and the compiler is running on a CPU which does not support AVX2. - -Bug: https://bugs.gentoo.org/672946 ---- - mkspecs/common/gcc-base.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf -index c2669e4833..44aa96af38 100644 ---- a/mkspecs/common/gcc-base.conf -+++ b/mkspecs/common/gcc-base.conf -@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp - QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2 - - # -march=haswell is supported as of GCC 4.9 and Clang 3.6 --QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2 -+QMAKE_CFLAGS_ARCH_HASWELL = -mavx2 - - # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code - QMAKE_AR_LTCG = gcc-ar cqs --- -2.21.0.rc1 - diff --git a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch b/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch deleted file mode 100644 index 30b5abc3..00000000 --- a/dev-qt/qtgui/files/qtgui-5.14.1-cmake-macro-backward-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -From: Andreas Sturmlechner <ast...@gentoo.org> -Date: Sun, 9 Feb 2020 11:45:00 +0100 -Subject: [PATCH] qtcore: Fix cmake macro compat. for upgrade from <Qt-5.14 - -In upstream commit: - -https://code.qt.io/cgit/qt/qtbase.git/commit/?h=5.14&id=63d9cd17 - -_populate_$${CMAKE_MODULE_NAME}_plugin_properties in 5.14.0 gained an additional argument -IsDebugAndRelease without providing backward compatibility. This macro is used (at least) for -QtGui and QtDesigner plugins added by qtimageformats, qtsvg, qtvirtualkeyboard and qtwayland. -During upgrade from <Qt-5.14 to >=Qt-5.14, as a consequence of slot upgrade rebuilds, some -reverse dependencies are slated for rebuild before these Qt consumers have been rebuilt and their -cmake files regenerated, leading to cmake errors like: - -https://bugs.gentoo.org/703306 -https://bugs.gentoo.org/705198 - -From mkspecs/features/create_cmake.prf: - -# CMAKE_DEBUG_AND_RELEASE is used to tell the _populate_$${CMAKE_MODULE_NAME}_target_properties -# functions whether a Configuration specific generator expression needs to be added to the values -# of INTERFACE_LINK_LIBRARIES and INTERFACE_LINK_OPTIONS. For debug_and_release builds, we do need -# configuration specific values. For singular builds (only release or only debug), we want the -# values to be applied regardless of the configuration. -# This would allow on Linux and macOS (and with a recent enough version of CMake on Windows) to -# build a Debug configuration of an application, even if Qt was built in a Release configuration. - -qt5-build.eclass is configuring either as 'release' or as 'debug', so we make IsDebugAndRelease -optional and default to FALSE. - ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-01-23 13:37:32.000000000 +0100 -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in 2020-02-09 15:15:21.156219814 +0100 -@@ -538,8 +538,14 @@ - - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - -- macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION -- IsDebugAndRelease) -+ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) -+ set(IsDebugAndRelease FALSE) -+ set (list_var ${ARGN}) -+ list(LENGTH list_var num_extra_arg) -+ if (${num_extra_arg} GREATER 0) -+ list(GET list_var 0 IsDebugAndRelease) -+ endif() -+ - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) diff --git a/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild b/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild index e595b832..9efb7138 100644 --- a/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.4.9999.ebuild @@ -126,11 +126,6 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) -PATCHES=( - "${FILESDIR}/qt-5.12-gcc-avx2.patch" # bug 672946 - "${FILESDIR}/${PN}-5.14.1-cmake-macro-backward-compat.patch" # bug 703306 -) - src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die
