[SCM] qtcreator packaging branch, master, updated. debian/3.6.0-1-6-ga19b780

[Adam Majer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtcreator.git;a=commitdiff;h=891e379

The following commit has been merged in the master branch:
commit 891e37979d98ee382d1496d3bff00aaeb2977a44
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 26 14:34:36 2016 -0600

    Update hardcoded libexec path inside the binary
    
    The libexec path is hardcoded in ICore::libexecPath(). This results in
    failure to load helper executables, like clangcodemodel, even if these
    exist in the common PATH.
    
    Update the hardcoded path to the actual location of the helper
    binaries.
---
 debian/changelog                   |  4 +++-
 debian/patches/remove_libexec.diff | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8a0a12..eea7fe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 qtcreator (3.6.0-2) UNRELEASED; urgency=medium
 
   [ Adam Majer ]
-  * Move libexec executables out from under /usr/bin to under /usr/lib
+  * Move libexec executables out from under /usr/bin to under /usr/lib and
+    point QtCreator's internal libexec path to the new location. This
+    allows plugins like Clangbackend to function once more. (closes: #812531)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 19 Jan 2016 15:03:51 -0600
 
diff --git a/debian/patches/remove_libexec.diff b/debian/patches/remove_libexec.diff
index cffc9ca..306656d 100644
--- a/debian/patches/remove_libexec.diff
+++ b/debian/patches/remove_libexec.diff
@@ -1,7 +1,7 @@
 Index: qtcreator/qtcreator.pri
 ===================================================================
---- qtcreator.orig/qtcreator.pri	2016-01-19 15:05:12.463608574 -0600
-+++ qtcreator/qtcreator.pri	2016-01-19 15:09:06.793906678 -0600
+--- qtcreator.orig/qtcreator.pri	2016-01-26 13:43:49.027802433 -0600
++++ qtcreator/qtcreator.pri	2016-01-26 13:43:49.023802475 -0600
 @@ -108,7 +108,7 @@
      win32: \
          IDE_LIBEXEC_PATH = $$IDE_OUTPUT_PATH/bin
@@ -20,3 +20,17 @@ Index: qtcreator/qtcreator.pri
      INSTALL_DATA_PATH    = $$QTC_PREFIX/share/qtcreator
      INSTALL_DOC_PATH     = $$QTC_PREFIX/share/doc/qtcreator
      INSTALL_BIN_PATH     = $$QTC_PREFIX/bin
+Index: qtcreator/src/plugins/coreplugin/icore.cpp
+===================================================================
+--- qtcreator.orig/src/plugins/coreplugin/icore.cpp	2016-01-26 13:43:49.027802433 -0600
++++ qtcreator/src/plugins/coreplugin/icore.cpp	2016-01-26 13:45:30.390560142 -0600
+@@ -446,7 +446,8 @@
+     case Utils::OsTypeLinux:
+     case Utils::OsTypeOtherUnix:
+     case Utils::OsTypeOther:
+-        path = QCoreApplication::applicationDirPath() + QLatin1String("/../libexec/qtcreator");
++        path = QCoreApplication::applicationDirPath()
++             + QLatin1String("/../" IDE_LIBRARY_BASENAME "/qtcreator/libexec");
+         break;
+     }
+     return QDir::cleanPath(path);

-- 
qtcreator packaging