qt-creator: Update to 11.0.3
This commit is contained in:
@@ -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()
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user