diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 62b798fec70016d3fdb127f832ff988153696afb..524820f16b8f10315569ae442aba90b604525eef 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -34,7 +34,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 2 +Release: 3 # See LGPL_EXCEPTIONS.txt, for exception details @@ -57,9 +57,6 @@ Source3: 10-qt5-check-opengl2.sh # macros Source4: macros.qt5-qtbase -# support multilib optflags -Patch0000: qtbase-multilib_optflags.patch - # borrowed from opensuse # track private api via properly versioned symbols # downside: binaries produced with these differently-versioned symbols are no longer @@ -70,11 +67,6 @@ Patch0001: tell-the-truth-about-private-api.patch # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) Patch0002: qtbase-opensource-src-5.8.0-QT_VERSION_CHECK.patch -# 1381828 - Broken window scaling for some QT5 applications (#1381828) -# This patch moves the threshold for 2x scaling from the DPI of 144 to 192, -# the same value GNOME uses. It's not a complete solution... -Patch0003: qtbase-hidpi_scale_at_192.patch - # 1. Workaround moc/multilib issues # https://bugzilla.redhat.com/show_bug.cgi?id=1290020 # https://bugreports.qt.io/browse/QTBUG-49972 @@ -115,7 +107,6 @@ Patch0013: %{name}-gcc11.patch # see also patch90 Patch0014: qtbase-QTBUG-90395.patch Patch0015: qtbase-QTBUG-89977.patch -Patch0016: qtbase-filechooser-portal-send-window-id-in-hex.patch Patch0017: qtbase-QTBUG-91909.patch Patch0018: 0001-modify-kwin_5.18-complier-error.patch # https://launchpad.net/ubuntu/+source/qtbase-opensource-src/5.15.2+dfsg-15 @@ -1017,6 +1008,9 @@ fi %changelog +* Wed Jul 27 2022 peijiankang - 5.15.2-3 +- remove unnecessary file + * Tue Jul 26 2022 wangkai - 5.15.2-2 - Fix CVE-2021-38593 and CVE-2022-25255 diff --git a/qtbase-filechooser-portal-send-window-id-in-hex.patch b/qtbase-filechooser-portal-send-window-id-in-hex.patch deleted file mode 100644 index 42030364ba5f68b8fb82d508a660405b2612b374..0000000000000000000000000000000000000000 --- a/qtbase-filechooser-portal-send-window-id-in-hex.patch +++ /dev/null @@ -1,26 +0,0 @@ -From acaabc9108dfe75530960cf8e3ec4f3602cd82e0 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Mon, 08 Mar 2021 12:29:21 +0100 -Subject: [PATCH] FileChooser portal: send window id in hex - -We send window id in decimal, however, it is expected to be send in hex. -This causes a mismatch and makes portal dialog to show in background. - -Pick-to: 5.15 6.0 6.1 -Change-Id: Ibd77199bbb4a2ad4782a0457ddc5506c6b5608fe -Reviewed-by: Thiago Macieira ---- - -diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp -index ec153f6..85bdd1a 100644 ---- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp -+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp -@@ -185,7 +185,7 @@ - QLatin1String("/org/freedesktop/portal/desktop"), - QLatin1String("org.freedesktop.portal.FileChooser"), - d->saveFile ? QLatin1String("SaveFile") : QLatin1String("OpenFile")); -- QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId); -+ QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId, 16); - - QVariantMap options; - if (!d->acceptLabel.isEmpty()) diff --git a/qtbase-hidpi_scale_at_192.patch b/qtbase-hidpi_scale_at_192.patch deleted file mode 100644 index 932c3a9754bb27954fa4aace09df4cb5e35bbd01..0000000000000000000000000000000000000000 --- a/qtbase-hidpi_scale_at_192.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp -index ec0f9ba..6d0d7a6 100644 ---- a/src/plugins/platforms/xcb/qxcbscreen.cpp -+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp -@@ -747,7 +747,7 @@ void QXcbScreen::updateGeometry(const QRect &geometry, uint8_t rotation) - m_sizeMillimeters = sizeInMillimeters(geometry.size(), virtualDpi()); - - qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4); -- m_pixelDensity = qMax(1, qRound(dpi/96)); -+ m_pixelDensity = qMax(1, (int) (dpi/96)); // instead of rounding at 1.5, round at 2.0 (same as GNOME) - m_geometry = geometry; - m_availableGeometry = geometry & m_virtualDesktop->workArea(); - QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry); diff --git a/qtbase-multilib_optflags.patch b/qtbase-multilib_optflags.patch deleted file mode 100644 index 5498e79ce5827fb4b3f18c97c39696ef55a8bb9c..0000000000000000000000000000000000000000 --- a/qtbase-multilib_optflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -r -u a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf ---- a/mkspecs/linux-g++/qmake.conf 2015-10-30 06:20:01.000000000 -0200 -+++ b/mkspecs/linux-g++/qmake.conf 2015-11-05 11:23:23.230741601 -0200 -@@ -5,6 +5,7 @@ - MAKEFILE_GENERATOR = UNIX - CONFIG += incremental - QMAKE_INCREMENTAL_STYLE = sublib -+QMAKE_CFLAGS_RELEASE += -O2 - - include(../common/linux.conf) - include(../common/gcc-base-unix.conf) -diff -r -u a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf ---- a/mkspecs/linux-g++-32/qmake.conf 2015-10-30 06:20:01.000000000 -0200 -+++ b/mkspecs/linux-g++-32/qmake.conf 2015-11-05 11:22:19.761494470 -0200 -@@ -10,6 +10,7 @@ - - QMAKE_CFLAGS = -m32 - QMAKE_LFLAGS = -m32 -+QMAKE_CFLAGS_RELEASE += -O2 - - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf) -diff -r -u a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf ---- a/mkspecs/linux-g++-64/qmake.conf 2015-10-30 06:20:01.000000000 -0200 -+++ b/mkspecs/linux-g++-64/qmake.conf 2015-11-05 11:22:49.497610248 -0200 -@@ -13,6 +13,7 @@ - - QMAKE_CFLAGS = -m64 - QMAKE_LFLAGS = -m64 -+QMAKE_CFLAGS_RELEASE += -O2 - - include(../common/gcc-base-unix.conf) - include(../common/g++-unix.conf)