From a818787bbc21e5763e17118eaa05ce87925a9891 Mon Sep 17 00:00:00 2001 From: peijiankang Date: Mon, 15 Sep 2025 12:57:45 +0800 Subject: [PATCH] modify lupdate-qt5 run error --- 0001-modify-lupdate-qt5-run-error.patch | 24 ++++++++++++++++++++++++ qt5-qttools.spec | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) 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..0e16ac7 --- /dev/null +++ b/0001-modify-lupdate-qt5-run-error.patch @@ -0,0 +1,24 @@ +diff -Nur qttools-everywhere-src-5.15.16_back/src/linguist/lupdate-pro/main.cpp qttools-everywhere-src-5.15.16_git/src/linguist/lupdate-pro/main.cpp +--- qttools-everywhere-src-5.15.16_back/src/linguist/lupdate-pro/main.cpp 2025-09-15 10:51:48.568207374 +0800 ++++ qttools-everywhere-src-5.15.16_git/src/linguist/lupdate-pro/main.cpp 2025-09-15 10:56:49.729733799 +0800 +@@ -139,6 +139,20 @@ + } else if (isProOrPriFile(arg)) { + lprodumpOptions << arg; + hasProFiles = true; ++ }else if (arg.startsWith(QLatin1String("@"))) { ++ QFile lstFile(arg.mid(1)); ++ if (!lstFile.open(QIODevice::ReadOnly)) { ++ printErr(LU::tr("lupdate-pro error: List file '%1' is not readable.\n") ++ .arg(lstFile.fileName())); ++ return 1; ++ } ++ while (!lstFile.atEnd()) { ++ QString lineContent = QString::fromLocal8Bit(lstFile.readLine().trimmed()); ++ if (isProOrPriFile(lineContent)) { ++ lprodumpOptions << lineContent; ++ hasProFiles = true; ++ } ++ } + } else { + lupdateOptions << arg; + } diff --git a/qt5-qttools.spec b/qt5-qttools.spec index afafede..7c05f44 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -5,7 +5,7 @@ Name: qt5-qttools Version: 5.15.16 -Release: 1 +Release: 2 Summary: Qt5 QtTool module License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: https://www.qt.io @@ -31,6 +31,7 @@ Patch102: qttools-opensource-src-5.13.2-runqttools-with-qt5-suffix.patch # Link against libclang-cpp.so # https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package Patch105: Link-against-libclang-cpp.so-instead-of-the-clang-co.patch +Patch106: 0001-modify-lupdate-qt5-run-error.patch BuildRequires: make BuildRequires: cmake desktop-file-utils /usr/bin/file qt5-rpm-macros >= %{version} @@ -354,6 +355,9 @@ cd - %changelog +* Mon Sep 15 2025 peijiankang - 5.15.16-2 +- add 0001-modify-lupdate-qt5-run-error.patch + * Thu Apr 10 2025 Funda Wang - 5.15.16-1 - update to 5.15.16 -- Gitee