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

Accepting request 713346 from KDE:Qt:5.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

- Merge fix-for-opensuse-lrelease-qt5.patch and
  fix-for-opensuse-qmake-qt5.patch into add-qt5-suffix.patch

- add fix-for-opensuse-lrelease-qt5.patch
  Fixes build of other projects as our lrelease is called lrelease-qt5.

OBS-URL: https://build.opensuse.org/request/show/713346
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2019-07-13 11:45:13 +00:00 committed by Git OBS Bridge
commit a4c6ad5f3e
3 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

20
libqt5-qttools.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
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>
- 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>
- add fix-for-opensuse-lrelease-qt5.patch
Fixes build of other projects as our lrelease is called lrelease-qt5.
-------------------------------------------------------------------
Wed Jun 19 11:24:38 UTC 2019 - fabian@ritter-vogt.de

25
libqt5-qttools.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libqt5-qttools
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,9 +12,10 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%if 0%{?suse_version} >= 1330
%bcond_without qdoc
%else
@ -28,7 +29,7 @@ Name: libqt5-qttools
Version: 5.13.0
Release: 0
Summary: Qt 5 QtTools Module
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only
Group: Development/Libraries/X11
Url: https://www.qt.io
%define base_name libqt5
@ -42,8 +43,6 @@ 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
BuildRequires: fdupes
%if %{with qdoc}
BuildRequires: clang-devel >= 3.9.0
@ -220,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
@ -261,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*
@ -323,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}