rpm/libqt5-qttools
SHA256
1
0
Fork 0
forked from pool/libqt5-qttools
Code Pull Requests Activity

Accepting request 713202 from home:Vogtinator:qt5.13

Browse Source 
- Link from Qt bindir into %_bindir, not the other way around to fix
  applicationDirPath called from Qt binaries
- Add -qt5 suffix to all binaries in %_bindir
- Drop add-qt5-suffix.patch, no longer necessary

OBS-URL: https://build.opensuse.org/request/show/713202
OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qttools?expand=0&rev=11
This commit is contained in:
Luca Beltrame 2019-07-04 08:38:07 +00:00 committed by Git OBS Bridge
parent c72a8754eb
commit a0fbe1b948
3 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
add-qt5-suffix.patch
View File

@ -1,34 +0,0 @@
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(),

8
libqt5-qttools.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Jul 2 13:47:14 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Link from Qt bindir into %_bindir, not the other way around to fix
applicationDirPath called from Qt binaries
- Add -qt5 suffix to all binaries in %_bindir
- Drop add-qt5-suffix.patch, no longer necessary
-------------------------------------------------------------------
Mon Jul 1 11:55:43 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

18
libqt5-qttools.spec
View File

@ -43,8 +43,6 @@ Source12: linguist5.desktop
Source13: assistant5.desktop
Source14: qdbusviewer5.desktop
Source99: libqt5-qttools-rpmlintrc
# PATCH-FIX-OPENSUSE
Patch100: add-qt5-suffix.patch
BuildRequires: fdupes
%if %{with qdoc}
BuildRequires: clang-devel >= 3.9.0
@ -221,19 +219,18 @@ find %{buildroot}/%{_libdir} -type f -name '*pc' -print -exec perl -pi -e "s, -L
# kill .la files
rm -f %{buildroot}%{_libqt5_libdir}/lib*.la
# put all the binaries to %_bindir, add -qt5 suffix, and symlink them back to %_qt5_bindir
# Link all the binaries with -qt5 suffix to %{_bindir}
mkdir -p %{buildroot}%{_bindir}
pushd %{buildroot}%{_libqt5_bindir}
for i in * ; do
case "${i}" in
assistant|designer|lconvert|linguist|lrelease|lupdate|pixeltool|qcollectiongenerator|qdbus|qdbusviewer|qdoc|qhelpgenerator)
mv $i ../../../bin/${i}-qt5
ln -s ../../../bin/${i}-qt5 .
ln -s ../../../bin/${i}-qt5 $i
ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5
;;
*)
mv $i ../../../bin/
ln -s ../../../bin/$i .
# No conflict with Qt4, so keep the original name for compatibility
ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}
ln -s %{_libqt5_bindir}/$i %{buildroot}%{_bindir}/${i}-qt5
;;
esac
done
@ -262,7 +259,7 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{
%{_bindir}/qtdiag*
%{_bindir}/qtplugininfo*
%{_bindir}/qtattributionsscanner*
%{_bindir}/qdistancefieldgenerator
%{_bindir}/qdistancefieldgenerator*
%{_bindir}/qcollectiongenerator*
%{_libqt5_bindir}/assistant*
%{_libqt5_bindir}/designer*
@ -324,11 +321,10 @@ install -D -m644 src/qdbus/qdbusviewer/images/qdbusviewer-128.png %{buildroot}%{
%license LICENSE.*
%{_bindir}/qdbus-qt5
%{_libqt5_bindir}/qdbus
%{_libqt5_bindir}/qdbus-qt5
%files -n libqt5-qtpaths
%license LICENSE.*
%{_bindir}/qtpaths
%{_bindir}/qtpaths*
%{_libqt5_bindir}/qtpaths
%if %{with qdoc}