diff options
| -rw-r--r-- | libre/qtcreator/PKGBUILD | 67 | ||||
| -rw-r--r-- | libre/qtcreator/qtcreator-fix-clang-paths.patch | 15 |
2 files changed, 33 insertions, 49 deletions
diff --git a/libre/qtcreator/PKGBUILD b/libre/qtcreator/PKGBUILD index 265c6600d..9b86bd0e4 100644 --- a/libre/qtcreator/PKGBUILD +++ b/libre/qtcreator/PKGBUILD @@ -1,33 +1,38 @@ -# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org> -# Contributor (Arch): Sven-Hendrik Haase <sh@lutzhaase.com># Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org> -# Contributor (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor (Arch): Dan Vratil <progdan@progdansoft.com> -# Contributor (Arch): thotypous <matiasΘarchlinux-br·org> -# Contributor (Arch): delor <bartekpiech gmail com> +# Maintainer (arch): Antonio Rojas <arojas@archlinux.org> +# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> +# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: Dan Vratil <progdan@progdansoft.com> +# Contributor: thotypous <matiasΘarchlinux-br·org> +# Contributor: delor <bartekpiech gmail com> # Maintainer: bill-auger <bill-auger@programmer.net> # Contributor: André Silva <emulatorman@hyperbola.info> # Contributor: Theo von Arx <theova@member.fsf.org> # parabola changes and rationale: -# - removed support for qt5-webengine +# - removed support for qt5-webengine (help GUI is unavailable) pkgname=qtcreator -pkgver=4.14.0 -_clangver=11.0.1 -pkgrel=4 +pkgver=5.0.3 +_clangver=13.0.0 +[[ "${CARCH}" == 'i686' ]] && _clangver=12.0.1 +pkgrel=2 pkgrel+=.parabola1 pkgdesc='Lightweight, cross-platform integrated development environment' -pkgdesc+=', without nonfree qt5-webengine help viewer' +pkgdesc+=', without non-free qt5-webengine help viewer' arch=(x86_64) -arch+=(i686 armv7h) +arch+=(armv7h i686) url='https://www.qt.io' -license=(LGPL) -depends=(qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-webengine qt5-svg qt5-quick3d qt5-serialport - clang=$_clangver clazy syntax-highlighting yaml-cpp) +license=(GPL3) +# Note: built against Qt5 because of https://bugreports.qt.io/browse/QTCREATORBUG-26134 +depends=(qt5-tools qt5-quickcontrols2 qt5-svg qt5-quick3d qt5-webengine qt5-serialport syntax-highlighting # qt6-shadertools qt6-5compat + clang=$_clangver clazy yaml-cpp) depends=( $( sed -E 's/(qt5-webengine|yaml-cpp)//g' <<<${depends[@]} ) ) makedepends=(cmake llvm python) +makedepends_i686=(icu-compat) +# makedepends_i686=(icu69) options=(docs) optdepends=('qt5-doc: integrated Qt documentation' 'qt5-examples: welcome page examples' @@ -40,34 +45,28 @@ optdepends=('qt5-doc: integrated Qt documentation' '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 -} + 'perf: performer analyzer' + 'mlocate: locator filter') +source=(https://download.qt.io/official_releases/qtcreator/${pkgver%.*}/$pkgver/qt-creator-opensource-src-$pkgver.tar.xz) +sha256sums=('7fd3b14310bcecee6b134f8cb7f4c0ed2385d7f4cecd48d756c5c1fd650ce2eb') build() { cmake -B build -S qt-creator-opensource-src-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DWITH_DOCS=ON + -DCMAKE_INSTALL_LIBEXECDIR=lib \ + -DWITH_DOCS=ON \ + -DBUILD_DEVELOPER_DOCS=ON \ + -DBUILD_QBS=OFF \ + -DQTC_CLANG_BUILDMODE_MATCH=ON \ + -DBUILD_HELVIEWERBACKEND_QTWEBENGINE=ON cmake --build build + cmake --build build --target docs } package() { DESTDIR="$pkgdir" cmake --install build +# Install docs + cp -r build/share/doc "$pkgdir"/usr/share install -Dm644 qt-creator-opensource-src-$pkgver/LICENSE.GPL3-EXCEPT "$pkgdir"/usr/share/licenses/qtcreator/LICENSE.GPL3-EXCEPT } diff --git a/libre/qtcreator/qtcreator-fix-clang-paths.patch b/libre/qtcreator/qtcreator-fix-clang-paths.patch deleted file mode 100644 index 84a0a43f6..000000000 --- a/libre/qtcreator/qtcreator-fix-clang-paths.patch +++ /dev/null @@ -1,15 +0,0 @@ -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}" |