aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Carr2024-04-10 14:32:24 -0700
committerDonald Carr2024-04-10 14:46:03 -0700
commitd7ebed9b92150550a82fb4078a6e8f9e140ecc86 (patch)
tree29d9fa83b182bf17fb2c9d0f461f568dc1014d69
parent3aac701380b26556c2508bd77e20fca9c73d39e0 (diff)
downloadaur-qt-sdk.tar.gz
Update to 6.7 final
Change-Id: Ie56e356c8f7dc5dda9aa52a6c85f6f5e2be33819
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD15
-rw-r--r--toolchain.cmake8
3 files changed, 15 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a529cce02fae..fdb157e2d0f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = qt-sdk
pkgdesc = Qt SDK for both hosts and a variety of targets
- pkgver = 6.7.0beta1
+ pkgver = 6.7.0
pkgrel = 1
url = http://www.chaos-reins.com/qpi/
arch = x86_64
@@ -22,7 +22,7 @@ pkgbase = qt-sdk
provides = qt-sdk
conflicts = litehtml
options = !strip
- source = https://download.qt.io/development_releases/qt/6.7/6.7.0-beta1/single/qt-everywhere-src-6.7.0-beta1.tar.xz
- sha256sums = 2a1aef2adad6df5944be3ba88889c4fd60e3405e6a19f3fc4948fbd652d18310
+ source = https://download.qt.io/official_releases/qt/6.7/6.7.0/single/qt-everywhere-src-6.7.0.tar.xz
+ sha256sums = bf5089912364f99cf9baf6c109de76a3172eec6267f148c69800575c47f90087
pkgname = qt-sdk
diff --git a/PKGBUILD b/PKGBUILD
index 56cc1c856319..aba55078de0e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -116,7 +116,7 @@ _local_qt_repo="${local_qt_repo}"
_pkgvermajmin="6.7"
_pkgverpatch=".0"
# {alpha/beta/beta2/rc}
-_dev_suffix="beta2"
+_dev_suffix=""
pkgrel=1
pkgver="${_pkgvermajmin}${_pkgverpatch}"
$_build_from_local_src_tree && pkgver=6.6.6
@@ -172,7 +172,7 @@ makedepends=("git" "pkgconfig" "gcc" "gperf" "python" "clang" "cmake" "ninja" "l
#_provider=http://qt.mirror.constant.com/
_provider=https://download.qt.io
source=()
-sha256sums=('f69407d23486e92e178a0770c2d934491ae63b6ddbdb5a58317c982badba34ac')
+sha256sums=('bf5089912364f99cf9baf6c109de76a3172eec6267f148c69800575c47f90087')
conflicts=('litehtml')
if ! $_build_from_local_src_tree; then
@@ -206,12 +206,13 @@ build() {
set -o pipefail
set -o errexit
- local _srcdir="${srcdir}/${_source_package_name}"
-
- local _basedir="${_srcdir}/qtbase"
-
+ local _srcdir="${srcdir}/${_source_package_name}"
+ local _basedir="${_srcdir}/qtbase"
+ local _webenginedir="${_srcdir}/qtwebengine"
local additional_args=""
+ # a pig; I build on tmpfs so I dont need its bulk
+ rm -Rf ${_webenginedir}
cd ${_build_path}
for i in ${BUILDENV[@]}; do
@@ -245,7 +246,7 @@ done
-GNinja \
-DINPUT_opengl=es2 \
-DFEATURE_optimize_full=ON \
- -DFEATURE_lttng=ON \
+ -DFEATURE_lttng=OFF \
-DFEATURE_widgets=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFEATURE_separate_debug_info=ON \
diff --git a/toolchain.cmake b/toolchain.cmake
index 1c96234d9951..a4bf5a24a44b 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -1,11 +1,11 @@
# this triggers CMAKE_CROSSCOMPILING!
#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_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_DISABLE_PRECOMPILE_HEADERS 1)
+#set(CMAKE_DISABLE_PRECOMPILE_HEADERS 1)
# e.g. to use mold with Clang
#set(CMAKE_EXE_LINKER_FLAGS_INIT "-fuse-ld=lld")
#set(CMAKE_MODULE_LINKER_FLAGS_INIT "-fuse-ld=lld")