mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-28 16:32:57 +02:00
qt6-tools: update to 6.5.0.
This commit is contained in:
parent
26967e285a
commit
69f8370524
2 changed files with 38 additions and 8 deletions
30
srcpkgs/qt6-tools/patches/pie.patch
Normal file
30
srcpkgs/qt6-tools/patches/pie.patch
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
--- a/src/linguist/lupdate/CMakeLists.txt 2023-03-28 16:23:12.000000000 +0200
|
||||||
|
+++ - 2023-04-03 20:56:23.919801770 +0200
|
||||||
|
@@ -95,11 +95,11 @@
|
||||||
|
WrapLibClang::WrapLibClang
|
||||||
|
)
|
||||||
|
|
||||||
|
-if(QT_FEATURE_clangcpp)
|
||||||
|
- # If libclangTooling.a is not built with -fPIE enabled we cannot link it to lupdate.
|
||||||
|
- # TODO: Re-enable PIE once clang is built with PIE in provisioning.
|
||||||
|
- set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
|
||||||
|
-endif()
|
||||||
|
+#if(QT_FEATURE_clangcpp)
|
||||||
|
+# # If libclangTooling.a is not built with -fPIE enabled we cannot link it to lupdate.
|
||||||
|
+# # TODO: Re-enable PIE once clang is built with PIE in provisioning.
|
||||||
|
+# set_target_properties(${target_name} PROPERTIES POSITION_INDEPENDENT_CODE FALSE)
|
||||||
|
+#endif()
|
||||||
|
|
||||||
|
qt_internal_extend_target(${target_name} CONDITION MSVC
|
||||||
|
DEFINES _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
|
||||||
|
--- a/src/qdoc/CMakeLists.txt 2023-03-28 16:23:12.000000000 +0200
|
||||||
|
+++ - 2023-04-03 20:56:53.148131457 +0200
|
||||||
|
@@ -98,7 +98,7 @@
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
-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
|
||||||
|
LIBRARIES
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'qt6-tools'
|
# Template file for 'qt6-tools'
|
||||||
pkgname=qt6-tools
|
pkgname=qt6-tools
|
||||||
version=6.4.2
|
version=6.5.0
|
||||||
revision=2
|
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
|
||||||
-DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON
|
-DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=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=a31387916184e4a5ef522d3ea841e8e931cc0f88be0824a7a354a572d5826c68
|
checksum=49c33d96b0a44988be954269b8ce3d1a495b439726e03a6be7c0d50a686369c4
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
|
configure_args+=" -DQT_FORCE_BUILD_TOOLS=TRUE"
|
||||||
|
@ -28,9 +28,9 @@ if [ "$XBPS_CHECK_PKGS" ]; then
|
||||||
configure_args+=" -DQT_BUILD_TESTS=ON"
|
configure_args+=" -DQT_BUILD_TESTS=ON"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
post_build() {
|
#post_build() {
|
||||||
ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
|
# ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
|
||||||
}
|
#}
|
||||||
|
|
||||||
do_check() {
|
do_check() {
|
||||||
cd build
|
cd build
|
||||||
|
@ -67,12 +67,12 @@ qt6-tools-devel_package() {
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
local _f
|
local _f
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
vmove usr/lib/metatypes
|
vmove usr/lib/qt6/metatypes
|
||||||
vmove usr/lib/pkgconfig
|
vmove usr/lib/pkgconfig
|
||||||
vmove usr/lib/qt6/mkspecs
|
vmove usr/lib/qt6/mkspecs
|
||||||
vmove "usr/lib/*.so"
|
vmove "usr/lib/*.so"
|
||||||
vmove "usr/lib/*.prl"
|
vmove "usr/lib/*.prl"
|
||||||
vmove usr/share/qt6/modules
|
vmove usr/lib/qt6/modules
|
||||||
for _f in ${DESTDIR}/usr/lib/cmake/*; do
|
for _f in ${DESTDIR}/usr/lib/cmake/*; do
|
||||||
case "$_f" in
|
case "$_f" in
|
||||||
*ToolsTools|*/Qt6LinguistTools) ;;
|
*ToolsTools|*/Qt6LinguistTools) ;;
|
||||||
|
|
Loading…
Add table
Reference in a new issue