[arch-commits] Commit in qtcreator/trunk (PKGBUILD qt-creator_llvmincdir.patch)

[Evangelos Foutras]

    Date: Tuesday, May 10, 2016 @ 21:54:33
  Author: foutrelis
Revision: 267646

upgpkg: qtcreator 3.6.1-3

clang 3.8.0 rebuild.

Added:
  qtcreator/trunk/qt-creator_llvmincdir.patch
Modified:
  qtcreator/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    8 +++++++-
 qt-creator_llvmincdir.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-10 19:40:04 UTC (rev 267645)
+++ PKGBUILD	2016-05-10 19:54:33 UTC (rev 267646)
@@ -9,7 +9,7 @@
 pkgname=qtcreator
 pkgver=3.6.1
 _pkgver=v3.6.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64')
 url='http://qt-project.org'
@@ -30,9 +30,11 @@
 install=qtcreator.install
 source=("git://code.qt.io/qt-creator/qt-creator.git#tag=${_pkgver}"
         "git://code.qt.io/qt-labs/qbs.git"
+        'qt-creator_llvmincdir.patch'
         'qtcreator.desktop')
 md5sums=('SKIP'
          'SKIP'
+         'ab50147c509e8043c69625afa7cca7fe'
          '800c94165c547b64012a207d9830250a')
 
 prepare() {
@@ -46,6 +48,10 @@
   # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=97e9f113879c
   # https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=e57b0db0f959
   git cherry-pick -n 97e9f113879c e57b0db0f959
+
+  # Fix build with GCC 6 (patch from Fedora)
+  # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Q5SWCUUMWQ4EMS7CU2CBOZHV3WZYOOTT/
+  patch -Np1 -i ../qt-creator_llvmincdir.patch
 }
 
 build() {

Added: qt-creator_llvmincdir.patch
===================================================================
--- qt-creator_llvmincdir.patch	                        (rev 0)
+++ qt-creator_llvmincdir.patch	2016-05-10 19:54:33 UTC (rev 267646)
@@ -0,0 +1,12 @@
+diff -rupN qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro
+--- qt-creator-opensource-src-3.6.0/src/tools/clangbackend/clangbackend.pro	2015-12-11 13:45:01.000000000 +0100
++++ qt-creator-opensource-src-3.6.0-new/src/tools/clangbackend/clangbackend.pro	2016-02-08 23:04:03.654903983 +0100
+@@ -10,7 +10,7 @@ QT += core network
+ QT -= gui
+ 
+ LIBS += $$LLVM_LIBS
+-INCLUDEPATH += $$LLVM_INCLUDEPATH
++#INCLUDEPATH += $$LLVM_INCLUDEPATH
+ 
+ SOURCES += clangbackendmain.cpp
+