commit: 71a6ccc1bcc9b66bbb891365ab17edcd49f7b1c9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Dec 25 15:51:30 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Dec 25 17:30:33 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=71a6ccc1
dev-qt/qtgui: Sync with Gentoo ebuild repository - Fix build with CXXFLAGS="-march=native" - Block known old users of _populate_Gui_plugin_properties With sufficiently parallelised emerge, if dev-qt/qtgui reverse dependencies are scheduled before modules installing Qt5Gui plugins have been rebuilt, these revdeps will fail cmake after an incompatible change in macro args. - Raise minimum dependency for USE=tslib Bug: https://bugs.gentoo.org/672946 Bug: https://bugs.gentoo.org/703306 Bug: https://bugs.gentoo.org/703336 Package-Manager: Portage-2.3.83, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch | 29 +++++++++++++++++++++++++++++ dev-qt/qtgui/qtgui-5.12.9999.ebuild | 2 ++ dev-qt/qtgui/qtgui-5.14.9999.ebuild | 15 ++++++++++++--- dev-qt/qtgui/qtgui-5.15.9999.ebuild | 15 ++++++++++++--- dev-qt/qtgui/qtgui-5.9999.ebuild | 2 +- 5 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch new file mode 100644 index 00000000..41814c06 --- /dev/null +++ b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch @@ -0,0 +1,29 @@ +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/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild index 480c023a..bd23ada7 100644 --- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild @@ -124,6 +124,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) +PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die diff --git a/dev-qt/qtgui/qtgui-5.14.9999.ebuild b/dev-qt/qtgui/qtgui-5.14.9999.ebuild index 480c023a..97db51f0 100644 --- a/dev-qt/qtgui/qtgui-5.14.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.14.9999.ebuild @@ -24,7 +24,7 @@ REQUIRED_USE=" xcb? ( gles2? ( egl ) ) " -RDEPEND=" +COMMON_DEPEND=" dev-libs/glib:2 ~dev-qt/qtcore-${PV} dev-util/gtk-update-icon-cache @@ -47,7 +47,7 @@ RDEPEND=" >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) - tslib? ( x11-libs/tslib ) + tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} ) @@ -63,10 +63,17 @@ RDEPEND=" x11-libs/xcb-util-wm ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) " +# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules +RDEPEND="${COMMON_DEPEND} + !<dev-qt/qtimageformats-5.14.0:5 + !<dev-qt/qtsvg-5.14.0:5 + !<dev-qt/qtvirtualkeyboard-5.14.0:5 + !<dev-qt/qtwayland-5.14.0:5 +" PDEPEND=" ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-${PV} ) @@ -124,6 +131,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) +PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die diff --git a/dev-qt/qtgui/qtgui-5.15.9999.ebuild b/dev-qt/qtgui/qtgui-5.15.9999.ebuild index 7cceccfd..8a4c7007 100644 --- a/dev-qt/qtgui/qtgui-5.15.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.15.9999.ebuild @@ -24,7 +24,7 @@ REQUIRED_USE=" xcb? ( gles2? ( egl ) ) " -RDEPEND=" +COMMON_DEPEND=" dev-libs/glib:2 ~dev-qt/qtcore-${PV} dev-util/gtk-update-icon-cache @@ -47,7 +47,7 @@ RDEPEND=" >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) - tslib? ( x11-libs/tslib ) + tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} ) @@ -63,10 +63,17 @@ RDEPEND=" x11-libs/xcb-util-wm ) " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} evdev? ( sys-kernel/linux-headers ) udev? ( sys-kernel/linux-headers ) " +# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules +RDEPEND="${COMMON_DEPEND} + !<dev-qt/qtimageformats-5.14.0:5 + !<dev-qt/qtsvg-5.14.0:5 + !<dev-qt/qtvirtualkeyboard-5.14.0:5 + !<dev-qt/qtwayland-5.14.0:5 +" PDEPEND=" ibus? ( app-i18n/ibus ) wayland? ( ~dev-qt/qtwayland-${PV} ) @@ -124,6 +131,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( :gui ) +PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 + src_prepare() { # don't add -O3 to CXXFLAGS, bug 549140 sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild index 480c023a..e8e79ac3 100644 --- a/dev-qt/qtgui/qtgui-5.9999.ebuild +++ b/dev-qt/qtgui/qtgui-5.9999.ebuild @@ -47,7 +47,7 @@ RDEPEND=" >=x11-libs/libxkbcommon-0.5.0 ) png? ( media-libs/libpng:0= ) - tslib? ( x11-libs/tslib ) + tslib? ( >=x11-libs/tslib-1.21 ) tuio? ( ~dev-qt/qtnetwork-${PV} ) udev? ( virtual/libudev:= ) vnc? ( ~dev-qt/qtnetwork-${PV} )
