From 0333cc164fb67cca13bc35c3e417aab40f7d3f33dddc67252f82c8b40adedeb7 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 21 Jan 2015 20:52:56 +0000 Subject: [PATCH] Accepting request 280863 from KDE:Qt5 1 OBS-URL: https://build.opensuse.org/request/show/280863 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qttools?expand=0&rev=20 --- fix-for-opensuse-qmake-qt5.patch | 27 +++++++++++++++++++++++++++ libqt5-qttools.changes | 5 +++++ libqt5-qttools.spec | 6 ++++++ 3 files changed, 38 insertions(+) create mode 100644 fix-for-opensuse-qmake-qt5.patch diff --git a/fix-for-opensuse-qmake-qt5.patch b/fix-for-opensuse-qmake-qt5.patch new file mode 100644 index 0000000..a6f5781 --- /dev/null +++ b/fix-for-opensuse-qmake-qt5.patch @@ -0,0 +1,27 @@ +diff -ru src.org/linguist/lrelease/main.cpp src/linguist/lrelease/main.cpp +--- src.org/linguist/lrelease/main.cpp 2014-12-06 00:24:59.000000000 +0800 ++++ src/linguist/lrelease/main.cpp 2015-01-12 10:50:16.717756760 +0800 +@@ -310,9 +310,9 @@ + option.qmake_abslocation = QString::fromLocal8Bit(qgetenv("QMAKE")); + if (option.qmake_abslocation.isEmpty()) + #ifdef QT_BOOTSTRAPPED +- option.qmake_abslocation = binDir + QLatin1String("/qmake"); ++ option.qmake_abslocation = binDir + QLatin1String("/qmake-qt5"); + #else +- option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake"); ++ option.qmake_abslocation = app.applicationDirPath() + QLatin1String("/qmake-qt5"); + #endif + option.initProperties(); + QMakeVfs vfs; +diff -ru src.org/linguist/lupdate/main.cpp src/linguist/lupdate/main.cpp +--- src.org/linguist/lupdate/main.cpp 2014-12-06 00:24:59.000000000 +0800 ++++ src/linguist/lupdate/main.cpp 2015-01-12 10:50:16.718756760 +0800 +@@ -1048,7 +1048,7 @@ + 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 e336e48..5f38df4 100644 --- a/libqt5-qttools.changes +++ b/libqt5-qttools.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 12 03:49:34 UTC 2015 - liujianfeng1994@gmail.com + +- Add fix-for-opensuse-qmake-qt5.patch + * Fix lupdate can't find qmake configuration file default (rh#1009893) +------------------------------------------------------------------- Wed Dec 10 11:00:12 UTC 2014 - hrvoje.senjan@gmail.com - Update to 5.4 Final diff --git a/libqt5-qttools.spec b/libqt5-qttools.spec index 1e519ff..0350b6b 100644 --- a/libqt5-qttools.spec +++ b/libqt5-qttools.spec @@ -35,6 +35,10 @@ Source11: designer5.desktop Source12: linguist5.desktop Source13: assistant5.desktop Source14: qdbusviewer5.desktop + +# PATCH-FIX-OPENSUSE fix-for-opensuse-qmake-qt5.patch [rh#1009893] liujianfeng1994@gmail.com +Patch1: fix-for-opensuse-qmake-qt5.patch + BuildRequires: fdupes BuildRequires: libQt5WebKitWidgets-devel >= %{version} BuildRequires: libqt5-qtbase-devel >= %{version} @@ -59,6 +63,8 @@ This package contains base tools, like string, xml, and network handling. %prep %setup -q -n qttools-opensource-src-%{real_version} +%patch1 -p0 + %package devel Summary: Qt Development Kit Group: Development/Libraries/X11