From a5aa50e7fb2cdb5966da5cd0c652f6e66c660207 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Tue, 22 Feb 2022 13:47:49 +0800 Subject: [PATCH] modify lupdate-qt5 run error (cherry picked from commit 184413eef51920165de13fff317e0e2ef2d18e12) --- 0001-modify-lupdate-qt5-run-error.patch | 26 +++++++++++++++++++++++++ qt5-qttools.spec | 8 ++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 0001-modify-lupdate-qt5-run-error.patch diff --git a/0001-modify-lupdate-qt5-run-error.patch b/0001-modify-lupdate-qt5-run-error.patch new file mode 100644 index 0000000..bb37d33 --- /dev/null +++ b/0001-modify-lupdate-qt5-run-error.patch @@ -0,0 +1,26 @@ +From bf31934b1916c6b8511e6daecec2a3d2748983ea Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Tue, 22 Feb 2022 13:11:24 +0800 +Subject: [PATCH] modify lupdate-qt5 run error + +--- + src/linguist/lupdate/main.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp +index 104971e..8252354 100644 +--- a/src/linguist/lupdate/main.cpp ++++ b/src/linguist/lupdate/main.cpp +@@ -963,7 +963,8 @@ int main(int argc, char **argv) + + QString errorString; + if (!proFiles.isEmpty()) { +- runQtTool(QStringLiteral("lupdate-pro"), app.arguments().mid(1)); ++ proFiles += app.arguments().mid(2); ++ runQtTool(QStringLiteral("lupdate-pro"), proFiles); + return 0; + } + +-- +2.33.0 + diff --git a/qt5-qttools.spec b/qt5-qttools.spec index a101ded..89e9935 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -1,6 +1,6 @@ Name: qt5-qttools Version: 5.15.2 -Release: 1 +Release: 2 Summary: Qt5 QtTool module License: LGPLv3 or LGPLv2 Url: http://www.qt.io @@ -14,6 +14,7 @@ Source4: qdbusviewer.desktop Patch0: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch Patch1: qttools-opensource-src-5.7-add-libatomic.patch Patch2: 0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch +Patch3: 0001-modify-lupdate-qt5-run-error.patch BuildRequires: make BuildRequires: cmake desktop-file-utils /usr/bin/file qt5-rpm-macros >= %{version} @@ -82,7 +83,7 @@ This package contains tools for Qt5 doc. %patch1 -p1 -b .libatomic %endif %patch2 -p1 -b .libclang-cpp - +%patch3 -p1 %build %{qmake_qt5} @@ -259,6 +260,9 @@ cd - %changelog +* Tue Feb 22 2022 peijiankang - 5.15.2-2 +- modify lupdate-qt5 run error + * Wed Oct 13 2021 peijiankang - 5.15.2-1 - update to upstream version 5.15.2 -- Gitee