diff --git a/.gitignore b/.gitignore index 5f93b68..999de94 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /qtbase-everywhere-src-5.14.2.tar.xz /qtbase-everywhere-src-5.15.1.tar.xz /qtbase-everywhere-src-5.15.2.tar.xz +/kde-5.15-rollup-20210823.patch.gz diff --git a/0068-Bump-version.patch b/0068-Bump-version.patch new file mode 100644 index 0000000..6720f2e --- /dev/null +++ b/0068-Bump-version.patch @@ -0,0 +1,25 @@ +From 6344955d17e17e2398720fe60c34cfc2a4a95208 Mon Sep 17 00:00:00 2001 +From: Liang Qi +Date: Tue, 17 Nov 2020 11:07:30 +0100 +Subject: [PATCH 068/220] Bump version + +Change-Id: I5697edf968dfaebe25c73899d26ed234631e55dc +Reviewed-by: Kevin Funk +Reviewed-by: Jani Heikkinen +--- + .qmake.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/.qmake.conf b/.qmake.conf +index 9476d20099..1bf1a80475 100644 +--- a/.qmake.conf ++++ b/.qmake.conf +@@ -6,4 +6,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS + QT_SOURCE_TREE = $$PWD + QT_BUILD_TREE = $$shadowed($$PWD) + +-MODULE_VERSION = 5.15.2 ++MODULE_VERSION = 5.15.3 +-- +2.31.1 + diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 147c4e1..a5d09fb 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 21%{?dist} +Release: 22%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details @@ -134,14 +134,12 @@ Patch80: qtbase-use-wayland-on-gnome.patch # gcc-11 Patch90: %{name}-gcc11.patch -# glibc stat - ## upstream patches -# see also patch90 -Patch200: qtbase-QTBUG-90395.patch -Patch201: qtbase-QTBUG-89977.patch -Patch202: qtbase-filechooser-portal-send-window-id-in-hex.patch -Patch203: qtbase-QTBUG-91909.patch +# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch +# git diff v5.15.2..HEAD | gzip > kde-5.15-rollup-(date).patch.gz +# patch100 in lookaside cache due to large'ish size -- rdieter +Patch100: kde-5.15-rollup-20210823.patch.gz +Patch101: 0068-Bump-version.patch # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are @@ -409,9 +407,9 @@ Qt5 libraries used for drawing widgets and OpenGL items. %patch90 -p1 -b .gcc11 ## upstream patches -%patch200 -p1 -b .QTBUG-90395 -%patch201 -p1 -b .QTBUG-89977 -%patch203 -p1 -b .QTBUG-91909 +%patch100 -p1 +# revert version bump +%patch101 -p1 -R # move some bundled libs to ensure they're not accidentally used pushd src/3rdparty @@ -1073,6 +1071,9 @@ fi %changelog +* Mon Aug 23 2021 Rex Dieter - 5.15.2-22 +- sync kde/5.15 branch patches + * Thu Jul 29 2021 Than Ngo - 5.15.2-21 - Fixed FTBFS against firebird-4.0.0 diff --git a/sources b/sources index 6ef5740..175d81b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (qtbase-everywhere-src-5.15.2.tar.xz) = a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 +SHA512 (kde-5.15-rollup-20210823.patch.gz) = 42beeb748776fc098201d3cea0e5e10426838c3d37adc9e55024060420ddaa816cfc3c5f8260a07dc0ca9cce87b09bc1f99e602498e0d32c35f661a1ce326a9b