[neon/qt/qtwebengine/Neon/release_focal] debian/patches: bring back version change patch and set it to 5.15.4 to align to the rest of qt else cmake complains when building e.g. https://build.neon.kde.org/job/focal_unstable_kde_messagelib_bin_amd64/462/console

[Jonathan Esk-Riddell]

Git commit 723de187a7e1cd5970bddfc0da400dbf49874d69 by Jonathan Esk-Riddell.
Committed on 20/05/2022 at 12:39.
Pushed by jriddell into branch 'Neon/release_focal'.

bring back version change patch and set it to 5.15.4 to align to the rest of qt else cmake complains when building e.g. https://build.neon.kde.org/job/focal_unstable_kde_messagelib_bin_amd64/462/console

M  +6    -9    debian/patches/0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch
M  +1    -1    debian/patches/series

https://invent.kde.org/neon/qt/qtwebengine/commit/723de187a7e1cd5970bddfc0da400dbf49874d69

diff --git a/debian/patches/0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch b/debian/patches/0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch
index d3fc034..1a3b220 100644
--- a/debian/patches/0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch
+++ b/debian/patches/0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch
@@ -8,16 +8,13 @@ Subject: [PATCH] lower version to .3 to align with the rest of the patch
  .qmake.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/.qmake.conf b/.qmake.conf
-index d5e64505..09b0b2ca 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
+Index: qtwebengine/.qmake.conf
+===================================================================
+--- qtwebengine.orig/.qmake.conf
++++ qtwebengine/.qmake.conf
 @@ -5,4 +5,4 @@ QTWEBENGINE_OUT_ROOT = $$shadowed($$PWD)
  load(qt_build_config)
  CONFIG += warning_clean
  
--MODULE_VERSION = 5.15.4
-+MODULE_VERSION = 5.15.3
--- 
-2.25.1
-
+-MODULE_VERSION = 5.15.10
++MODULE_VERSION = 5.15.4
diff --git a/debian/patches/series b/debian/patches/series
index d8b3b66..d20df85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@ system-nspr-prtime.patch
 verbose-gn-bootstrap.patch
 #sandbox-time64-syscalls.patch
 mipsel-code-range-size.patch
-#0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch
+0001-lower-version-to-.3-to-align-with-the-rest-of-the-pa.patch