| 1 |
commit: 71a6ccc1bcc9b66bbb891365ab17edcd49f7b1c9 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 25 15:51:30 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 25 17:30:33 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=71a6ccc1 |
| 7 |
|
| 8 |
dev-qt/qtgui: Sync with Gentoo ebuild repository |
| 9 |
|
| 10 |
- Fix build with CXXFLAGS="-march=native" |
| 11 |
- Block known old users of _populate_Gui_plugin_properties |
| 12 |
With sufficiently parallelised emerge, if dev-qt/qtgui reverse dependencies |
| 13 |
are scheduled before modules installing Qt5Gui plugins have been rebuilt, |
| 14 |
these revdeps will fail cmake after an incompatible change in macro args. |
| 15 |
- Raise minimum dependency for USE=tslib |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/672946 |
| 18 |
Bug: https://bugs.gentoo.org/703306 |
| 19 |
Bug: https://bugs.gentoo.org/703336 |
| 20 |
Package-Manager: Portage-2.3.83, Repoman-2.3.20 |
| 21 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 22 |
|
| 23 |
dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch | 29 +++++++++++++++++++++++++++++ |
| 24 |
dev-qt/qtgui/qtgui-5.12.9999.ebuild | 2 ++ |
| 25 |
dev-qt/qtgui/qtgui-5.14.9999.ebuild | 15 ++++++++++++--- |
| 26 |
dev-qt/qtgui/qtgui-5.15.9999.ebuild | 15 ++++++++++++--- |
| 27 |
dev-qt/qtgui/qtgui-5.9999.ebuild | 2 +- |
| 28 |
5 files changed, 56 insertions(+), 7 deletions(-) |
| 29 |
|
| 30 |
diff --git a/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch |
| 31 |
new file mode 100644 |
| 32 |
index 00000000..41814c06 |
| 33 |
--- /dev/null |
| 34 |
+++ b/dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch |
| 35 |
@@ -0,0 +1,29 @@ |
| 36 |
+From 3f302cb16ebfefade17b3ea90c5ed258c9150f3a Mon Sep 17 00:00:00 2001 |
| 37 |
+From: Mike Gilbert <floppym@g.o> |
| 38 |
+Date: Fri, 1 Mar 2019 21:37:52 -0500 |
| 39 |
+Subject: [PATCH] gcc: pass -mavx2 instead of -march=core-avx2 |
| 40 |
+ |
| 41 |
+Resolves a build failure when QMAKE_CXXFLAGS contains -march=native |
| 42 |
+and the compiler is running on a CPU which does not support AVX2. |
| 43 |
+ |
| 44 |
+Bug: https://bugs.gentoo.org/672946 |
| 45 |
+--- |
| 46 |
+ mkspecs/common/gcc-base.conf | 2 +- |
| 47 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 48 |
+ |
| 49 |
+diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf |
| 50 |
+index c2669e4833..44aa96af38 100644 |
| 51 |
+--- a/mkspecs/common/gcc-base.conf |
| 52 |
++++ b/mkspecs/common/gcc-base.conf |
| 53 |
+@@ -109,7 +109,7 @@ QMAKE_CFLAGS_MIPS_DSP += -mdsp |
| 54 |
+ QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2 |
| 55 |
+ |
| 56 |
+ # -march=haswell is supported as of GCC 4.9 and Clang 3.6 |
| 57 |
+-QMAKE_CFLAGS_ARCH_HASWELL = -march=core-avx2 |
| 58 |
++QMAKE_CFLAGS_ARCH_HASWELL = -mavx2 |
| 59 |
+ |
| 60 |
+ # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code |
| 61 |
+ QMAKE_AR_LTCG = gcc-ar cqs |
| 62 |
+-- |
| 63 |
+2.21.0.rc1 |
| 64 |
+ |
| 65 |
|
| 66 |
diff --git a/dev-qt/qtgui/qtgui-5.12.9999.ebuild b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 67 |
index 480c023a..bd23ada7 100644 |
| 68 |
--- a/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 69 |
+++ b/dev-qt/qtgui/qtgui-5.12.9999.ebuild |
| 70 |
@@ -124,6 +124,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 71 |
:gui |
| 72 |
) |
| 73 |
|
| 74 |
+PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 |
| 75 |
+ |
| 76 |
src_prepare() { |
| 77 |
# don't add -O3 to CXXFLAGS, bug 549140 |
| 78 |
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 79 |
|
| 80 |
diff --git a/dev-qt/qtgui/qtgui-5.14.9999.ebuild b/dev-qt/qtgui/qtgui-5.14.9999.ebuild |
| 81 |
index 480c023a..97db51f0 100644 |
| 82 |
--- a/dev-qt/qtgui/qtgui-5.14.9999.ebuild |
| 83 |
+++ b/dev-qt/qtgui/qtgui-5.14.9999.ebuild |
| 84 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 85 |
xcb? ( gles2? ( egl ) ) |
| 86 |
" |
| 87 |
|
| 88 |
-RDEPEND=" |
| 89 |
+COMMON_DEPEND=" |
| 90 |
dev-libs/glib:2 |
| 91 |
~dev-qt/qtcore-${PV} |
| 92 |
dev-util/gtk-update-icon-cache |
| 93 |
@@ -47,7 +47,7 @@ RDEPEND=" |
| 94 |
>=x11-libs/libxkbcommon-0.5.0 |
| 95 |
) |
| 96 |
png? ( media-libs/libpng:0= ) |
| 97 |
- tslib? ( x11-libs/tslib ) |
| 98 |
+ tslib? ( >=x11-libs/tslib-1.21 ) |
| 99 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 100 |
udev? ( virtual/libudev:= ) |
| 101 |
vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 102 |
@@ -63,10 +63,17 @@ RDEPEND=" |
| 103 |
x11-libs/xcb-util-wm |
| 104 |
) |
| 105 |
" |
| 106 |
-DEPEND="${RDEPEND} |
| 107 |
+DEPEND="${COMMON_DEPEND} |
| 108 |
evdev? ( sys-kernel/linux-headers ) |
| 109 |
udev? ( sys-kernel/linux-headers ) |
| 110 |
" |
| 111 |
+# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules |
| 112 |
+RDEPEND="${COMMON_DEPEND} |
| 113 |
+ !<dev-qt/qtimageformats-5.14.0:5 |
| 114 |
+ !<dev-qt/qtsvg-5.14.0:5 |
| 115 |
+ !<dev-qt/qtvirtualkeyboard-5.14.0:5 |
| 116 |
+ !<dev-qt/qtwayland-5.14.0:5 |
| 117 |
+" |
| 118 |
PDEPEND=" |
| 119 |
ibus? ( app-i18n/ibus ) |
| 120 |
wayland? ( ~dev-qt/qtwayland-${PV} ) |
| 121 |
@@ -124,6 +131,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 122 |
:gui |
| 123 |
) |
| 124 |
|
| 125 |
+PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 |
| 126 |
+ |
| 127 |
src_prepare() { |
| 128 |
# don't add -O3 to CXXFLAGS, bug 549140 |
| 129 |
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 130 |
|
| 131 |
diff --git a/dev-qt/qtgui/qtgui-5.15.9999.ebuild b/dev-qt/qtgui/qtgui-5.15.9999.ebuild |
| 132 |
index 7cceccfd..8a4c7007 100644 |
| 133 |
--- a/dev-qt/qtgui/qtgui-5.15.9999.ebuild |
| 134 |
+++ b/dev-qt/qtgui/qtgui-5.15.9999.ebuild |
| 135 |
@@ -24,7 +24,7 @@ REQUIRED_USE=" |
| 136 |
xcb? ( gles2? ( egl ) ) |
| 137 |
" |
| 138 |
|
| 139 |
-RDEPEND=" |
| 140 |
+COMMON_DEPEND=" |
| 141 |
dev-libs/glib:2 |
| 142 |
~dev-qt/qtcore-${PV} |
| 143 |
dev-util/gtk-update-icon-cache |
| 144 |
@@ -47,7 +47,7 @@ RDEPEND=" |
| 145 |
>=x11-libs/libxkbcommon-0.5.0 |
| 146 |
) |
| 147 |
png? ( media-libs/libpng:0= ) |
| 148 |
- tslib? ( x11-libs/tslib ) |
| 149 |
+ tslib? ( >=x11-libs/tslib-1.21 ) |
| 150 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 151 |
udev? ( virtual/libudev:= ) |
| 152 |
vnc? ( ~dev-qt/qtnetwork-${PV} ) |
| 153 |
@@ -63,10 +63,17 @@ RDEPEND=" |
| 154 |
x11-libs/xcb-util-wm |
| 155 |
) |
| 156 |
" |
| 157 |
-DEPEND="${RDEPEND} |
| 158 |
+DEPEND="${COMMON_DEPEND} |
| 159 |
evdev? ( sys-kernel/linux-headers ) |
| 160 |
udev? ( sys-kernel/linux-headers ) |
| 161 |
" |
| 162 |
+# bug 703306, _populate_Gui_plugin_properties breaks installed cmake modules |
| 163 |
+RDEPEND="${COMMON_DEPEND} |
| 164 |
+ !<dev-qt/qtimageformats-5.14.0:5 |
| 165 |
+ !<dev-qt/qtsvg-5.14.0:5 |
| 166 |
+ !<dev-qt/qtvirtualkeyboard-5.14.0:5 |
| 167 |
+ !<dev-qt/qtwayland-5.14.0:5 |
| 168 |
+" |
| 169 |
PDEPEND=" |
| 170 |
ibus? ( app-i18n/ibus ) |
| 171 |
wayland? ( ~dev-qt/qtwayland-${PV} ) |
| 172 |
@@ -124,6 +131,8 @@ QT5_GENTOO_PRIVATE_CONFIG=( |
| 173 |
:gui |
| 174 |
) |
| 175 |
|
| 176 |
+PATCHES=( "${FILESDIR}/qt-5.12-gcc-avx2.patch" ) # bug 672946 |
| 177 |
+ |
| 178 |
src_prepare() { |
| 179 |
# don't add -O3 to CXXFLAGS, bug 549140 |
| 180 |
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/gui/gui.pro || die |
| 181 |
|
| 182 |
diff --git a/dev-qt/qtgui/qtgui-5.9999.ebuild b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 183 |
index 480c023a..e8e79ac3 100644 |
| 184 |
--- a/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 185 |
+++ b/dev-qt/qtgui/qtgui-5.9999.ebuild |
| 186 |
@@ -47,7 +47,7 @@ RDEPEND=" |
| 187 |
>=x11-libs/libxkbcommon-0.5.0 |
| 188 |
) |
| 189 |
png? ( media-libs/libpng:0= ) |
| 190 |
- tslib? ( x11-libs/tslib ) |
| 191 |
+ tslib? ( >=x11-libs/tslib-1.21 ) |
| 192 |
tuio? ( ~dev-qt/qtnetwork-${PV} ) |
| 193 |
udev? ( virtual/libudev:= ) |
| 194 |
vnc? ( ~dev-qt/qtnetwork-${PV} ) |
Archives