[arch-commits] Commit in qtcreator/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Saturday, December 19, 2020 @ 00:24:23
  Author: arojas
Revision: 404511

archrelease: copy trunk to extra-x86_64

Added:
  qtcreator/repos/extra-x86_64/PKGBUILD
    (from rev 404510, qtcreator/trunk/PKGBUILD)
  qtcreator/repos/extra-x86_64/qtcreator-fix-clang-paths.patch
    (from rev 404510, qtcreator/trunk/qtcreator-fix-clang-paths.patch)
Deleted:
  qtcreator/repos/extra-x86_64/PKGBUILD

---------------------------------+
 PKGBUILD                        |  118 +++++++++++++++++++-------------------
 qtcreator-fix-clang-paths.patch |   15 ++++
 2 files changed, 76 insertions(+), 57 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 00:24:10 UTC (rev 404510)
+++ PKGBUILD	2020-12-19 00:24:23 UTC (rev 404511)
@@ -1,57 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
-# Contributor: Dan Vratil <progdan at progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname=qtcreator
-pkgver=4.14.0
-_clangver=11.0.0
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=(x86_64)
-url='https://www.qt.io'
-license=(LGPL)
-depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine qt5-svg qt5-quick3d qt5-serialport
-         clang=$_clangver qbs clazy syntax-highlighting yaml-cpp)
-makedepends=(cmake llvm python)
-options=(docs)
-optdepends=('qt5-doc: integrated Qt documentation'
-            'qt5-examples: welcome page examples'
-            'qt5-translations: for other languages'
-            'gdb: debugger'
-            'cmake: cmake project support'
-            'x11-ssh-askpass: ssh support'
-            'git: git support'
-            'mercurial: mercurial support'
-            'bzr: bazaar support'
-            'valgrind: analyze support'
-            'perf: performer analyzer')
-source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz")
-sha256sums=('d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e')
-
-prepare() {
-  cd qt-creator-opensource-src-$pkgver
-
-# use system qbs
-  rm -r src/shared/qbs
-# Fix linking to clang
-  sed -e 's|clangFormat|clang-cpp|' -i src/plugins/clangformat/CMakeLists.txt  
-# Fix libexec path
-  sed -e 's|libexec/qtcreator|lib/qtcreator|' -i cmake/QtCreatorAPIInternal.cmake
-}
-
-build() {
-  cmake -B build -S qt-creator-opensource-src-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DWITH_DOCS=ON
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-
-  install -Dm644 qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
-}

Copied: qtcreator/repos/extra-x86_64/PKGBUILD (from rev 404510, qtcreator/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-12-19 00:24:23 UTC (rev 404511)
@@ -0,0 +1,61 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Imanol Celaya <ornitorrincos at archlinux-es.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky at gmail.com>
+# Contributor: Dan Vratil <progdan at progdansoft.com>
+# Contributor: thotypous <matiasΘarchlinux-br·org>
+# Contributor: delor <bartekpiech gmail com>
+
+pkgname=qtcreator
+pkgver=4.14.0
+_clangver=11.0.0
+pkgrel=3
+pkgdesc='Lightweight, cross-platform integrated development environment'
+arch=(x86_64)
+url='https://www.qt.io'
+license=(LGPL)
+depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine qt5-svg qt5-quick3d qt5-serialport
+         clang=$_clangver qbs clazy syntax-highlighting yaml-cpp)
+makedepends=(cmake llvm python)
+options=(docs)
+optdepends=('qt5-doc: integrated Qt documentation'
+            'qt5-examples: welcome page examples'
+            'qt5-translations: for other languages'
+            'gdb: debugger'
+            'cmake: cmake project support'
+            'x11-ssh-askpass: ssh support'
+            'git: git support'
+            'mercurial: mercurial support'
+            'bzr: bazaar support'
+            'valgrind: analyze support'
+            'perf: performer analyzer')
+source=("https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz"
+         qtcreator-fix-clang-paths.patch)
+sha256sums=('d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e'
+            'eaaa001d3b2705ca2bdfafca5ffce7919baed8726c50113ae03e1d97da5b8c8d')
+
+prepare() {
+  cd qt-creator-opensource-src-$pkgver
+
+# use system qbs
+  rm -r src/shared/qbs
+# Fix linking to clang
+  sed -e 's|clangFormat|clang-cpp|' -i src/plugins/clangformat/CMakeLists.txt  
+# Fix libexec path
+  sed -e 's|libexec/qtcreator|lib/qtcreator|' -i cmake/QtCreatorAPIInternal.cmake
+# Fix clang include path
+  patch -p1 -i ../qtcreator-fix-clang-paths.patch
+}
+
+build() {
+  cmake -B build -S qt-creator-opensource-src-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DWITH_DOCS=ON
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+
+  install -Dm644 qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT
+}

Copied: qtcreator/repos/extra-x86_64/qtcreator-fix-clang-paths.patch (from rev 404510, qtcreator/trunk/qtcreator-fix-clang-paths.patch)
===================================================================
--- qtcreator-fix-clang-paths.patch	                        (rev 0)
+++ qtcreator-fix-clang-paths.patch	2020-12-19 00:24:23 UTC (rev 404511)
@@ -0,0 +1,15 @@
+diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt
+index dcaa464710..01cf7580b7 100644
+--- a/src/libs/clangsupport/CMakeLists.txt
++++ b/src/libs/clangsupport/CMakeLists.txt
+@@ -5,8 +5,8 @@ add_qtc_library(ClangSupport
+   PUBLIC_DEPENDS Utils Sqlite Qt5::Core Qt5::Network
+   PUBLIC_DEFINES
+     CLANG_VERSION="${CLANG_VERSION}"
+-    CLANG_INCLUDE_DIR="${IDE_LIBEXEC_PATH}/clang/lib/clang/${CLANG_VERSION}/include"
+-    CLANG_BINDIR="${IDE_LIBEXEC_PATH}/clang/bin"
++    CLANG_INCLUDE_DIR="/usr/lib/clang/${CLANG_VERSION}/include"
++    CLANG_BINDIR="/usr/bin"
+   DEFINES CLANGSUPPORT_BUILD_LIB
+   PUBLIC_INCLUDES
+     "${CMAKE_CURRENT_LIST_DIR}"