From c353af4711cf08ea0a0010dcf0d404c92504f193 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Wed, 13 Jun 2018 22:01:04 +0200 Subject: Update the deps for a June release of ktown Qt - updated to 5.9.6. --- deps/dvdauthor/dvdauthor.SlackBuild | 10 +++++----- deps/qt5/.url | 2 +- deps/qt5/qt5.SlackBuild | 27 +++++++++++++-------------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/deps/dvdauthor/dvdauthor.SlackBuild b/deps/dvdauthor/dvdauthor.SlackBuild index 401e01c..fc1caaf 100755 --- a/deps/dvdauthor/dvdauthor.SlackBuild +++ b/deps/dvdauthor/dvdauthor.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2017 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2018 Eric Hameleers, Eindhoven, NL # Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -26,8 +26,8 @@ PKGNAM=dvdauthor VERSION=${VERSION:-0.7.2} -BUILD=${BUILD:-3} -NUMJOBS=${NUMJOBS:-" -j4 "} +BUILD=${BUILD:-4} +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -36,7 +36,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -45,7 +45,7 @@ if [ -z "$ARCH" ]; then fi case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" diff --git a/deps/qt5/.url b/deps/qt5/.url index a8f964a..27dee07 100644 --- a/deps/qt5/.url +++ b/deps/qt5/.url @@ -1 +1 @@ -http://download.qt.io/official_releases/qt/5.9/5.9.5/single/qt-everywhere-opensource-src-5.9.5.tar.xz +http://download.qt.io/official_releases/qt/5.11/5.11.0/single/qt-everywhere-src-5.11.0.tar.xz diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index ee0e0a3..c1bfca6 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -55,14 +55,16 @@ # Modifications for qt 5.9.3 2017 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.9.4 2018 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.9.5 2018 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.9.6 2018 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.11.0 2018 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5 -VERSION=${VERSION:-5.9.5} +VERSION=${VERSION:-5.11.0} BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) -NUMJOBS=${NUMJOBS:--j7} +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -125,10 +127,10 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf qt-everywhere-opensource-src-$VERSION -echo "Extracting qt-everywhere-opensource-src-$VERSION.tar.xz" -tar xf $CWD/qt-everywhere-opensource-src-$VERSION.tar.xz || exit 1 -cd qt-everywhere-opensource-src-$PKGSRC || exit 1 +rm -rf qt-everywhere-src-$VERSION +echo "Extracting qt-everywhere-src-$VERSION.tar.xz" +tar xf $CWD/qt-everywhere-src-$VERSION.tar.xz || exit 1 +cd qt-everywhere-src-$PKGSRC || exit 1 chown -R root:root . find . \ @@ -149,8 +151,7 @@ fi cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 # Fix missing private includes: QTBUG-37417 -sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \ - -i qtbase/mkspecs/features/create_cmake.prf +cat $CWD/patches/qt5.private-includes.patch | patch -p1 --verbose || exit 1 if ! pkg-config --exists libpulse 2>/dev/null ; then # Forcibly disable pulseaudio in qtwebengine: @@ -162,10 +163,8 @@ else fi # Use our custom compiler and linker flags: -#sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/g++-base.conf || exit 1 -sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/gcc-base.conf || exit 1 -sed -i -e "s/-O3/$SLKCFLAGS/" qtbase/mkspecs/common/gcc-base.conf || exit 1 -sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" qtbase/mkspecs/common/gcc-base.conf || exit 1 +sed -e "s|^\(QMAKE_CFLAGS_RELEASE.*\)|\1 ${SLKCFLAGS}|" -i mkspecs/common/gcc-base.conf || exit 1 +sed -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${SLKLDFLAGS}|" -i mkspecs/common/g++-unix.conf || exit 1 # Enable h.264 codec support: echo "WEBENGINE_CONFIG += use_proprietary_codecs" >> qtwebengine/.qmake.conf @@ -176,10 +175,10 @@ echo "CONFIG += lang-all" >> qtvirtualkeyboard/.qmake.conf export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -export QTDIR="${TMP}/qt-everywhere-opensource-src-${PKGSRC}" +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" -./configure \ +./configure -v \ -confirm-license \ -opensource \ -prefix /usr \ -- cgit v1.2.3