[SCM] qtcreator packaging branch, master, updated. debian/3.5.1+dfsg-2-10-g6abe3b7

[Adam Majer]

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

The following commit has been merged in the master branch:
commit 6f0e01d9bc9433250c020a68ea56f3c9056a4427
Author: Adam Majer <adamm at zombino.com>
Date:   Tue Jan 19 00:34:46 2016 -0600

    Revert "Remove disable_llvm_rpath.diff"
    
    We still need this for the /usr/bin/clangbackend binary
    
    This reverts commit bc95f1ec658a2fcc138ea51d2f55437f133ee436.
---
 debian/changelog                       |  2 --
 debian/patches/disable_llvm_rpath.diff | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index afe8ea0..45450f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,6 @@ qtcreator (3.6.0-1) UNRELEASED; urgency=medium
   * No longer ship a +dfsg version: the only remaining javascript file is not
     minified nor used, as we don't build qbs' documentation.
     - Adjust README.source and debian/watch to this new situation.
-  * Remove disable_llvm_rpath.diff. It doesn't applies and there seems to be
-    no more rpath issues anymore.
   * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Dec 2015 14:10:05 -0300
diff --git a/debian/patches/disable_llvm_rpath.diff b/debian/patches/disable_llvm_rpath.diff
new file mode 100644
index 0000000..525ff07
--- /dev/null
+++ b/debian/patches/disable_llvm_rpath.diff
@@ -0,0 +1,28 @@
+Index: qtcreator/src/plugins/clangcodemodel/clangcodemodel.pro
+===================================================================
+--- qtcreator.orig/src/plugins/clangcodemodel/clangcodemodel.pro	2015-09-27 14:54:16.570761417 -0500
++++ qtcreator/src/plugins/clangcodemodel/clangcodemodel.pro	2015-09-27 14:55:51.205735495 -0500
+@@ -9,7 +9,9 @@
+ DEFINES += CLANG_VERSION=\\"$${LLVM_VERSION}\\"
+ DEFINES += "\"CLANG_RESOURCE_DIR=\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\"\""
+ 
+-unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
++!llvm_disable_rpath {
++    unix:QMAKE_LFLAGS += -Wl,-rpath,\'$$LLVM_LIBDIR\'
++}
+ 
+ SOURCES += \
+     activationsequencecontextprocessor.cpp \
+Index: qtcreator/src/tools/clangbackend/clangbackend.pro
+===================================================================
+--- qtcreator.orig/src/tools/clangbackend/clangbackend.pro	2015-08-18 05:02:51.000000000 -0500
++++ qtcreator/src/tools/clangbackend/clangbackend.pro	2015-09-27 14:57:41.536547126 -0500
+@@ -16,5 +16,7 @@
+ 
+ unix {
+     !osx: QMAKE_LFLAGS += -Wl,-z,origin
+-    QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
++    !llvm_disable_rpath {
++        QMAKE_LFLAGS += -Wl,-rpath,$$shell_quote($${LLVM_LIBDIR})
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 15612f1..8499022 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+disable_llvm_rpath.diff
 02_use_x-terminal-emulator.diff
 rpath_nonlinux.diff
 

-- 
qtcreator packaging