From da1be5a21ba06235b67a999f696ec66e35dc17a1 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 9 Jan 2015 00:06:49 +0100 Subject: Prepare for new KDE 5: Frameworks 5.6.0, Plasma 5.1.2, Applications 14.12.0. KDE 5_1501 ========== This is going to be KDE 5 for Slackware-current, composed of Frameworks 5.6.0, Plasma 5.1.2 and Applications 14.12.0. Note that there is still a lot of KDE 4 stuff in here, which is necessary to support all the Applications that have not yet been ported to KDE Frameworks 5. The Applications 15.04 (march 2015) release should offer a lot more KF5 ports. Preliminary build procedure (not verified 100% yet): ---------------------------------------------------- - (crude) get rid of Slackware's KDE: removepkg /var/log/packages/*-4.10.5-* - build all the deps using "updates.SlackBuild" script in the "deps/" directory - note that extra-cmake-modules is required here as well as when building the frameworks, so I just copied it from frameworks to deps. - logoff/login to activate Qt5 profile script. - removepkg akonadi-qt5 or else kdepimlibs-4.14.3 picks up Qt5 dependencies and its compilation will fail as a result - build all the KDE 4 stuff in the "kde/" directory, using "./KDE.SlackBuild kde libs kdebase:nepomuk-core kdepimlibs kdebase kdebindings kdebase:kde-workspace k depim extragear" - installpkg akonadi-qt5 - build the remaining KDE 5 stuff in the "kde/" directory, using "./KDE.SlackBui ld frameworks plasma plasma-extra polkit-kde applications" - build kdei ============================================================================== Eric Hameleers / alien at slackware dot com / 09-jan-2015 --- deps/qt5/qt5.SlackBuild | 44 ++++++++++++++++++++------------------------ 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'deps/qt5/qt5.SlackBuild') diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 1abaae0..a76d018 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -36,28 +36,29 @@ # Alternate method (we don't use this): # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched # -# Modifications 2010, 2011, 2012, 2013, 2014 Eric Hameleers, Eindhoven, NL +# Modifications 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, NL # qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4, are built from original nokia sources. # # Modifications for qt 5.2.0 2013 by Michael James, AU # Modifications for qt 5.2.1 2014 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.3.1 2014 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.4.0 2015 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5 -VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +VERSION=${VERSION:-5.4.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi if [ "$ARCH" = "i486" ]; then @@ -111,11 +112,14 @@ find . \ -exec chmod 644 {} \; # Fix path to mysql header: -zcat $CWD/patches/qt5.mysql.h.diff.gz | patch -p1 --verbose || exit 1 +cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 + +# Forcibly disable pulseaudio in qtwebengine: +cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1 # Install path fix for libplatformplugin.so: # See https://bugs.webkit.org/show_bug.cgi?id=117077 -zcat $CWD/patches/platformplugin-install-path-fix.patch.gz | patch -p1 --verbose || exit 1 +cat $CWD/patches/platformplugin-install-path-fix.patch | patch -p1 --verbose || exit 1 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 @@ -139,7 +143,6 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -archdatadir /usr/lib${LIBDIRSUFFIX}/qt5 \ -docdir /usr/doc/qt5-$VERSION \ -examplesdir /usr/doc/qt5-$VERSION/examples \ - -system-harfbuzz \ -system-libpng \ -system-libjpeg \ -system-pcre \ @@ -148,20 +151,24 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -plugin-sql-mysql \ -plugin-sql-sqlite \ -accessibility \ + -alsa \ -dbus \ -glib \ -icu \ -openssl \ -optimized-qmake \ -qpa xcb \ + -qt-harfbuzz \ -reduce-relocations \ -verbose \ -xcb \ -nomake examples \ -nomake tests \ + -no-pulseaudio \ -no-separate-debug-info \ -no-strip \ - -no-pch + -no-use-gold-linker \ + -no-pch \ # No-precompiled-headers is ccache-friendly. # Sometimes a failure happens when parallelizing make. Try again if make fails, @@ -251,17 +258,6 @@ Encoding=UTF-8 Type=Application Categories=Qt;Development; EOF -cat < $PKG/usr/share/applications/qt5-config.desktop -[Desktop Entry] -Name=Qt5 Config -Comment=Configure Qt5 behavior, styles, fonts -Exec=qtconfig-qt5 -qt=5 -Icon=qt5-logo -Terminal=false -Encoding=UTF-8 -Type=Application -Categories=Qt;Settings; -EOF cat < $PKG/usr/share/applications/qt5-qdbusviewer.desktop [Desktop Entry] Name=Qt5 QDbusViewer -- cgit v1.2.3