pool/libqt5-qttools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Merge fix-for-opensuse-lrelease-qt5.patch and

Browse Source 
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
This commit is contained in:
Fabian Vogt 2019-07-01 11:56:21 +00:00 committed by Git OBS Bridge
parent f1a5c04957
commit c72a8754eb
5 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
add-qt5-suffix.patch Normal file
View File

@ -0,0 +1,34 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
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(),

14
fix-for-opensuse-lrelease-qt5.patch
View File

@ -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;
}

13
fix-for-opensuse-qmake-qt5.patch
View File

@ -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(),

6
libqt5-qttools.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 1 11:55:43 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- 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 <jslaby@suse.com> Mon Jul 1 11:18:26 UTC 2019 - Jiri Slaby <jslaby@suse.com>

6
libqt5-qttools.spec
View File

@ -43,10 +43,8 @@ Source12: linguist5.desktop
Source13: assistant5.desktop Source13: assistant5.desktop
Source14: qdbusviewer5.desktop Source14: qdbusviewer5.desktop
Source99: libqt5-qttools-rpmlintrc Source99: libqt5-qttools-rpmlintrc
# PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1994@gmail.com # PATCH-FIX-OPENSUSE
Patch0: fix-for-opensuse-qmake-qt5.patch Patch100: add-qt5-suffix.patch
# PATCH-FIX-OPENSUSE fix-for-opensuse-lrelease-qt5.patch jslaby@suse.cz
Patch1: fix-for-opensuse-lrelease-qt5.patch
BuildRequires: fdupes BuildRequires: fdupes
%if %{with qdoc} %if %{with qdoc}
BuildRequires: clang-devel >= 3.9.0 BuildRequires: clang-devel >= 3.9.0