Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2015-12-09 19:51:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2015-10-30 13:43:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new/libqt5-creator.changes 2015-12-09 22:23:13.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 4 18:23:17 UTC 2015 - [email protected] + +- Add lldb.diff. + lldb-* also matches lldb-mi which doesn't recognize the + -version switch. Fixes boo#957185. + +------------------------------------------------------------------- New: ---- lldb.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.tlbD94/_old 2015-12-09 22:23:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tlbD94/_new 2015-12-09 22:23:16.000000000 +0100 @@ -31,6 +31,8 @@ Source2: qtcreator.desktop # PATCH-FIX-UPSTREAM qbs-path.diff -- install qbs plugin to sane location Patch0: qbs-path.diff +# PATCH-FIX-UPSTREAM lldb.diff -- exclude lldb-mi* from autodetection +Patch1: lldb.diff BuildRequires: gdb BuildRequires: libQt5Sql5-sqlite >= %{qt5_version} BuildRequires: libQt5WebKitWidgets-devel >= %{qt5_version} @@ -64,6 +66,7 @@ %prep %setup -q -n %{rname}-opensource-src-%{version} %patch0 -p1 +%patch1 -p1 %build sed -i s,libexec/qtcreator,%{_lib}/qtcreator/libexec,g qtcreator.qbs ++++++ lldb.diff ++++++ diff --git a/src/plugins/debugger/debuggeritemmanager.cpp b/src/plugins/debugger/debuggeritemmanager.cpp index 0c3abc3..f8e8413 100644 --- a/src/plugins/debugger/debuggeritemmanager.cpp +++ b/src/plugins/debugger/debuggeritemmanager.cpp @@ -253,6 +253,7 @@ void DebuggerItemManager::autoDetectGdbOrLldbDebuggers() dir.setPath(base); foreach (const QString &entry, dir.entryList()) { if (entry.startsWith(QLatin1String("lldb-platform-")) + || entry.startsWith(QLatin1String("lldb-mi")) || entry.startsWith(QLatin1String("lldb-gdbserver-"))) { continue; }
