From c72a8754eb98119811a9df92312f383a3630cec36086707285656249ebccb9f8 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Mon, 1 Jul 2019 11:56:21 +0000 Subject: [PATCH] - Merge fix-for-opensuse-lrelease-qt5.patch and fix-for-opensuse-qmake-qt5.patch into add-qt5-suffix.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=10 --- add-qt5-suffix.patch | 34 +++++++++++++++++++++++++++++ fix-for-opensuse-lrelease-qt5.patch | 14 ------------ fix-for-opensuse-qmake-qt5.patch | 13 ----------- libqt5-qttools.changes | 6 +++++ libqt5-qttools.spec | 6 ++--- 5 files changed, 42 insertions(+), 31 deletions(-) create mode 100644 add-qt5-suffix.patch delete mode 100644 fix-for-opensuse-lrelease-qt5.patch delete mode 100644 fix-for-opensuse-qmake-qt5.patch diff --git a/add-qt5-suffix.patch b/add-qt5-suffix.patch new file mode 100644 index 0000000..31b7185 --- /dev/null +++ b/add-qt5-suffix.patch @@ -0,0 +1,34 @@ +From: Fabian Vogt +Subject: Add -qt5 suffix to executables + +To allow parallel installation of different versions of Qt, binaries in $PATH +are suffixed. + +Original authors are liujianfeng1994@gmail.com and jslaby@suse.cz. + +--- +Index: qttools-everywhere-src-5.13.0/src/linguist/lrelease-pro/main.cpp +=================================================================== +--- qttools-everywhere-src-5.13.0.orig/src/linguist/lrelease-pro/main.cpp ++++ qttools-everywhere-src-5.13.0/src/linguist/lrelease-pro/main.cpp +@@ -145,6 +145,6 @@ int main(int argc, char **argv) + projectDescription->setAutoRemove(false); + lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName(); + +- runQtTool(QStringLiteral("lrelease"), lreleaseOptions); ++ runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions); + return 0; + } +Index: qttools-everywhere-src-5.13.0/src/linguist/lprodump/main.cpp +=================================================================== +--- qttools-everywhere-src-5.13.0.orig/src/linguist/lprodump/main.cpp ++++ qttools-everywhere-src-5.13.0/src/linguist/lprodump/main.cpp +@@ -438,7 +438,7 @@ int main(int argc, char **argv) + ProFileGlobals option; + option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); + if (option.qmake_abslocation.isEmpty()) +- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); ++ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); + option.debugLevel = proDebug; + option.initProperties(); + option.setCommandLineArguments(QDir::currentPath(), diff --git a/fix-for-opensuse-lrelease-qt5.patch b/fix-for-opensuse-lrelease-qt5.patch deleted file mode 100644 index e2f202b..0000000 --- a/fix-for-opensuse-lrelease-qt5.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - src/linguist/lrelease-pro/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/src/linguist/lrelease-pro/main.cpp -+++ b/src/linguist/lrelease-pro/main.cpp -@@ -145,6 +145,6 @@ int main(int argc, char **argv) - projectDescription->setAutoRemove(false); - lreleaseOptions << QStringLiteral("-project") << projectDescription->fileName(); - -- runQtTool(QStringLiteral("lrelease"), lreleaseOptions); -+ runQtTool(QStringLiteral("lrelease-qt5"), lreleaseOptions); - return 0; - } diff --git a/fix-for-opensuse-qmake-qt5.patch b/fix-for-opensuse-qmake-qt5.patch deleted file mode 100644 index dec7910..0000000 --- a/fix-for-opensuse-qmake-qt5.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: qttools-everywhere-src-5.13.0-beta1/src/linguist/lprodump/main.cpp -=================================================================== ---- qttools-everywhere-src-5.13.0-beta1.orig/src/linguist/lprodump/main.cpp -+++ qttools-everywhere-src-5.13.0-beta1/src/linguist/lprodump/main.cpp -@@ -438,7 +438,7 @@ int main(int argc, char **argv) - ProFileGlobals option; - option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); - if (option.qmake_abslocation.isEmpty()) -- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); -+ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); - option.debugLevel = proDebug; - option.initProperties(); - option.setCommandLineArguments(QDir::currentPath(), diff --git a/libqt5-qttools.changes b/libqt5-qttools.changes index bb862ca..0690987 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 1 11:55:43 UTC 2019 - Fabian Vogt + +- Merge fix-for-opensuse-lrelease-qt5.patch and + fix-for-opensuse-qmake-qt5.patch into add-qt5-suffix.patch + ------------------------------------------------------------------- Mon Jul 1 11:18:26 UTC 2019 - Jiri Slaby diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 5b76f5f..23bc2f6 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -43,10 +43,8 @@ Source12: linguist5.desktop Source13: assistant5.desktop Source14: qdbusviewer5.desktop Source99: libqt5-qttools-rpmlintrc -# PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1994@gmail.com -Patch0: fix-for-opensuse-qmake-qt5.patch -# PATCH-FIX-OPENSUSE fix-for-opensuse-lrelease-qt5.patch jslaby@suse.cz -Patch1: fix-for-opensuse-lrelease-qt5.patch +# PATCH-FIX-OPENSUSE +Patch100: add-qt5-suffix.patch BuildRequires: fdupes %if %{with qdoc} BuildRequires: clang-devel >= 3.9.0