(conan-io#23034) qt 5.15.13

* qt 5.15.13

* remove patches merged upstream

https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/462017
https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/460367

* shorten the path to ANGLE

* remove 5.15.7

* remove 5.15.8

recipes/qt/5.x.x/conandata.yml

@@ -1,4 +1,10 @@
 sources:
+  "5.15.13":
+    url:
+      - "https://download.qt.io/official_releases/qt/5.15/5.15.13/single/qt-everywhere-opensource-src-5.15.13.tar.xz"
+      - "https://download.qt.io/archive/qt/5.15/5.15.13/single/qt-everywhere-opensource-src-5.15.13.tar.xz"
+      - "https://mirrors.cloud.tencent.com/qt/archive/qt/5.15/5.15.13/single/qt-everywhere-opensource-src-5.15.13.tar.xz"
+    sha256: "9550ec8fc758d3d8d9090e261329700ddcd712e2dda97e5fcfeabfac22bea2ca"
   "5.15.12":
     url:
       - "https://download.qt.io/official_releases/qt/5.15/5.15.12/single/qt-everywhere-opensource-src-5.15.12.tar.xz"
@@ -87,21 +93,30 @@ sources:
       - "https://ftp.jaist.ac.jp/pub/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
       - "https://ftp.yz.yamagata-u.ac.jp/pub/qtproject/archive/qt/5.15/5.15.9/single/qt-everywhere-opensource-src-5.15.9.tar.xz"
     sha256: "26d5f36134db03abe4a6db794c7570d729c92a3fc1b0bf9b1c8f86d0573cd02f"
-  "5.15.8":
-    url:
-      - "https://download.qt.io/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
-      - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.8/single/qt-everywhere-opensource-src-5.15.8.tar.xz"
-    sha256: "776a9302c336671f9406a53bd30b8e36f825742b2ec44a57c08217bff0fa86b9"
-  "5.15.7":
-    url:
-      - "https://download.qt.io/archive/qt/5.15/5.15.7/single/qt-everywhere-opensource-src-5.15.7.tar.xz"
-      - "https://qt-mirror.dannhauer.de/archive/qt/5.15/5.15.7/single/qt-everywhere-opensource-src-5.15.7.tar.xz"
-      - "https://www.funet.fi/pub/mirrors/download.qt-project.org/archive/qt/5.15/5.15.7/single/qt-everywhere-opensource-src-5.15.7.tar.xz"
-      - "https://ftp.fau.de/qtproject/archive/qt/5.15/5.15.7/single/qt-everywhere-opensource-src-5.15.7.tar.xz"
-    sha256: "8a71986676a3f37a198a9113acedbfd5bc5606a459b6b85816d951458adbe9a0"
 patches:
+  "5.15.13":
+    - "base_path": "qt5/qtbase"
+      "patch_file": "patches/aa2a39dea5.diff"
+    - "base_path": "qt5/qtwebengine"
+      "patch_file": "patches/c72097e.diff"
+    - "base_path": "qt5/qttools"
+      "patch_file": "patches/fix-macdeployqt.diff"
+    - "base_path": "qt5/qtwebengine/src/3rdparty"
+      "patch_file": "patches/0001-Find-fontconfig-using-pkg-config.patch"
+    - "base_path": "qt5/qtbase"
+      "patch_file": "patches/android-backtrace.diff"
+    - "base_path": "qt5/qtbase"
+      "patch_file": "patches/android-openssl.diff"
+    - "base_path": "qt5/qtbase"
+      "patch_description": "Fix qmake build with apple-clang>=15"
+      "patch_file": "patches/5.15.8-fix-qmake-default-libdirs-apple-clang-15.patch"
+      "patch_source": "https://codereview.qt-project.org/c/qt/qtbase/+/503916"
+      "patch_type": "portability"
+    - "base_path": "qt5/qtbase"
+      "patch_description": "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
+      "patch_file": "patches/5.15.12-fix-macos-cpp-lib-memory-resource.patch"
+      "patch_source": "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
+      "patch_type": "portability"
   "5.15.12":
     - "base_path": "qt5/qtbase"
       "patch_file": "patches/aa2a39dea5.diff"
@@ -229,77 +244,3 @@ patches:
       patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
       patch_type: "portability"
       patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
-  "5.15.8":
-    - patch_file: "patches/aa2a39dea5.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/c72097e.diff"
-      base_path: "qt5/qtwebengine"
-    - patch_file: "patches/fix-macdeployqt.diff"
-      base_path: "qt5/qttools"
-    - patch_file: "patches/chromium-v8-missing-constexpr.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty/chromium/v8"
-    - patch_file: "patches/chromium-skia-missing-iterator-include.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty"
-    - patch_file: "patches/skia-cd397f3.diff"
-      base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/skia"
-    - patch_file: "patches/0001-Find-fontconfig-using-pkg-config.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty"
-    - patch_file: "patches/337f28c9ab-5.15.8.patch"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/android-backtrace.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/android-openssl.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/android-new-ndk.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/5.15.8-fix-qmake-default-libdirs-apple-clang-15.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix build with apple-clang 15"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/503916"
-    - patch_file: "patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"
-  "5.15.7":
-    - patch_file: "patches/337f28c9ab.patch"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/aa2a39dea5.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/c72097e.diff"
-      base_path: "qt5/qtwebengine"
-    - patch_file: "patches/fix-macdeployqt.diff"
-      base_path: "qt5/qttools"
-    - patch_file: "patches/dece6f5.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/QTBUG-98813.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty"
-    - patch_file: "patches/d3396fb6fc.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty"
-    - patch_file: "patches/107ed30ec5.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty"
-    - patch_file: "patches/chromium-v8-missing-constexpr.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty/chromium/v8"
-    - patch_file: "patches/chromium-skia-missing-iterator-include.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty"
-    - patch_file: "patches/skia-cd397f3.diff"
-      base_path: "qt5/qtwebengine/src/3rdparty/chromium/third_party/skia"
-    - patch_file: "patches/0001-Find-fontconfig-using-pkg-config.patch"
-      base_path: "qt5/qtwebengine/src/3rdparty"
-    - patch_file: "patches/android-backtrace.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/android-openssl.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/android-new-ndk.diff"
-      base_path: "qt5/qtbase"
-    - patch_file: "patches/5.15.7-fix-qmake-default-libdirs-apple-clang-15.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix build with apple-clang 15"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/503916"
-    - patch_file: "patches/5.15.7-fix-macos-cpp-lib-memory-resource.patch"
-      base_path: "qt5/qtbase"
-      patch_description: "Fix usage of memory_resource with apple-clang>=15 and deployment target of macOS < 14"
-      patch_type: "portability"
-      patch_source: "https://codereview.qt-project.org/c/qt/qtbase/+/482392"

recipes/qt/5.x.x/conanfile.py

@@ -338,9 +338,6 @@ def validate(self):
         if self.options.with_sqlite3 and not self.dependencies["sqlite3"].options.enable_column_metadata:
             raise ConanInvalidConfiguration("sqlite3 option enable_column_metadata must be enabled for qt")
 
-        if Version(self.version) < "5.15.9" and self.settings.os == "Macos" and self.settings.arch == "armv8":
-            raise ConanInvalidConfiguration("qt does not support macOS on ARM before 5.15.9 (QTBUG-85279)")
-
     def requirements(self):
         self.requires("zlib/[>=1.2.11 <2]")
         if self.options.openssl:
@@ -447,6 +444,10 @@ def build_requirements(self):
         if self.options.qtwayland:
             self.tool_requires("wayland/<host_version>")
 
+    @property
+    def angle_path(self):
+        return os.path.join(self.source_folder, "angle")
+
     def source(self):
         get(self, **self.conan_data["sources"][self.version],
             strip_root=True, destination="qt5")
@@ -463,6 +464,10 @@ def source(self):
         )
         save(self, os.path.join(self.source_folder, "qt5", "qtbase", "mkspecs", "features", "uikit", "bitcode.prf"), "")
 
+        # shorten the path to ANGLE to avoid the following error:
+        # C:\J2\w\prod-v2\bsr@4\104220\ebfcf\p\qtde01f793a6074\s\qt5\qtbase\src\3rdparty\angle\src\libANGLE\renderer\d3d\d3d11\texture_format_table_autogen.cpp : fatal error C1083: Cannot open compiler generated file: '': Invalid argument
+        copy(self, "*", os.path.join(self.source_folder, "qt5", "qtbase", "src", "3rdparty", "angle"), self.angle_path)
+
     def generate(self):
         pc = PkgConfigDeps(self)
         pc.generate()
@@ -475,6 +480,7 @@ def generate(self):
             vre.generate(scope="build")
         env = Environment()
         env.define("MAKEFLAGS", f"j{build_jobs(self)}")
+        env.define("ANGLE_DIR", self.angle_path)
         env.prepend_path("PKG_CONFIG_PATH", self.generators_folder)
         if self.settings.os == "Windows":
             env.prepend_path("PATH", os.path.join(self.source_folder, "qt5", "gnuwin32", "bin"))