From bbac56867d2bdd36d0f279f0f41cd27c758621e0 Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" Date: Sat, 10 Sep 2022 11:26:29 -0400 Subject: dev-qt/qtgui: sync ::gentoo --- dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch | 29 ----------------- ...-update-_NET_SUPPORTED-when-WM-changes-it.patch | 38 ++++++++++++++++++++++ 2 files changed, 38 insertions(+), 29 deletions(-) delete mode 100644 dev-qt/qtgui/files/qt-5.12-gcc-avx2.patch create mode 100644 dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch (limited to 'dev-qt/qtgui/files') 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 41814c0..0000000 --- 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 -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.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch b/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch new file mode 100644 index 0000000..0d0acdf --- /dev/null +++ b/dev-qt/qtgui/files/qtgui-5.15.5-xcb-update-_NET_SUPPORTED-when-WM-changes-it.patch @@ -0,0 +1,38 @@ +From 97acde2828c8814671f4938e0c4805d945a4d110 Mon Sep 17 00:00:00 2001 +From: Tang Haixiang +Date: Thu, 25 Feb 2021 18:05:17 +0800 +Subject: [PATCH] xcb: Update _NET_SUPPORTED when the window manager changes it +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In some cases, the application may start before the window manager, and in some window managers +_NET_SUPPORTED may be changed. These situations will cause the _NET_SUPPORTED value obtained by Qt +to be inconsistent with the window manager. + +Fixes: QTBUG-91396 +Change-Id: I63c6934ad2538cdb9f05926b3748216bd0dcf04e +Reviewed-by: Tor Arne Vestbø + + +(cherry picked from commit acb0065cc7e4ee849cc87ce72e46b05a61370c43) +--- + src/plugins/platforms/xcb/qxcbconnection.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp +index 8477e28df1..6aa61e0d34 100644 +--- a/src/plugins/platforms/xcb/qxcbconnection.cpp ++++ b/src/plugins/platforms/xcb/qxcbconnection.cpp +@@ -659,6 +659,8 @@ void QXcbConnection::handleXcbEvent(xcb_generic_event_t *event) + QXcbVirtualDesktop *virtualDesktop = virtualDesktopForRootWindow(propertyNotify->window); + if (virtualDesktop) + virtualDesktop->updateWorkArea(); ++ } else if (propertyNotify->atom == atom(QXcbAtom::_NET_SUPPORTED)) { ++ m_wmSupport->updateNetWMAtoms(); + } else { + HANDLE_PLATFORM_WINDOW_EVENT(xcb_property_notify_event_t, window, handlePropertyNotifyEvent); + } +-- +GitLab + -- cgit v1.2.3-70-g09d2