From b669f69ffb08b60dbc667fa05f9b6a96dc43eaeb Mon Sep 17 00:00:00 2001 From: gitea-action Date: Fri, 27 Sep 2024 18:01:56 +0800 Subject: [PATCH] qt6base/qt6tools: update to 6.7.3 --- qt6base/Makefile | 4 +- qt6tools/Makefile | 4 +- ...e-lconvert-lrelease-in-no-gui-builds.patch | 48 ------------------- 3 files changed, 4 insertions(+), 52 deletions(-) delete mode 100644 qt6tools/patches/200-CMake-Re-enable-lupdate-lconvert-lrelease-in-no-gui-builds.patch diff --git a/qt6base/Makefile b/qt6base/Makefile index 69f617a..ae84d0d 100644 --- a/qt6base/Makefile +++ b/qt6base/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6base -PKG_VERSION:=6.7.2 +PKG_VERSION:=6.7.3 PKG_RELEASE:=1 PKG_SOURCE:=qtbase-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/qt/qtbase/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=96b96e4fd0fc306502ed8b94a34cfa0bacc8a25d43c2e958dd6772b28f6b0e42 +PKG_HASH:=65771d1618cab08ec5e9bbfdc265b5d2ce2ccf0373143d7d9d139647a7196aec HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qtbase-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/qtbase-$(PKG_VERSION) diff --git a/qt6tools/Makefile b/qt6tools/Makefile index b77e797..ad10501 100644 --- a/qt6tools/Makefile +++ b/qt6tools/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt6tools -PKG_VERSION:=6.7.2 +PKG_VERSION:=6.7.3 PKG_RELEASE:=1 PKG_SOURCE:=qttools-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/qt/qttools/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=3ae2db630606edf94cc368691ee1da9c0bae7a06ff46c544c459cece8b60b62a +PKG_HASH:=69ea13037677cf5a6971ebf92448ed662aa92029399687c871eb3e2ac1d7831c HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/qttools-$(PKG_VERSION) diff --git a/qt6tools/patches/200-CMake-Re-enable-lupdate-lconvert-lrelease-in-no-gui-builds.patch b/qt6tools/patches/200-CMake-Re-enable-lupdate-lconvert-lrelease-in-no-gui-builds.patch deleted file mode 100644 index 8163c97..0000000 --- a/qt6tools/patches/200-CMake-Re-enable-lupdate-lconvert-lrelease-in-no-gui-builds.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 8bb2a0c02b305f8ae8611e501fe7dd3d2b4468a6 Mon Sep 17 00:00:00 2001 -From: Joerg Bornemann -Date: Tue, 11 Jun 2024 10:47:18 +0200 -Subject: [PATCH] CMake: Re-enable lupdate/lconvert/lrelease in no-gui builds - -This reverts 8dba0e48a0f7d3487b318a74f80f2d8e59c320f9 which disabled the -'linguist' feature if the 'printsupport' feature wasn't available. -However, the 'linguist' feature controls not only the Qt Linguist -application but also the command line tools lupdate, lconvert, and -lrelease. In no-gui builds, which also disable printsupport, the command -line tools were unexpectedly missing. - -Fix the issue by extending the feature condition in -src/linguist/CMakeLists.txt. As drive-by, fix the FEATURE_png condition -that was still in QMake form from the initial conversion. - -Fixes: QTBUG-126189 -Task-number: QTBUG-125066 -Change-Id: I59ebb82fd5823165b307ffbc967d7fd89a071ede -Reviewed-by: Alexey Edelev -Reviewed-by: Alexandru Croitor -(cherry picked from commit 4be1823e4d459c89717e791ef27fd463ad04cb2b) -Reviewed-by: Qt Cherry-pick Bot -(cherry picked from commit aa9f8db49db2e7734c187445b8c3c56768f6e546) ---- - ---- a/configure.cmake -+++ b/configure.cmake -@@ -74,7 +74,6 @@ qt_feature("kmap2qmap" PRIVATE - qt_feature("linguist" PRIVATE - LABEL "Qt Linguist" - PURPOSE "Qt Linguist can be used by translator to translate text in Qt applications." -- CONDITION TARGET Qt::PrintSupport - ) - qt_feature("pixeltool" PRIVATE - LABEL "pixeltool" ---- a/src/linguist/CMakeLists.txt -+++ b/src/linguist/CMakeLists.txt -@@ -14,7 +14,8 @@ add_subdirectory(lrelease) - add_subdirectory(lrelease-pro) - add_subdirectory(lupdate) - add_subdirectory(lupdate-pro) --if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton AND TARGET Qt::Widgets AND NOT no-png) -+if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton -+ AND QT_FEATURE_png AND QT_FEATURE_printsupport AND TARGET Qt::Widgets) - add_subdirectory(linguist) - endif() -