Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt 5.15.13 #23034

Merged
merged 8 commits into from
Mar 18, 2024
Merged

qt 5.15.13 #23034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f1afbe6
qt 5.15.13
ericLemanissier Mar 8, 2024
ef9e968
remove patches merged upstream
ericLemanissier Mar 11, 2024
8c48e2e
shorten the path to ANGLE
ericLemanissier Mar 13, 2024
80a2394
remove 5.15.7
ericLemanissier Mar 13, 2024
e831a4e
remove 5.15.8
ericLemanissier Mar 13, 2024
3a52367
Merge branch 'master' into qt5
ericLemanissier Mar 13, 2024
2608fef
Merge branch 'master' into qt5
ericLemanissier Mar 14, 2024
ae447f2
Merge branch 'master' into qt5
ericLemanissier Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
117 changes: 29 additions & 88 deletions recipes/qt/5.x.x/conandata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -87,31 +93,40 @@
- "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"

Check warning on line 99 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtbase
    ^ (line: 98)
- "base_path": "qt5/qtwebengine"
"patch_file": "patches/c72097e.diff"

Check warning on line 101 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtwebengine
    ^ (line: 100)
- "base_path": "qt5/qttools"
"patch_file": "patches/fix-macdeployqt.diff"

Check warning on line 103 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qttools
    ^ (line: 102)
- "base_path": "qt5/qtwebengine/src/3rdparty"
"patch_file": "patches/0001-Find-fontconfig-using-pkg-config.patch"

Check warning on line 105 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtwebengine/s ... 
    ^ (line: 104)
- "base_path": "qt5/qtbase"
"patch_file": "patches/android-backtrace.diff"

Check warning on line 107 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtbase
    ^ (line: 106)
- "base_path": "qt5/qtbase"
"patch_file": "patches/android-openssl.diff"

Check warning on line 109 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtbase
    ^ (line: 108)
- "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"
- "base_path": "qt5/qtwebengine"

Check warning on line 123 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtbase
    ^ (line: 122)
"patch_file": "patches/c72097e.diff"
- "base_path": "qt5/qttools"

Check warning on line 125 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtwebengine
    ^ (line: 124)
"patch_file": "patches/fix-macdeployqt.diff"
- "base_path": "qt5/qtwebengine/src/3rdparty/chromium/v8"

Check warning on line 127 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qttools
    ^ (line: 126)
"patch_file": "patches/chromium-v8-missing-constexpr.patch"
- "base_path": "qt5/qtwebengine/src/3rdparty"

Check warning on line 129 in recipes/qt/5.x.x/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - base_path: qt5/qtwebengine/s ... 
    ^ (line: 128)
"patch_file": "patches/chromium-skia-missing-iterator-include.patch"
- "base_path": "qt5/qtwebengine/src/3rdparty/chromium/third_party/skia"
"patch_file": "patches/skia-cd397f3.diff"
Expand Down Expand Up @@ -229,77 +244,3 @@
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"
12 changes: 9 additions & 3 deletions recipes/qt/5.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,6 @@
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:
Expand Down Expand Up @@ -447,6 +444,10 @@
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")
Expand All @@ -463,6 +464,10 @@
)
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()
Expand All @@ -475,6 +480,7 @@
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"))
Expand Down Expand Up @@ -925,7 +931,7 @@
filecontents += 'set(CMAKE_AUTOMOC_MACRO_NAMES "Q_OBJECT" "Q_GADGET" "Q_GADGET_EXPORT" "Q_NAMESPACE" "Q_NAMESPACE_EXPORT")\n'
save(self, os.path.join(self.package_folder, self._cmake_core_extras_file), filecontents)

def _create_private_module(module, dependencies=[]):

Check warning on line 934 in recipes/qt/5.x.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Dangerous default value [] as argument
if "Core" not in dependencies:
dependencies.append("Core")
dependencies_string = ';'.join(f'Qt5::{dependency}' for dependency in dependencies)
Expand Down Expand Up @@ -994,7 +1000,7 @@
reqs.append(corrected_req)
return reqs

def _create_module(module, requires=[], has_include_dir=True):

Check warning on line 1003 in recipes/qt/5.x.x/conanfile.py

View workflow job for this annotation

GitHub Actions / Lint changed conanfile.py (v2 migration) 

 Dangerous default value [] as argument
componentname = f"qt{module}"
assert componentname not in self.cpp_info.components, f"Module {module} already present in self.cpp_info.components"
self.cpp_info.components[componentname].set_property("cmake_target_name", f"Qt5::{module}")
Expand Down
35 changes: 0 additions & 35 deletions recipes/qt/5.x.x/patches/107ed30ec5.patch
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions recipes/qt/5.x.x/patches/5.15.7-fix-qmake-default-libdirs-apple-clang-15.patch
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions recipes/qt/5.x.x/patches/QTBUG-98813.patch
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions recipes/qt/5.x.x/patches/d3396fb6fc.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions recipes/qt/5.x.x/patches/dece6f5.diff
View file
Open in desktop

This file was deleted.

0 recipes/qt/5.x.x/qtmodules5.15.7.conf → recipes/qt/5.x.x/qtmodules5.15.13.conf
View file
Open in desktop
File renamed without changes.
Loading
Loading