mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
qt6-tools: update to 6.3.1.
This commit is contained in:
Đoàn Trần Công Danh
parent
1ab116352e
commit
ae6ac39ab4
2 changed files with 88 additions and 5 deletions
68
srcpkgs/qt6-tools/patches/qlitehtml.patch
Normal file
68
srcpkgs/qt6-tools/patches/qlitehtml.patch
Normal file
|
|
@ -0,0 +1,68 @@
|
||||||
|
--- a/src/assistant/CMakeLists.txt
|
||||||
|
+++ b/src/assistant/CMakeLists.txt
|
||||||
|
@@ -34,7 +34,9 @@ if(TARGET qlitehtml)
|
||||||
|
qt_internal_set_exceptions_flags(litehtml OFF)
|
||||||
|
qt_disable_warnings(litehtml)
|
||||||
|
qt_disable_warnings(qlitehtml)
|
||||||
|
- qt_disable_warnings(gumbo)
|
||||||
|
+ if (TARGET gumbo)
|
||||||
|
+ qt_disable_warnings(gumbo)
|
||||||
|
+ endif()
|
||||||
|
qt_handle_multi_config_output_dirs(qlitehtml)
|
||||||
|
set_target_properties(qlitehtml PROPERTIES
|
||||||
|
RUNTIME_OUTPUT_DIRECTORY "${QT_BUILD_DIR}/${INSTALL_BINDIR}"
|
||||||
|
--- a/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
|
||||||
|
+++ b/src/assistant/qlitehtml/src/3rdparty/litehtml/CMakeLists.txt
|
||||||
|
@@ -196,52 +196,6 @@ endif()
|
||||||
|
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc PROPERTIES GENERATED TRUE)
|
||||||
|
|
||||||
|
# Tests
|
||||||
|
-
|
||||||
|
-if (BUILD_TESTING)
|
||||||
|
- include(FetchContent)
|
||||||
|
- FetchContent_Declare(
|
||||||
|
- googletest
|
||||||
|
- URL https://github.com/google/googletest/archive/609281088cfefc76f9d0ce82e1ff6c30cc3591e5.zip
|
||||||
|
- )
|
||||||
|
- # For Windows: Prevent overriding the parent project's compiler/linker settings
|
||||||
|
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||||||
|
- FetchContent_GetProperties(googletest)
|
||||||
|
- if(NOT googletest_POPULATED)
|
||||||
|
- FetchContent_Populate(googletest)
|
||||||
|
- add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
|
||||||
|
- endif()
|
||||||
|
-
|
||||||
|
- enable_testing()
|
||||||
|
-
|
||||||
|
- set(TEST_NAME ${PROJECT_NAME}_tests)
|
||||||
|
-
|
||||||
|
- add_executable(
|
||||||
|
- ${TEST_NAME}
|
||||||
|
- ${TEST_LITEHTML}
|
||||||
|
- ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc
|
||||||
|
- )
|
||||||
|
-
|
||||||
|
- set_target_properties(${TEST_NAME} PROPERTIES
|
||||||
|
- CXX_STANDARD 11
|
||||||
|
- C_STANDARD 99
|
||||||
|
- PUBLIC_HEADER "${HEADER_LITEHTML}"
|
||||||
|
- )
|
||||||
|
-
|
||||||
|
- target_include_directories(
|
||||||
|
- ${TEST_NAME}
|
||||||
|
- PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/containers
|
||||||
|
- )
|
||||||
|
-
|
||||||
|
- target_link_libraries(
|
||||||
|
- ${TEST_NAME}
|
||||||
|
- ${PROJECT_NAME}
|
||||||
|
- gtest_main
|
||||||
|
- )
|
||||||
|
-
|
||||||
|
- include(GoogleTest)
|
||||||
|
- gtest_discover_tests(${TEST_NAME})
|
||||||
|
-endif()
|
||||||
|
-
|
||||||
|
# set(TEST_NAME ${PROJECT_NAME}_tests)
|
||||||
|
# add_executable(${TEST_NAME} ${TEST_LITEHTML} ${CMAKE_CURRENT_SOURCE_DIR}/src/master.css.inc)
|
||||||
|
# set_target_properties(${TEST_NAME} PROPERTIES
|
||||||
|
|
@ -1,23 +1,35 @@
|
||||||
# Template file for 'qt6-tools'
|
# Template file for 'qt6-tools'
|
||||||
pkgname=qt6-tools
|
pkgname=qt6-tools
|
||||||
version=6.3.0
|
version=6.3.1
|
||||||
revision=1
|
revision=1
|
||||||
wrksrc="qttools-everywhere-src-${version}"
|
wrksrc="qttools-everywhere-src-${version}"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DQT_HOST_PATH=/usr "
|
configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
|
||||||
hostmakedepends="qt6-base-devel perl"
|
-DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON"
|
||||||
makedepends="qt6-base-devel libatomic-devel"
|
hostmakedepends="qt6-base-devel perl qt6-plugin-sqlite"
|
||||||
|
makedepends="qt6-base-devel libatomic-devel qt6-plugin-sqlite
|
||||||
|
gumbo-parser-devel icu-devel"
|
||||||
short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
|
short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
|
||||||
maintainer="John <me@johnnynator.dev>"
|
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=fce94688ea925782a2879347584991f854630daadba6c52aed6d93e33cd0b19c
|
checksum=c412750f2aa3beb93fce5f30517c607f55daaeb7d0407af206a8adf917e126c1
|
||||||
|
|
||||||
|
if [ "$CROSS_BUILD" ]; then
|
||||||
|
configure_args+=" -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=TRUE"
|
||||||
|
hostmakedepends+=" qt6-tools-devel"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
if [ "$XBPS_CHECK_PKGS" ]; then
|
if [ "$XBPS_CHECK_PKGS" ]; then
|
||||||
configure_args+=" -DQT_BUILD_TESTS=ON"
|
configure_args+=" -DQT_BUILD_TESTS=ON"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
post_build() {
|
||||||
|
ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
|
||||||
|
}
|
||||||
|
|
||||||
do_check() {
|
do_check() {
|
||||||
cd build
|
cd build
|
||||||
# Some of these tests expect that qt6-tools is already
|
# Some of these tests expect that qt6-tools is already
|
||||||
|
|
@ -31,8 +43,11 @@ qt6-tools-devel_package() {
|
||||||
pkg_install() {
|
pkg_install() {
|
||||||
vmove usr/include
|
vmove usr/include
|
||||||
vmove usr/lib/cmake
|
vmove usr/lib/cmake
|
||||||
|
vmove usr/lib/metatypes
|
||||||
|
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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue