qtpdf: remove duplicated patches

* add 0002-qmake.conf-lower-MODULE_VERSION-to-5.15.2.patch from qtwebengine
  as well

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

7 files changed, 8 insertions, 221 deletions

diff --git a/recipes-qt/qt5/qtpdf/0001-Force-host-toolchain-configuration.patch b/recipes-qt/qt5/qtpdf/0001-Force-host-toolchain-configuration.patch
deleted file mode 100644
index bc4cddb9..00000000
--- a/recipes-qt/qt5/qtpdf/0001-Force-host-toolchain-configuration.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From ea99142a773c7b55dcd2ee7b52d5339876056881 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 15 Mar 2017 13:53:28 +0200
-Subject: [PATCH 1/6] Force host toolchain configuration
-
-Force gcc/g++ to be used for parts using host toolchain, since
-the option(host_build) does not work in yocto builds.
-
-Don't use QT_ARCH for the host architecture, since that's always
-the target architecture in bitbake builds, instead ask specifically
-for the qmakes's host architecture.
-
-Upstream-Status: Inappropriate [OE specific]
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
----
- src/buildtools/config/linux.pri   |  2 +-
- src/buildtools/configure_host.pro | 14 +++++++-------
- src/buildtools/gn.pro             |  4 ++--
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
-index 7507d51e..1e078cbf 100644
---- a/src/buildtools/config/linux.pri
-+++ b/src/buildtools/config/linux.pri
-@@ -118,7 +118,7 @@ contains(QT_ARCH, "mips") {
- 
- host_build {
-     gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\"
--    GN_HOST_CPU = $$gnArch($$QT_ARCH)
-+    GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
-     gn_args += host_cpu=\"$$GN_HOST_CPU\"
-     # Don't bother trying to use system libraries in this case
-     gn_args += use_glib=false
-diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro
-index dd0d3e32..6312c867 100644
---- a/src/buildtools/configure_host.pro
-+++ b/src/buildtools/configure_host.pro
-@@ -4,7 +4,7 @@ TEMPLATE = aux
- # Pick up the host toolchain
- option(host_build)
- 
--GN_HOST_CPU = $$gnArch($$QT_ARCH)
-+GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch)
- !isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH)
- else: GN_TARGET_CPU = $$GN_HOST_CPU
- GN_OS = $$gnOS()
-@@ -31,9 +31,9 @@ GN_CONTENTS = \
- "import(\"//build/config/sysroot.gni\")" \
- "import(\"//build/toolchain/gcc_toolchain.gni\")" \
- "gcc_toolchain(\"host\") {" \
--"  cc = \"$$which($$QMAKE_CC)\" " \
--"  cxx = \"$$which($$QMAKE_CXX)\" " \
--"  ld = \"$$which($$QMAKE_LINK)\" " \
-+"  cc = \"$$which($$CC_host)\" " \
-+"  cxx = \"$$which($$CXX_host)\" " \
-+"  ld = \"$$which($$CXX_host)\" " \
- "  ar = \"$$which(ar)\" " \
- "  nm = \"$$which(nm)\" " \
- "  extra_cppflags = \"$$GN_HOST_EXTRA_CPPFLAGS\" " \
-@@ -45,9 +45,9 @@ GN_CONTENTS = \
- "  } " \
- "}" \
- "gcc_toolchain(\"v8_snapshot\") {" \
--"  cc = \"$$which($$QMAKE_CC)\" " \
--"  cxx = \"$$which($$QMAKE_CXX)\" " \
--"  ld = \"$$which($$QMAKE_LINK)\" " \
-+"  cc = \"$$which($$CC_host)\" " \
-+"  cxx = \"$$which($$CXX_host)\" " \
-+"  ld = \"$$which($$CXX_host)\" " \
- "  ar = \"$$which(ar)\" " \
- "  nm = \"$$which(nm)\" " \
- "  toolchain_args = { " \
-diff --git a/src/buildtools/gn.pro b/src/buildtools/gn.pro
-index 033202e6..a8ca6567 100644
---- a/src/buildtools/gn.pro
-+++ b/src/buildtools/gn.pro
-@@ -19,8 +19,8 @@ build_pass|!debug_and_release {
-             gn_bootstrap = $$system_path($$absolute_path(gn/build/gen.py, $$src_3rd_party_dir))
- 
-             gn_gen_args = --no-last-commit-position --out-path $$out_path \
--                          --cc \"$$which($$QMAKE_CC)\" --cxx \"$$which($$QMAKE_CXX)\" \
--                          --ld \"$$which($$QMAKE_LINK)\"
-+                          --cc \"$$which($$CC_host)\" --cxx \"$$which($$CXX_host)\" \
-+                          --ld \"$$which($$CXX_host)\" --ar \"$$which(ar)\"
- 
-             msvc:!clang_cl: gn_gen_args += --use-lto
- 
--- 
-2.34.1
-
diff --git a/recipes-qt/qt5/qtpdf/0005-configure.json-remove-python2-dependency.patch b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch
index cfe4d85d..75576667 100644
--- a/recipes-qt/qt5/qtpdf/0005-configure.json-remove-python2-dependency.patch
+++ b/recipes-qt/qt5/qtpdf/0001-configure.json-remove-python2-dependency.patch
@@ -1,7 +1,7 @@
 From 988d1e3f9c4415c2a59833b74098639d3fe71524 Mon Sep 17 00:00:00 2001
 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>
 Date: Tue, 8 Feb 2022 14:14:02 +0100
-Subject: [PATCH 5/6] configure.json: remove python2 dependency
+Subject: [PATCH] configure.json: remove python2 dependency
 
 ---
  src/buildtools/configure.json | 1 -
@@ -19,6 +19,3 @@ index 9eb5e8e3..ebe31c21 100644
                           && (!config.sanitizer || features.webengine-sanitizer)
                           && (!config.linux || features.pkg-config)
                           && (!config.linux || features.webengine-host-pkg-config)
--- 
-2.34.1
-
diff --git a/recipes-qt/qt5/qtpdf/0006-gn.pro-do-not-try-to-statically-link-stdc.patch b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch
index e3c11f4f..87d26ac0 100644
--- a/recipes-qt/qt5/qtpdf/0006-gn.pro-do-not-try-to-statically-link-stdc.patch
+++ b/recipes-qt/qt5/qtpdf/0002-gn.pro-do-not-try-to-statically-link-stdc.patch
@@ -1,7 +1,7 @@
 From 4d2f525ccf3255dd4a0e774d3db0533ae4aba98f Mon Sep 17 00:00:00 2001
 From: Leif Middelschulte <Leif.Middelschulte@klsmartin.com>
 Date: Tue, 8 Feb 2022 16:28:14 +0100
-Subject: [PATCH 6/6] gn.pro: do not try to statically link stdc++
+Subject: [PATCH] gn.pro: do not try to statically link stdc++
 
 ---
  src/buildtools/gn.pro | 3 ++-
@@ -21,6 +21,3 @@ index a8ca6567..9632f0ef 100644
  
              msvc:!clang_cl: gn_gen_args += --use-lto
  
--- 
-2.34.1
-
diff --git a/recipes-qt/qt5/qtpdf/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch b/recipes-qt/qt5/qtpdf/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
deleted file mode 100644
index bca6a91a..00000000
--- a/recipes-qt/qt5/qtpdf/0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ccc1d2afb10bacdf7ebdcba5ffb130ef72eaa7a5 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Tue, 12 Dec 2017 16:06:14 +0200
-Subject: [PATCH 2/6] musl: don't use pvalloc as it's not available on musl
-
-Change-Id: I7145463ac7b9560e7459d3384a3db108bd727403
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
----
- src/core/api/qtbug-61521.cpp | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp
-index 002a1af2..8fd2da36 100644
---- a/src/core/api/qtbug-61521.cpp
-+++ b/src/core/api/qtbug-61521.cpp
-@@ -74,10 +74,6 @@ SHIM_SYMBOL_VERSION(valloc);
- void* __valloc(size_t size)
-     SHIM_ALIAS_SYMBOL(ShimValloc);
- 
--SHIM_SYMBOL_VERSION(pvalloc);
--void* __pvalloc(size_t size)
--    SHIM_ALIAS_SYMBOL(ShimPvalloc);
--
- SHIM_SYMBOL_VERSION(posix_memalign);
- int __posix_memalign(void** r, size_t a, size_t s)
-     SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
-@@ -110,10 +106,6 @@ SHIM_HIDDEN void* ShimValloc(size_t size) {
-     return  valloc(size);
- }
- 
--SHIM_HIDDEN void* ShimPvalloc(size_t size) {
--    return pvalloc(size);
--}
--
- SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
-     return posix_memalign(r,a,s);
- }
--- 
-2.34.1
-
diff --git a/recipes-qt/qt5/qtpdf/0003-musl-link-against-libexecinfo.patch b/recipes-qt/qt5/qtpdf/0003-musl-link-against-libexecinfo.patch
deleted file mode 100644
index 23bd0b84..00000000
--- a/recipes-qt/qt5/qtpdf/0003-musl-link-against-libexecinfo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 406fc3c6271d3f6ba5a96b019fb3bd74916745f5 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Thu, 14 Dec 2017 11:28:10 +0200
-Subject: [PATCH 3/6] musl: link against libexecinfo
-
-Change-Id: Ifada60f9c72691973612850121f6fb152d70839a
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
----
- src/core/core_module.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/core/core_module.pro b/src/core/core_module.pro
-index 520b452f..d2b29b29 100644
---- a/src/core/core_module.pro
-+++ b/src/core/core_module.pro
-@@ -5,7 +5,7 @@ include($${QTWEBENGINE_ROOT}/src/buildtools/config/linking.pri)
- 
- api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix()
- api_library_path = $$OUT_PWD/api/$$getConfigDir()
--LIBS_PRIVATE += -L$$api_library_path
-+LIBS_PRIVATE += -L$$api_library_path -lexecinfo
- CONFIG *= no_smart_library_merge
- osx {
-     LIBS_PRIVATE += -Wl,-force_load,$${api_library_path}$${QMAKE_DIR_SEP}lib$${api_library_name}.a
--- 
-2.34.1
-
diff --git a/recipes-qt/qt5/qtpdf/0004-mkspecs-Allow-builds-with-libc-glibc.patch b/recipes-qt/qt5/qtpdf/0004-mkspecs-Allow-builds-with-libc-glibc.patch
deleted file mode 100644
index 687d47f3..00000000
--- a/recipes-qt/qt5/qtpdf/0004-mkspecs-Allow-builds-with-libc-glibc.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 516203ad1419d7e76d694b621736a48a53f00291 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 12 Nov 2019 19:53:59 -0800
-Subject: [PATCH 4/6] mkspecs: Allow builds with libc != glibc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/buildtools/config/support.pri | 4 ----
- src/buildtools/configure.json     | 4 +---
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
-index e7f869a1..f9c9c24b 100644
---- a/src/buildtools/config/support.pri
-+++ b/src/buildtools/config/support.pri
-@@ -191,10 +191,6 @@ defineTest(qtwebengine_checkForHostPkgCfg) {
- 
- defineTest(qtwebengine_checkForGlibc) {
-     module = $$1
--    !qtConfig(webengine-system-glibc) {
--        qtwebengine_skipBuild("A suitable version >= 2.27 of libc required to build $${module} could not be found.")
--        return(false)
--    }
-     return(true)
- }
- 
-diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json
-index 88d1790c..9eb5e8e3 100644
---- a/src/buildtools/configure.json
-+++ b/src/buildtools/configure.json
-@@ -379,7 +379,6 @@
-                          && (!config.sanitizer || features.webengine-sanitizer)
-                          && (!config.linux || features.pkg-config)
-                          && (!config.linux || features.webengine-host-pkg-config)
--                         && (!config.linux || features.webengine-system-glibc)
-                          && (!config.linux || features.webengine-system-khr)
-                          && (!config.linux || features.webengine-system-nss)
-                          && (!config.linux || features.webengine-system-dbus)
-@@ -782,8 +781,7 @@
-                         "webengine-system-fontconfig",
-                         "webengine-system-dbus",
-                         "webengine-system-nss",
--                        "webengine-system-khr",
--                        "webengine-system-glibc"
-+                        "webengine-system-khr"
-                     ]
-                 },
-                 {
--- 
-2.34.1
-
diff --git a/recipes-qt/qt5/qtpdf_git.bb b/recipes-qt/qt5/qtpdf_git.bb
index 689cc13c..0a735b23 100644
--- a/recipes-qt/qt5/qtpdf_git.bb
+++ b/recipes-qt/qt5/qtpdf_git.bb
@@ -132,6 +132,7 @@ QT_MODULE_BRANCH_CHROMIUM = "87-based"
 
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15-glibc
 # 5.15-glibc.meta-qt5.12
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtwebengine:"
 SRC_URI += " \
     ${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
     file://0001-Force-host-toolchain-configuration.patch \
@@ -140,9 +141,9 @@ SRC_URI += " \
 # Patches from https://github.com/meta-qt5/qtwebengine/commits/b5.15
 # 5.15.meta-qt5.12
 SRC_URI:append:libc-musl = "\
-    file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
-    file://0003-musl-link-against-libexecinfo.patch \
-    file://0004-mkspecs-Allow-builds-with-libc-glibc.patch \
+    file://0003-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
+    file://0004-musl-link-against-libexecinfo.patch \
+    file://0005-mkspecs-Allow-builds-with-libc-glibc.patch \
 "
 
 SRCREV_qtwebengine = "73e76f9e86b3fded45be6b232bdebe75e7136e4a"
@@ -162,8 +163,8 @@ INSANE_SKIP:${PN} += "textrel"
 # First patch skips "python2" dependency checks for the pdf module
 # Second patch repairs a failing build of the `gn` buildtool due to missing (host) libstdc++
 SRC_URI += " \
-    file://0005-configure.json-remove-python2-dependency.patch \
-    file://0006-gn.pro-do-not-try-to-statically-link-stdc.patch \
+    file://0001-configure.json-remove-python2-dependency.patch \
+    file://0002-gn.pro-do-not-try-to-statically-link-stdc.patch \
 "
 
 # These flags below go more into detail than qtwebengine's documentation