summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2020-12-21 16:48:02 -0800
committerDonald Carr2020-12-21 16:49:56 -0800
commitd550440f32b580c7f780e59b9a2adcf76ac0abab (patch)
tree033b358bb18fa9dae257c3dc3cbca3bfca1b73d7
parent3f09afd8d970ba61510a0b9c125b5d1418ccc699 (diff)
downloadaur-d550440f32b580c7f780e59b9a2adcf76ac0abab.tar.gz
Update to QtCreator 4.14 final release
Change-Id: Ie6997788496bc4af024e78e520cf75b2b2862c63
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD19
2 files changed, 8 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f9ce7efd4a73..042965e484b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qtcreator-prerelease
pkgdesc = Qt Creator prerelease/latest
- pkgver = 4.14.0beta2
- pkgrel = 1
+ pkgver = 4.14.0
+ pkgrel = 2
url = http://qt.io/ide
install = qtcreator-prerelease.install
arch = x86_64
@@ -31,12 +31,8 @@ pkgbase = qtcreator-prerelease
optdepends = valgrind: analyze support
provides = qtcreator
conflicts = qtcreator
- source = https://download.qt.io/development_releases/qtcreator/4.14/4.14.0-beta2/qt-creator-opensource-src-4.14.0-beta2.tar.xz
- source = qtcreator-preload-plugins.patch
- source = qtcreator-clang-libs.patch
- sha256sums = 92d1920b07b6d5847e2005a5d1690ed7244b6e8f0660b5f420f431e8804159dd
- sha256sums = b40e222b30c355d1230160a4e933dbd161b8748125662e3bde312ea52296457a
- sha256sums = 0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f
+ source = https://download.qt.io/official_releases/qtcreator/4.14/4.14.0/qt-creator-opensource-src-4.14.0.tar.xz
+ sha256sums = d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e
pkgname = qtcreator-prerelease
diff --git a/PKGBUILD b/PKGBUILD
index e2fd26b58a22..e155a63df7e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,9 +9,9 @@ _building=true
pkgname=qtcreator-prerelease
_pkgvermajmin=4.14
_pkgver=${_pkgvermajmin}.0
-_verpostfix="beta2"
+_verpostfix=""
pkgver="${_pkgver}${_verpostfix}"
-pkgrel=1
+pkgrel=2
_urlbase="https://download.qt.io/official_releases"
if [[ -n $_verpostfix ]]; then
_pkgver=${_pkgver}-${_verpostfix}
@@ -38,12 +38,8 @@ optdepends=('qbs'
'bzr: bazaar support'
'valgrind: analyze support')
makedepends=('qbs' 'clang' 'qt5-base' 'patchelf')
-source=("${_urlbase}/qtcreator/${_pkgvermajmin}/${_pkgver}/${_filename}.tar.xz"
- qtcreator-preload-plugins.patch
- qtcreator-clang-libs.patch)
-sha256sums=('92d1920b07b6d5847e2005a5d1690ed7244b6e8f0660b5f420f431e8804159dd'
- 'b40e222b30c355d1230160a4e933dbd161b8748125662e3bde312ea52296457a'
- '0f6d0dc41a87aae9ef371b1950f5b9d823db8b5685c6ac04a7a7ac133eb19a3f')
+source=("${_urlbase}/qtcreator/${_pkgvermajmin}/${_pkgver}/${_filename}.tar.xz")
+sha256sums=('d240109351e96446ff149cbd56341ec02ba37bfa50462a85e4d02dfe6b21201e')
prepare() {
cd ${srcdir}/${_filename}
@@ -53,13 +49,6 @@ prepare() {
sed -e 's|libexec|lib|g' -i src/tools/tools.pro
# use system qbs
rm -r src/shared/qbs
- # Preload analyzer plugins, since upstream clang doesn't link to all plugins
- # see http://code.qt.io/cgit/clang/clang.git/commit/?id=7f349701d3ea0c47be3a43e265699dddd3fd55cf
- # and https://bugs.archlinux.org/task/59492
- #patch -p1 -i ../qtcreator-preload-plugins.patch
-
- # Fix build with clang 10
- patch -p1 -i ../qtcreator-clang-libs.patch
}
build() {