diff options
Diffstat (limited to 'source/l')
-rw-r--r-- | source/l/accountsservice/7e9058c1edda71cd9aa457717ed8fed50cd49666.patch | 32 | ||||
-rwxr-xr-x | source/l/accountsservice/accountsservice.SlackBuild | 16 | ||||
-rwxr-xr-x | source/l/libass/libass.SlackBuild | 2 | ||||
-rw-r--r-- | source/l/libunibreak/libunibreak.url | 1 | ||||
-rwxr-xr-x | source/l/python-requests/python-requests.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/python-urllib3/python-urllib3.SlackBuild | 6 | ||||
-rw-r--r-- | source/l/qt5/slack-desc | 2 | ||||
-rw-r--r-- | source/l/qt6/doinst.sh | 9 | ||||
-rwxr-xr-x | source/l/qt6/fetch_sources.sh | 62 | ||||
-rw-r--r-- | source/l/qt6/patches/nodejs-allow-32bit.patch | 16 | ||||
-rw-r--r-- | source/l/qt6/patches/qt5.mysql.h.diff | 11 | ||||
-rw-r--r-- | source/l/qt6/patches/qt6-3d_gcc13.patch | 11 | ||||
-rw-r--r-- | source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch | 25 | ||||
-rw-r--r-- | source/l/qt6/profile.d/qt6.csh | 27 | ||||
-rw-r--r-- | source/l/qt6/profile.d/qt6.sh | 26 | ||||
-rwxr-xr-x | source/l/qt6/qt6.SlackBuild | 326 | ||||
-rw-r--r-- | source/l/qt6/slack-desc | 19 |
17 files changed, 582 insertions, 11 deletions
diff --git a/source/l/accountsservice/7e9058c1edda71cd9aa457717ed8fed50cd49666.patch b/source/l/accountsservice/7e9058c1edda71cd9aa457717ed8fed50cd49666.patch new file mode 100644 index 000000000..3cbbd4e01 --- /dev/null +++ b/source/l/accountsservice/7e9058c1edda71cd9aa457717ed8fed50cd49666.patch @@ -0,0 +1,32 @@ +From 7e9058c1edda71cd9aa457717ed8fed50cd49666 Mon Sep 17 00:00:00 2001 +From: nater1983 <naterussell83@gmail.com> +Date: Sun, 25 Feb 2024 20:42:49 +0000 +Subject: [PATCH] Add option to disable Unit Tests + +- /meson.build +- /meson_options.txt +--- +meson.build | 4 +++- +meson_options.txt | 1 + +2 files changed, 4 insertions(+), 1 deletion(-) + +--- ./meson.build.orig 2023-03-27 14:27:39.000000000 -0500 ++++ ./meson.build 2024-02-27 12:42:47.098937158 -0600 +@@ -232,7 +232,9 @@ + subdir('doc/libaccountsservice') + endif + +-subdir('tests') ++if get_option('tests') ++ subdir('tests') ++endif + + configure_file( + output: 'config.h', +--- ./meson_options.txt.orig 2023-03-27 14:27:39.000000000 -0500 ++++ ./meson_options.txt 2024-02-27 12:43:12.139935773 -0600 +@@ -13,3 +13,4 @@ + + option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)') + option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation') ++option('tests', type: 'boolean', value: true, description : 'Build unit tests') diff --git a/source/l/accountsservice/accountsservice.SlackBuild b/source/l/accountsservice/accountsservice.SlackBuild index ec522049b..46b7a2a95 100755 --- a/source/l/accountsservice/accountsservice.SlackBuild +++ b/source/l/accountsservice/accountsservice.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2017, 2020 Eric Hameleers, Eindhoven, NL -# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -86,6 +86,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Build without unit tests: +cat $CWD/7e9058c1edda71cd9aa457717ed8fed50cd49666.patch | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -103,11 +106,12 @@ meson setup \ --sysconfdir=/etc \ --localstatedir=/var \ --buildtype=release \ - -D admin_group=wheel \ - -D docbook=false \ - -D gtk_doc=true \ - -D elogind=true \ - -D systemdsystemunitdir=no \ + -Dadmin_group=wheel \ + -Ddocbook=false \ + -Dtests=false \ + -Dgtk_doc=true \ + -Delogind=true \ + -Dsystemdsystemunitdir=no \ .. || exit 1 "${NINJA:=ninja}" $NUMJOBS || exit 1 DESTDIR=$PKG $NINJA install || exit 1 diff --git a/source/l/libass/libass.SlackBuild b/source/l/libass/libass.SlackBuild index 3faf80af7..a18f45657 100755 --- a/source/l/libass/libass.SlackBuild +++ b/source/l/libass/libass.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libass VERSION=${VERSION:-$(echo libass-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libunibreak/libunibreak.url b/source/l/libunibreak/libunibreak.url index 0f9723aaa..482a089d9 100644 --- a/source/l/libunibreak/libunibreak.url +++ b/source/l/libunibreak/libunibreak.url @@ -1 +1,2 @@ https://github.com/adah1972/libunibreak +https://github.com/adah1972/libunibreak/releases/download/libunibreak_6_0/libunibreak-6.0.tar.gz diff --git a/source/l/python-requests/python-requests.SlackBuild b/source/l/python-requests/python-requests.SlackBuild index 1c9425705..cd667504c 100755 --- a/source/l/python-requests/python-requests.SlackBuild +++ b/source/l/python-requests/python-requests.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=python-requests VERSION=${VERSION:-$(echo requests-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} SRCNAM=requests diff --git a/source/l/python-urllib3/python-urllib3.SlackBuild b/source/l/python-urllib3/python-urllib3.SlackBuild index 1de922a41..f1848a343 100755 --- a/source/l/python-urllib3/python-urllib3.SlackBuild +++ b/source/l/python-urllib3/python-urllib3.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017, 2018, 2024 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2017 Heinz Wiesinger, Amsterdam, NL # All rights reserved. # @@ -61,7 +61,9 @@ 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 {} \+ -python3 setup.py install --root=$PKG || exit 1 +unshare -n python3 -m build --wheel --no-isolation || exit 1 + +python3 -m installer --destdir "$PKG" dist/*.whl || exit 1 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a *.rst *.txt PKG-INFO \ diff --git a/source/l/qt5/slack-desc b/source/l/qt5/slack-desc index 9dbcba20c..ce803baaa 100644 --- a/source/l/qt5/slack-desc +++ b/source/l/qt5/slack-desc @@ -6,7 +6,7 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -qt5: qt5 (a C++ graphical user interface toolkit) +qt5: qt5 (Qt GUI toolkit, version 5) qt5: qt5: Qt is a complete and well-developed object-oriented framework for qt5: developing graphical user interface (GUI) applications using C++. diff --git a/source/l/qt6/doinst.sh b/source/l/qt6/doinst.sh new file mode 100644 index 000000000..3e5691a05 --- /dev/null +++ b/source/l/qt6/doinst.sh @@ -0,0 +1,9 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi diff --git a/source/l/qt6/fetch_sources.sh b/source/l/qt6/fetch_sources.sh new file mode 100755 index 000000000..7e098b08f --- /dev/null +++ b/source/l/qt6/fetch_sources.sh @@ -0,0 +1,62 @@ +#!/bin/bash + +# Copyright 2021 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +BRANCH="6.6.2" + +rm -f qt-everywhere-src-*.tar* + +git clone https://invent.kde.org/qt/qt/qt5.git + +cd qt5 + git checkout v${BRANCH} + ./init-repository + + # Sync qtwebengine version with the rest of qt5 + sed -i -E "s/6.6.(.*)/$BRANCH\"\)/" qtwebengine/.cmake.conf + + for i in $(find . -type d -name "qt*" -maxdepth 1); do + cd $i + ../qtbase/libexec/syncqt.pl -version $BRANCH + cd .. + done + + # Not in the release tarball for 6.6.1: + rm -rf README.git init-repository \ + qtcanvas3d qtfeedback qtgamepad qtpim qtqa qtrepotools qtsystems qtwebglplugin qtxmlpatterns \ + qtcharts/tools qtdatavis3d/tools qtgraphs/tools + + VERSION="${BRANCH}_$(git log --format="%ad_%h" --date=short | head -n 1 | tr -d -)" + LONGDATE="$(git log -1 --format=%cd --date=format:%c )" + +cd .. + +mv qt5 qt-everywhere-src-$VERSION + +tar --exclude-vcs -cf qt-everywhere-src-$VERSION.tar qt-everywhere-src-$VERSION +tar -cf qt5-gitmodules.tar qt-everywhere-src-$VERSION/*/.gitmodules qt-everywhere-src-$VERSION/.gitmodules +tar --concatenate --file=qt-everywhere-src-$VERSION.tar qt5-gitmodules.tar +plzip -9 -v qt-everywhere-src-$VERSION.tar +touch -d "$LONGDATE" qt-everywhere-src-$VERSION.tar.lz + +rm -rf qt-everywhere-src-$VERSION +rm -f qt5-gitmodules.tar diff --git a/source/l/qt6/patches/nodejs-allow-32bit.patch b/source/l/qt6/patches/nodejs-allow-32bit.patch new file mode 100644 index 000000000..5b84823c5 --- /dev/null +++ b/source/l/qt6/patches/nodejs-allow-32bit.patch @@ -0,0 +1,16 @@ +--- ./qtwebengine/configure.cmake.orig 2024-02-27 13:57:02.000000000 -0600 ++++ ./qtwebengine/configure.cmake 2024-02-27 17:49:26.845071893 -0600 +@@ -492,13 +492,6 @@ + MESSAGE "node.js version 14 or later is required." + ) + add_check_for_support( +- MODULES QtWebEngine +- CONDITION NOT (Nodejs_ARCH STREQUAL "ia32") AND +- NOT (Nodejs_ARCH STREQUAL "x86") AND +- NOT (Nodejs_ARCH STREQUAL "arm") +- MESSAGE "32bit version of Nodejs is not supported." +-) +-add_check_for_support( + MODULES QtWebEngine QtPdf + CONDITION Python3_EXECUTABLE + MESSAGE "Python version 3.6 or later is required." diff --git a/source/l/qt6/patches/qt5.mysql.h.diff b/source/l/qt6/patches/qt5.mysql.h.diff new file mode 100644 index 000000000..f1cf11b91 --- /dev/null +++ b/source/l/qt6/patches/qt5.mysql.h.diff @@ -0,0 +1,11 @@ +--- qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.orig 2017-05-26 14:43:31.000000000 +0200 ++++ qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-06-17 22:11:34.211899826 +0200 +@@ -57,7 +57,7 @@ + #include <QtCore/qt_windows.h> + #endif + +-#include <mysql.h> ++#include <mysql/mysql.h> + + #ifdef QT_PLUGIN + #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/source/l/qt6/patches/qt6-3d_gcc13.patch b/source/l/qt6/patches/qt6-3d_gcc13.patch new file mode 100644 index 000000000..7128597de --- /dev/null +++ b/source/l/qt6/patches/qt6-3d_gcc13.patch @@ -0,0 +1,11 @@ +--- qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp.orig 2023-09-24 13:38:48.000000000 +0200 ++++ qt3d/src/3rdparty/assimp/src/code/AssetLib/FBX/FBXBinaryTokenizer.cpp 2023-10-04 14:00:15.901256244 +0200 +@@ -51,6 +51,7 @@ + #include "FBXUtil.h" + #include <assimp/defs.h> + #include <stdint.h> ++#include <cstdint> + #include <assimp/Exceptional.h> + #include <assimp/ByteSwapper.h> + #include <assimp/DefaultLogger.hpp> + diff --git a/source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch b/source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch new file mode 100644 index 000000000..9bbf73dc8 --- /dev/null +++ b/source/l/qt6/patches/qt6-webengine_32bit_compressing_files.patch @@ -0,0 +1,25 @@ +Author: Patrick Franz <deltaone@debian.org> +Description: Building on 32-bit architectures fails when trying to compress + files in the devtools-frontend. +Forwarded: not-needed + +--- a/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js ++++ b/src/3rdparty/chromium/third_party/devtools-frontend/src/scripts/build/compress_files.js +@@ -75,7 +75,16 @@ async function main(argv) { + const fileList = argv[fileListPosition + 1]; + const fileListContents = await readTextFile(fileList); + const files = fileListContents.split(' '); +- await Promise.all(files.map(filename => filename.trim()).map(compressFile)); ++ for (let i = 0; i < files.length; i++) { ++ const fileName = files[i].trim(); ++ try { ++ await compressFile(fileName); ++ } catch (e) { ++ console.log('Failing compressing', fileName); ++ console.log(e); ++ process.exit(1); ++ } ++ } + } + + main(process.argv).catch(err => { diff --git a/source/l/qt6/profile.d/qt6.csh b/source/l/qt6/profile.d/qt6.csh new file mode 100644 index 000000000..75afefbb7 --- /dev/null +++ b/source/l/qt6/profile.d/qt6.csh @@ -0,0 +1,27 @@ +#!/bin/csh +# Environment path variables for the Qt package: +if ( ! $?QT6DIR ) then + # It's best to use the generic directory to avoid + # compiling in a version-containing path: + if ( -d /usr/lib@LIBDIRSUFFIX@/qt6 ) then + setenv QT6DIR /usr/lib@LIBDIRSUFFIX@/qt6 + else + # Find the newest Qt directory and set $QT6DIR to that: + foreach qtd ( /usr/lib@LIBDIRSUFFIX@/qt6-* ) + if ( -d $qtd ) then + setenv QT6DIR $qtd + endif + end + endif +endif +set path = ( $path $QT6DIR/bin ) +# Unfortunately Chromium and derived projects (including QtWebEngine) seem +# to be suffering some bitrot when it comes to 32-bit support, so we are +# forced to disable the seccomp filter sandbox on 32-bit or else all of these +# applications crash. If anyone has a patch that gets these things running on +# 32-bit without this workaround, please let volkerdi or alienBOB know, or +# post your solution on LQ. Thanks. :-) +file /bin/cat | grep -wq 32-bit +if ( "$?" == "0" ) then + setenv QTWEBENGINE_CHROMIUM_FLAGS "--disable-seccomp-filter-sandbox" +endif diff --git a/source/l/qt6/profile.d/qt6.sh b/source/l/qt6/profile.d/qt6.sh new file mode 100644 index 000000000..cd34c969d --- /dev/null +++ b/source/l/qt6/profile.d/qt6.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# Environment variables for the Qt package. +# +# It's best to use the generic directory to avoid +# compiling in a version-containing path: +if [ -d /usr/lib@LIBDIRSUFFIX@/qt6 ]; then + QT6DIR=/usr/lib@LIBDIRSUFFIX@/qt6 +else + # Find the newest Qt directory and set $QT6DIR to that: + for qtd in /usr/lib@LIBDIRSUFFIX@/qt6-* ; do + if [ -d $qtd ]; then + QT6DIR=$qtd + fi + done +fi +PATH="$PATH:$QT6DIR/bin" +export QT6DIR +# Unfortunately Chromium and derived projects (including QtWebEngine) seem +# to be suffering some bitrot when it comes to 32-bit support, so we are +# forced to disable the seccomp filter sandbox on 32-bit or else all of these +# applications crash. If anyone has a patch that gets these things running on +# 32-bit without this workaround, please let volkerdi or alienBOB know, or +# post your solution on LQ. Thanks. :-) +if file /bin/cat | grep -wq 32-bit ; then + export QTWEBENGINE_CHROMIUM_FLAGS="--disable-seccomp-filter-sandbox" +fi diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild new file mode 100755 index 000000000..2cac0d9f4 --- /dev/null +++ b/source/l/qt6/qt6.SlackBuild @@ -0,0 +1,326 @@ +#!/bin/sh + +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Merged some ideas from Alex Sarmardzic's script for qt4 at SlackBuilds.org +# ^^ Modified by Robby Workman <rworkman@slackware.com> for QT4 & KDE4 +# +# Modifications 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2023 Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.2.0 2013 by Michael James, AU +# Modifications for qt 5.x by Eric Hameleers, Eindhoven, NL +# Modifications for qt 6.x 2023, 2024 by Eric Hameleers, Eindhoven, NL + +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=qt6 +VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BUILD=${BUILD:-1} +PKGSRC=$(echo $VERSION | cut -d - -f 1) +PKGVER=$(echo $VERSION | tr - _) + +USE_CODECS=${USE_CODECS:-YES} +SYSTEM_FFMPEG=${SYSTEM_FFMPEG:-YES} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-${PKGVER}-${ARCH}-${BUILD}${TAG}.txz" + exit 0 +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + # To prevent "qatomic_armv6.h error: output number 2 not directly addressable" + # More permanent solution is to patch gcc: + # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731 + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "} +NINJAJOBS=${NINJAJOBS:-"$(echo $NUMJOBS | cut -f 2 -d j | tr -d ' ')"} +export NINJAJOBS + +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf qt-everywhere-src-$VERSION +echo "Extracting qt-everywhere-src-$VERSION" +tar xf $CWD/qt-everywhere-src-$VERSION.tar.?z* || exit 1 +cd qt-everywhere-src-$PKGSRC || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# If we build our own Qt, unset the QT-related environment variables, +# so that a pre-existing Qt will not be picked up and create errors later: +unset QTDIR +unset QT6DIR +NEWPATH="/usr/lib${LIBDIRSUFFIX}/${PKGNAM}/bin" +for elem in $(echo $PATH | cut -d: --output-delimiter=' ' -f1-) ; do + if ! $(echo "$elem"| grep -q /qt) ; then + NEWPATH="$NEWPATH:$elem" + fi +done +export PATH="$NEWPATH" + +# Fix path to mysql header: +cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 + +# If PulseAudio is not found, use the _alsa $TAG and disable it in the build: +if ! pkg-config --exists libpulse 2>/dev/null ; then + USE_PULSEAUDIO=${USE_PULSEAUDIO:-"OFF"} + TAG="${TAG}_alsa" +else + USE_PULSEAUDIO=${USE_PULSEAUDIO:-"ON"} + TAG=${TAG:-""} +fi + +# Re-add support for 32bit architectures - Google no longer supports it: +sed -i qtwebengine/src/3rdparty/chromium/BUILD.gn \ + -e 's/target_os != "linux" || /target_os == "linux" || /' +pushd qtwebengine + # Thanks Debian! See https://salsa.debian.org/qt-kde-team/qt6/qt6-webengine/-/tree/master/debian/patches + cat $CWD/patches/qt6-webengine_32bit_compressing_files.patch | patch -p1 --verbose || exit 1 +popd +cat $CWD/patches/nodejs-allow-32bit.patch | patch -p1 --verbose || exit 1 + +# GCC13 requires this include: +cat $CWD/patches/qt6-3d_gcc13.patch | patch -p0 --verbose || exit 1 + +# The qtquick3dphysics only compiles on a limited set of architectures: +case "${ARCH}" in + i?86 | arm | s390) DO_PHYSX3D="OFF" ;; + *) DO_PHYSX3D="ON" ;; +esac + +# Use our custom compiler and linker flags: +sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" \ + -i qtbase/mkspecs/common/gcc-base.conf || exit 1 +sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" \ + -i qtbase/mkspecs/common/g++-unix.conf || exit 1 + +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" +export QTDIR="${TMP}/qt-everywhere-src-${PKGSRC}" +export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" +export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" +cmake -S $(pwd) -B build-${PKGNAM} \ + -G Ninja \ + -Wno-dev \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_qtquick3dphysics:BOOL=${DO_PHYSX3D} \ + -DINSTALL_BINDIR=/usr/lib${LIBDIRSUFFIX}/qt6/bin \ + -DINSTALL_PUBLICBINDIR=usr/bin \ + -DINSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ + -DINSTALL_LIBEXECDIR=/usr/lib${LIBDIRSUFFIX}/qt6/libexec \ + -DINSTALL_ARCHDATADIR=/usr/lib${LIBDIRSUFFIX}/qt6 \ + -DINSTALL_DATADIR=/usr/share/qt6 \ + -DINSTALL_INCLUDEDIR=/usr/include/qt6 \ + -DINSTALL_MKSPECSDIR=lib/qt6/mkspecs \ + -DINSTALL_DOCDIR=/usr/doc/qt6-${PKGVER} \ + -DINSTALL_EXAMPLESDIR=/usr/doc/qt6-${PKGVER}/examples \ + -DFEATURE_libproxy=ON \ + -DFEATURE_no_direct_extern_access=ON \ + -DFEATURE_openssl_linked=ON \ + -DFEATURE_pulseaudio="${USE_PULSEAUDIO}" \ + -DFEATURE_system_sqlite=ON \ + -DFEATURE_system_xcb_xinput=ON \ + -DFEATURE_use_gold_linker=ON \ + -DFEATURE_webengine_proprietary_codecs="${USE_CODECS}" \ + -DFEATURE_webengine_system_ffmpeg="${SYSTEM_FFMPEG}" \ + -DFEATURE_webengine_system_pulseaudio="${USE_PULSEAUDIO}" \ + -DFEATURE_webengine_webrtc_pipewire=ON \ + -DQT_BUILD_EXAMPLES=OFF || exit 1 +cmake --build build-${PKGNAM} --parallel $NINJAJOBS || cmake --build build-${PKGNAM} || exit 1 +DESTDIR=$PKG cmake --install build-${PKGNAM} || exit 1 + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Remove rpaths: +for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do + if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then + patchelf --remove-rpath $file + fi +done + +# Fix the path in prl files: +find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ + -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \; + +# Install symlinks to the Qt6 binaries in the $PATH: +mkdir -p $PKG/usr/bin +pushd $PKG +# Setting INSTALL_PUBLICBINDIR creates user_facing_tool_links.txt files: +find $TMP/qt-everywhere-src-$PKGSRC/build-${PKGNAM} \ + -mindepth 1 -maxdepth 2 -name user_facing_tool_links.txt \ + | xargs cat | sort | uniq \ + | while read MYINP ; do ln -s $MYINP ; done +popd + +# Set the QT6DIR variable in the environment: +mkdir -p $PKG/etc/profile.d +sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" $CWD/profile.d/$PKGNAM.sh \ + > $PKG/etc/profile.d/$PKGNAM.sh +sed -e "s,@LIBDIRSUFFIX@,${LIBDIRSUFFIX},g" $CWD/profile.d/$PKGNAM.csh \ + > $PKG/etc/profile.d/$PKGNAM.csh +chmod 0755 $PKG/etc/profile.d/* + +# Add menu entries for all those hidden but great Qt applications: +# Qt6 logo: +mkdir -p $PKG/usr/share/icons/hicolor/{48x48,128x128}/apps +convert qtdoc/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt6-logo.png +convert qtdoc/doc/src/images/qt-logo.png -resize 128x128 $PKG/usr/share/icons/hicolor/128x128/apps/qt6-logo.png +# Assistant icons +install -p -m644 -D qttools/src/assistant/assistant/images/assistant.png $PKG/usr/share/icons/hicolor/32x32/apps/qt6-assistant.png +install -p -m644 -D qttools/src/assistant/assistant/images/assistant-128.png $PKG/usr/share/icons/hicolor/128x128/apps/qt6-assistant.png +# Designer icon +install -p -m644 -D qttools/src/designer/src/designer/images/designer.png $PKG/usr/share/icons/hicolor/128x128/apps/qt6-designer.png +# QDbusViewer icons +install -p -m644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer.png $PKG/usr/share/icons/hicolor/32x32/apps/qt6-qdbusviewer.png +install -p -m644 qttools/src/qdbus/qdbusviewer/images/qdbusviewer-128.png $PKG/usr/share/icons/hicolor/128x128/apps/qt6-qdbusviewer.png +# Linguist icons +for icon in qttools/src/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -m644 -D ${icon} $PKG/usr/share/icons/hicolor/${size}x${size}/apps/qt6-linguist.png +done + +# And the .desktop files too: +mkdir -p $PKG/usr/share/applications +cat <<EOF > $PKG/usr/share/applications/qt6-designer.desktop +[Desktop Entry] +Name=Qt6 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt6 applications +Exec=designer6 +Icon=qt6-designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; +EOF +cat <<EOF > $PKG/usr/share/applications/qt6-assistant.desktop +[Desktop Entry] +Name=Qt6 Assistant +Comment=Shows Qt6 documentation and examples +Exec=assistant6 +Icon=qt6-assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; +EOF +cat <<EOF > $PKG/usr/share/applications/qt6-linguist.desktop +[Desktop Entry] +Name=Qt6 Linguist +Comment=Add translations to Qt6 applications +Exec=linguist6 +Icon=qt6-linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; +EOF +cat <<EOF > $PKG/usr/share/applications/qt6-qdbusviewer.desktop +[Desktop Entry] +Name=Qt6 QDbusViewer +GenericName=Qt6 D-Bus Debugger +Comment=Debug D-Bus applications +Exec=qdbusviewer6 +Icon=qt6-qdbusviewer +Terminal=false +Type=Application +Categories=Qt;Development;Debugger; +EOF + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/$PKGNAM-$PKGVER +cp -a \ + README* LICENSE.* \ + qtwebengine/{CHROMIUM_VERSION,LICENSE.Chromium} \ + $PKG/usr/doc/$PKGNAM-$PKGVER +find -maxdepth 2 -name LICENSES \ + | xargs -I{} cp -ia --parents {} $PKG/usr/doc/$PKGNAM-$PKGVER/ +if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt6/doc/html ]; then + ( cd $PKG/usr/doc/$PKGNAM-$PKGVER + ln -sf /usr/lib${LIBDIRSUFFIX}/qt6/doc/html . + ) +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-${BUILD}${TAG}.txz diff --git a/source/l/qt6/slack-desc b/source/l/qt6/slack-desc new file mode 100644 index 000000000..c7b479ba2 --- /dev/null +++ b/source/l/qt6/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +qt6: qt6 (Qt GUI toolkit, version 6) +qt6: +qt6: Qt is a complete and well-developed object-oriented framework for +qt6: developing graphical user interface (GUI) applications using C++. +qt6: +qt6: Homepage: http://www.qt.io/ +qt6: +qt6: +qt6: +qt6: +qt6: |