summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2022-04-28 17:08:26 -0700
committerDonald Carr2022-04-28 17:08:26 -0700
commitc92a4ff1dbc8b6dae0cfd3756e1616292cb6b724 (patch)
treee159fad8541016520d7436d04ec3b7406b50fafd
parent14ee87e03bc2ee6478dfb8dd6cfbac3b619c1d50 (diff)
downloadaur-c92a4ff1dbc8b6dae0cfd3756e1616292cb6b724.tar.gz
Bump Qt Creator to 7.0.1
Change-Id: I85ef9b93066d6b1e1c76dc712ee1d767d39b044b
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD9
-rw-r--r--toolchain.cmake8
3 files changed, 16 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9405259b4e1d..ac46ac3dfa24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qtcreator-prerelease
pkgdesc = Qt Creator prerelease/latest
- pkgver = 7.0.0
+ pkgver = 7.0.1
pkgrel = 1
url = http://qt.io/ide
install = qtcreator-prerelease.install
@@ -17,6 +17,7 @@ pkgbase = qtcreator-prerelease
depends = qt6-quickcontrols2
depends = clang
depends = llvm
+ depends = mold
optdepends = qbs
optdepends = qt6-doc: integrated Qt documentation
optdepends = qt6-examples: welcome page examples
@@ -30,7 +31,7 @@ pkgbase = qtcreator-prerelease
optdepends = valgrind: analyze support
provides = qtcreator
conflicts = qtcreator
- source = https://download.qt.io/official_releases/qtcreator/7.0/7.0.0/qt-creator-opensource-src-7.0.0.tar.xz
- sha512sums = 98ad2a2c3a8318f98f6e869fa79d6ab8395fa65e9176b15451708cf204756e419828e360a42cf056240772b017747c0a60fa13bd7532d7fab1888832d1f9a52d
+ source = https://download.qt.io/official_releases/qtcreator/7.0/7.0.1/qt-creator-opensource-src-7.0.1.tar.xz
+ sha512sums = 2b07260eaf7892d90c99b93e8a757c9847cd2f696a57c85db7c77ab1cc97d43dc323f6923721f0fd9099367a08a29d356f1da5d71764522f67e5d39cfdca98f6
pkgname = qtcreator-prerelease
diff --git a/PKGBUILD b/PKGBUILD
index cf272dde5c05..38499a7855f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
_building=true
pkgname=qtcreator-prerelease
_pkgvermajmin=7.0
-_pkgver=${_pkgvermajmin}.0
+_pkgver=${_pkgvermajmin}.1
_verpostfix=""
pkgver="${_pkgver}${_verpostfix}"
pkgrel=1
@@ -24,7 +24,7 @@ url='http://qt.io/ide'
license=('GPL')
provides=('qtcreator')
conflicts=('qtcreator')
-depends=('python-beautifulsoup4' 'qt6-base' 'qt6-tools' 'qt6-declarative' 'qt6-quickcontrols2' 'clang' 'llvm')
+depends=('python-beautifulsoup4' 'qt6-base' 'qt6-tools' 'qt6-declarative' 'qt6-quickcontrols2' 'clang' 'llvm' 'mold')
install=qtcreator-prerelease.install
optdepends=('qbs'
'qt6-doc: integrated Qt documentation'
@@ -39,7 +39,7 @@ optdepends=('qbs'
'valgrind: analyze support')
makedepends=('qbs' 'clang' 'qt6-base' 'patchelf')
source=("${_urlbase}/qtcreator/${_pkgvermajmin}/${_pkgver}/${_source_archive_name}.tar.xz")
-sha512sums=('98ad2a2c3a8318f98f6e869fa79d6ab8395fa65e9176b15451708cf204756e419828e360a42cf056240772b017747c0a60fa13bd7532d7fab1888832d1f9a52d')
+sha512sums=('2b07260eaf7892d90c99b93e8a757c9847cd2f696a57c85db7c77ab1cc97d43dc323f6923721f0fd9099367a08a29d356f1da5d71764522f67e5d39cfdca98f6')
prepare() {
local working_dir=${srcdir}/${_source_archive_name}
@@ -54,9 +54,8 @@ build() {
cd ${build_dir}
cmake -G Ninja \
+ -DCMAKE_TOOLCHAIN_FILE=${startdir}/toolchain.cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_CXX_COMPILER=clang++ \
- -DCMAKE_C_COMPILER=clang \
-DCMAKE_BUILD_TYPE=Release -DWITH_DOCS=ON -DBUILD_QBS=OFF -DBUILD_WITH_CRASHPAD=OFF \
${working_dir}
diff --git a/toolchain.cmake b/toolchain.cmake
new file mode 100644
index 000000000000..bc1c6b6db99b
--- /dev/null
+++ b/toolchain.cmake
@@ -0,0 +1,8 @@
+set( CMAKE_SYSTEM_NAME Linux )
+# e.g. to use mold with Clang
+set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=mold")
+set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=mold")
+set(CMAKE_SHARED_LINKER_FLAGS_INIT "-fuse-ld=mold")
+
+set(CMAKE_CXX_COMPILER "clang++")
+set(CMAKE_C_COMPILER "clang")