qt6-tools: update to 6.6.0.
This commit is contained in:
parent
aaf6d9c0a6
commit
6119716bd0
|
@ -1,5 +1,5 @@
|
||||||
--- a/src/linguist/lupdate/CMakeLists.txt 2023-03-28 16:23:12.000000000 +0200
|
--- a/src/linguist/lupdate/CMakeLists.txt 2023-10-03 20:26:34.000000000 +0200
|
||||||
+++ - 2023-04-03 20:56:23.919801770 +0200
|
+++ - 2023-10-13 22:42:43.023536533 +0200
|
||||||
@@ -95,11 +95,11 @@
|
@@ -95,11 +95,11 @@
|
||||||
WrapLibClang::WrapLibClang
|
WrapLibClang::WrapLibClang
|
||||||
)
|
)
|
||||||
|
@ -17,14 +17,14 @@
|
||||||
|
|
||||||
qt_internal_extend_target(${target_name} CONDITION MSVC
|
qt_internal_extend_target(${target_name} CONDITION MSVC
|
||||||
DEFINES _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
|
DEFINES _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
|
||||||
--- a/src/qdoc/CMakeLists.txt 2023-03-28 16:23:12.000000000 +0200
|
--- a/src/qdoc/qdoc/CMakeLists.txt 2023-10-03 20:26:34.000000000 +0200
|
||||||
+++ - 2023-04-03 20:56:53.148131457 +0200
|
+++ - 2023-10-13 22:43:26.354327742 +0200
|
||||||
@@ -98,7 +98,7 @@
|
@@ -100,7 +100,7 @@
|
||||||
|
|
||||||
# If libclangTooling.a is not built with -fPIE enabled we cannot link it to qdoc.
|
# If libclangTooling.a is not built with -fPIE enabled we cannot link it to qdoc.
|
||||||
# TODO: Re-enable PIE once clang is built with PIE in provisioning.
|
# TODO: Re-enable PIE once clang is built with PIE in provisioning.
|
||||||
-set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
|
-set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
|
||||||
+#set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
|
+#set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
|
||||||
|
|
||||||
qt_internal_extend_target(${target_name} CONDITION TARGET Qt::QmlPrivate
|
qt_internal_extend_target(${target_name} CONDITION (WIN32 AND ICC) OR MSVC
|
||||||
LIBRARIES
|
LINK_OPTIONS
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'qt6-tools'
|
# Template file for 'qt6-tools'
|
||||||
pkgname=qt6-tools
|
pkgname=qt6-tools
|
||||||
version=6.5.2
|
version=6.6.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
|
configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
|
||||||
|
@ -16,7 +16,7 @@ maintainer="John <me@johnnynator.dev>"
|
||||||
license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
|
license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
|
||||||
homepage="https://qt.io/"
|
homepage="https://qt.io/"
|
||||||
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
|
distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
|
||||||
checksum=551ffb22751d8fd4d88e9ebd55b9131f4ca55341ee497fdbbba4da8d10d94341
|
checksum=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
|
configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
|
||||||
|
@ -37,7 +37,7 @@ do_check() {
|
||||||
export QT_BUILD_BIN_PATH=$wrksrc/build/lib/qt6/bin
|
export QT_BUILD_BIN_PATH=$wrksrc/build/lib/qt6/bin
|
||||||
# Some of these tests expect that qt6-tools is already
|
# Some of these tests expect that qt6-tools is already
|
||||||
# installed in /usr/lib/qt6
|
# installed in /usr/lib/qt6
|
||||||
ctest -E 'tst_(lrelease|lconvert|lupdate|qtattributionsscanner|qhelpcontentmodel|qhelpenginecore|qhelpgenerator|qhelpindexmode)'
|
ctest -E 'tst_(lrelease|lconvert|lupdate|qtattributionsscanner|qhelpcontentmodel|qhelpenginecore|qhelpgenerator|qhelpindexmode|generatedOutput)'
|
||||||
}
|
}
|
||||||
|
|
||||||
qt6-help_package() {
|
qt6-help_package() {
|
||||||
|
|
Loading…
Reference in New Issue