diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2024-03-26 22:24:59 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2024-03-27 00:09:26 +0100 |
| commit | b5abc7571b6402a0fbfb487f05e385387d3664e3 (patch) | |
| tree | dc6abbf0654d4a745a6d994259355fc370f0a9f6 /source/l | |
| parent | 9433c582a08172ea522d92c7e1fdce2dc1aa5370 (diff) | |
| download | current-b5abc7571b6402a0fbfb487f05e385387d3664e3.tar.gz current-b5abc7571b6402a0fbfb487f05e385387d3664e3.tar.xz | |
Tue Mar 26 22:24:59 UTC 202420240326222459
l/gjs-1.80.2-x86_64-1.txz: Upgraded.
l/qt6-6.6.3_20240319_c2516323-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/l')
| -rwxr-xr-x | source/l/qt6/fetch_sources.sh | 2 | ||||
| -rwxr-xr-x | source/l/qt6/qt6.SlackBuild | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/source/l/qt6/fetch_sources.sh b/source/l/qt6/fetch_sources.sh index 7e098b08f..780905738 100755 --- a/source/l/qt6/fetch_sources.sh +++ b/source/l/qt6/fetch_sources.sh @@ -21,7 +21,7 @@ # 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" +BRANCH="6.6.3" rm -f qt-everywhere-src-*.tar* diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild index 761cdaf3e..f40431fc8 100755 --- a/source/l/qt6/qt6.SlackBuild +++ b/source/l/qt6/qt6.SlackBuild @@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt6 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION | cut -d - -f 1) PKGVER=$(echo $VERSION | tr - _) @@ -150,6 +150,12 @@ 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 +# Previously we didn't have a protobuf package in Slackware. +# Now that we do, it's apparently too new to use with Qt6, so let's just +# disable it to get the same features that we previously did. +# Patches would be accepted here. :-) +PROTOBUF="-DQT_FEATURE_qtprotobufgen=OFF" + # The qtquick3dphysics only compiles on a limited set of architectures: case "${ARCH}" in i?86 | arm | s390) DO_PHYSX3D="OFF" ;; @@ -199,8 +205,12 @@ cmake -S $(pwd) -B build-${PKGNAM} \ -DFEATURE_webengine_system_ffmpeg="${SYSTEM_FFMPEG}" \ -DFEATURE_webengine_system_pulseaudio="${USE_PULSEAUDIO}" \ -DFEATURE_webengine_webrtc_pipewire=ON \ + $PROTOBUF \ -DQT_BUILD_EXAMPLES=OFF || exit 1 -cmake --build build-${PKGNAM} --parallel $NINJAJOBS || cmake --build build-${PKGNAM} || exit 1 +#cmake --build build-${PKGNAM} --parallel $NINJAJOBS || cmake --build build-${PKGNAM} || exit 1 +# Don't try again non-parallel... it just makes you wait a long time to see +# what the error was. +cmake --build build-${PKGNAM} --parallel $NINJAJOBS || exit 1 DESTDIR=$PKG cmake --install build-${PKGNAM} || exit 1 # Strip binaries: |