summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Steven Voges2022-09-14 11:41:17 +0200
committer bedlam2022-09-14 11:41:17 +0200
commit774f285974e82fa5d044f55cc533db370f8f2b1d (patch)
tree6911990fcfcba72e79ea0b6a0896140ea3a6c2af
parent514c9d0c00405ce6ce7f285066e12559759e317e (diff)
downloadslackbuilds-774f285974e82fa5d044f55cc533db370f8f2b1d.tar.gz
libraries/qt6: Updated for version 6.3.2.
Signed-off-by: bedlam <dave@slackbuilds.org>
-rw-r--r--libraries/qt6/README.SLACKWARE4
-rw-r--r--libraries/qt6/qt6.SlackBuild6
-rw-r--r--libraries/qt6/qt6.info6
3 files changed, 10 insertions, 6 deletions
diff --git a/libraries/qt6/README.SLACKWARE b/libraries/qt6/README.SLACKWARE
index 675c6c1577..4c3bc9a818 100644
--- a/libraries/qt6/README.SLACKWARE
+++ b/libraries/qt6/README.SLACKWARE
@@ -1,12 +1,12 @@
Slackware 15.0's version of clang fails to compile qt6, due to the
following error:
-Linking CXX executable ../../../../qtbase/bin/lupdate
+Linking CXX executable qtbase/lib64/bin/lupdate
/usr/bin/ld: CMakeFiles/lupdate.dir/cpp_clang.cpp.o: undefined
reference to symbol '_ZTIN5clang7tooling21FrontendActionFactoryE'
/usr/bin/ld: /usr/lib64/libclangTooling.so.13: error adding symbols:
DSO missing from command line
-collect2: error: ld returned 1 exit status
+clang-13: error: linker command failed with exit code 1
To remedy this, Qt provides a prebuilt clang package that we bootstrap
against.
diff --git a/libraries/qt6/qt6.SlackBuild b/libraries/qt6/qt6.SlackBuild
index e2a7291025..4e27d2e820 100644
--- a/libraries/qt6/qt6.SlackBuild
+++ b/libraries/qt6/qt6.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=qt6
SRCNAM=qt-everywhere-src
-VERSION=${VERSION:-6.3.1}
+VERSION=${VERSION:-6.3.2}
BSCLANG=libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64
CCACHE=${CCACHE:-OFF}
EXAMPLES=${EXAMPLES:-OFF}
@@ -86,6 +86,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+export CC=clang
+export CXX=clang++
+export CFLAGS="$SLKCFLAGS"
+
mkdir -p build
cd build
cmake \
diff --git a/libraries/qt6/qt6.info b/libraries/qt6/qt6.info
index 921db01ff3..f6b6c40bb7 100644
--- a/libraries/qt6/qt6.info
+++ b/libraries/qt6/qt6.info
@@ -1,11 +1,11 @@
PRGNAM="qt6"
-VERSION="6.3.1"
+VERSION="6.3.2"
HOMEPAGE="https://qt.io"
DOWNLOAD="UNSUPPORTED"
MD5SUM=""
-DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.3/6.3.1/single/qt-everywhere-src-6.3.1.tar.xz \
+DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.3/6.3.2/single/qt-everywhere-src-6.3.2.tar.xz \
https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-MD5SUM_x86_64="957a304773b281a4584f4c0254773456 \
+MD5SUM_x86_64="bc928a9897698ec397b11c3dbff40e53 \
1eb94ba35df4aa217cf485086215182a"
REQUIRES="double-conversion html5lib md4c nodejs p7zip"
MAINTAINER="Steven Voges"