From cf27b1adc8cd61c8bb98451a0174176b6db394ce Mon Sep 17 00:00:00 2001 From: Alexey Date: Thu, 26 Oct 2023 11:59:53 +0300 Subject: [PATCH] qt-creator: Update to 11.0.3 --- .../001-fix-finding-yaml-cpp-0.8.0.patch | 20 ------------------- mingw-w64-qt-creator/PKGBUILD | 9 +++------ 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 mingw-w64-qt-creator/001-fix-finding-yaml-cpp-0.8.0.patch diff --git a/mingw-w64-qt-creator/001-fix-finding-yaml-cpp-0.8.0.patch b/mingw-w64-qt-creator/001-fix-finding-yaml-cpp-0.8.0.patch deleted file mode 100644 index daf5d4dbdc..0000000000 --- a/mingw-w64-qt-creator/001-fix-finding-yaml-cpp-0.8.0.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/cmake/Findyaml-cpp.cmake -+++ b/cmake/Findyaml-cpp.cmake -@@ -8,6 +8,9 @@ - - find_package(yaml-cpp 0.5 QUIET NO_MODULE) - if (yaml-cpp_FOUND) -+ if(yaml-cpp_VERSION VERSION_GREATER_EQUAL "0.8.0") -+ add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp) -+ else() - # target doesn't set include directory for some reason - get_filename_component(yaml_cpp_include_dir "${YAML_CPP_INCLUDE_DIR}" ABSOLUTE) - if (NOT EXISTS yaml_cpp_include_dir) -@@ -16,6 +19,7 @@ - find_path(yaml_cpp_include_dir yaml-cpp/yaml.h) - endif() - set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}") -+ endif() - else() - if(TARGET yaml-cpp) - return() diff --git a/mingw-w64-qt-creator/PKGBUILD b/mingw-w64-qt-creator/PKGBUILD index 7366714514..52d73aba0e 100644 --- a/mingw-w64-qt-creator/PKGBUILD +++ b/mingw-w64-qt-creator/PKGBUILD @@ -6,9 +6,9 @@ pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-docs" "${MINGW_PACKAGE_PREFIX}-${_realname}-devel") -_base_ver=11.0.2 +_base_ver=11.0.3 pkgver=${_base_ver/-/} -pkgrel=2 +pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment (mingw-w64)' url='https://www.qt.io/' install=qt-creator-${MSYSTEM}.install @@ -36,11 +36,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-yaml-cpp") _pkgfqn="${_realname}-opensource-src-${_base_ver}" source=(https://download.qt.io/official_releases/qtcreator/${_base_ver%.*}/${_base_ver}/${_pkgfqn}.tar.xz - 001-fix-finding-yaml-cpp-0.8.0.patch qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch qt-creator-5.0.1-fix-library-archive-path.patch) -sha256sums=('9de9925dfce0ad1e6fcc37af7441e1052dddd15f97206493758d8303479a2d03' - '28bcdb5f4f2ff7721b0d6dd8f125a6b1dae2a06e4f7aeb3a51ebbfc7c31e85a3' +sha256sums=('5f501e64e836b7e3e50b98b3ebc345b201396a5fd92e49738dabb5e268d5cf1c' '6166817edb9055b98e53f644a41f28a1dbbfc3743931776852753212eee639c3' '29d67f88f071abe7a4b589182767b8a697fe4e516d70707bfca88f035883718f') @@ -56,7 +54,6 @@ prepare() { cd ${srcdir}/${_pkgfqn} apply_patch_with_msg \ - 001-fix-finding-yaml-cpp-0.8.0.patch \ qt-creator-3.2.0-Allow-iOS-plugin-on-any-platform.patch \ qt-creator-5.0.1-fix-library-archive-path.patch }