diff options
| author | Steven Voges <svoges.sbo@gmail.com> | 2023-09-01 18:19:10 +0200 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2023-09-02 18:02:33 +0700 |
| commit | b00aac8a3a491d8ee4fe01c87225828998c13856 (patch) | |
| tree | 75af9dc3037ddfa2ec30e6a30906a9274dfc245d | |
| parent | d98a03bf958165b93157d98bbaafefca6fd5e165 (diff) | |
libraries/qt6: Updated for version 6.5.2.
Removed the p7zip dep (using in place bsdtar), cleanups,
patch to build also with gcc >= 13.x
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | libraries/qt6/qt6.SlackBuild | 13 | ||||
| -rw-r--r-- | libraries/qt6/qt6.info | 8 |
2 files changed, 15 insertions, 6 deletions
diff --git a/libraries/qt6/qt6.SlackBuild b/libraries/qt6/qt6.SlackBuild index 51bf8e217f4b..89f0b1ebdcf7 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.5.0} +VERSION=${VERSION:-6.5.2} BSCLANG=libclang-release_130-based-linux-Ubuntu20.04-gcc9.3-x86_64 CCACHE=${CCACHE:-OFF} EXAMPLES=${EXAMPLES:-OFF} @@ -79,7 +79,7 @@ cd $TMP rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.xz cd $SRCNAM-$VERSION -7z x $CWD/$BSCLANG.7z +bsdtar xvf $CWD/$BSCLANG.7z chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -87,6 +87,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 {} \; + +#Fix compile on -current/gcc13+ +sed -i '54i #include <cstdint>' qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp + export CC=clang export CXX=clang++ export CFLAGS="$SLKCFLAGS" @@ -106,6 +110,7 @@ cd build -DFEATURE_system_xcb_xinput=$SYSTEM_XCB_INPUT \ -DFEATURE_webengine_proprietary_codecs=$PROPRIETARY_CODECS \ -DFEATURE_webengine_system_ffmpeg=$SYSTEM_FFMPEG \ + -DINSTALL_ARCHDATADIR=./lib${LIBDIRSUFFIX} \ -DINSTALL_BINDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/bin \ -DINSTALL_DESCRIPTIONSDIR=./lib${LIBDIRSUFFIX}/$PRGNAM/modules \ -DINSTALL_DOCDIR=./doc/$PRGNAM-$VERSION \ @@ -125,6 +130,10 @@ cd build DESTDIR=$PKG cmake --install . --strip cd .. +rm -R $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/QtBuildInternals +rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/ios +rmdir $PKG/usr/lib$LIBDIRSUFFIX/cmake/Qt6/macos + if [ -d "$PKG/usr/phrasebooks" ]; then mv $PKG/usr/phrasebooks $PKG/usr/share/$PRGNAM/ fi diff --git a/libraries/qt6/qt6.info b/libraries/qt6/qt6.info index ff74c0208f61..5996f1a31755 100644 --- a/libraries/qt6/qt6.info +++ b/libraries/qt6/qt6.info @@ -1,12 +1,12 @@ PRGNAM="qt6" -VERSION="6.5.0" +VERSION="6.5.2" HOMEPAGE="https://qt.io" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.5/6.5.0/single/qt-everywhere-src-6.5.0.tar.xz \ +DOWNLOAD_x86_64="https://download.qt.io/official_releases/qt/6.5/6.5.2/single/qt-everywhere-src-6.5.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="10247444e4264ea9cee7d4a7c13efd34 \ +MD5SUM_x86_64="87f56fd8aedd2e429047c40397e9be48 \ 1eb94ba35df4aa217cf485086215182a" -REQUIRES="double-conversion html5lib md4c nodejs p7zip" +REQUIRES="double-conversion html5lib md4c nodejs" MAINTAINER="Steven Voges" EMAIL="svoges.sbo@gmail.com" |