From 90d77e6eacf554de433018b46668bd0d2456bd87 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 30 Apr 2015 14:36:34 +0200 Subject: Refreshed all remaining deps for KDE 5_15.04. --- deps/OpenAL/OpenAL.SlackBuild | 2 +- deps/akonadi-qt5/akonadi-qt5.SlackBuild | 4 +- deps/akonadi-qt5/doinst.sh | 5 + deps/akonadi-qt5/doinst.sh.gz | Bin 110 -> 0 bytes deps/alldeps.SlackBuild | 38 ++----- .../extra-cmake-modules.SlackBuild | 2 +- deps/json-glib/json-glib.SlackBuild | 2 +- deps/libappindicator/libappindicator.SlackBuild | 2 +- deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild | 2 +- deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild | 2 +- deps/libepoxy/libepoxy.SlackBuild | 2 +- deps/libindicator/libindicator.SlackBuild | 2 +- deps/phonon-gstreamer/phonon-gstreamer.SlackBuild | 2 +- deps/phonon-vlc/phonon-vlc.SlackBuild | 2 +- deps/phonon/phonon.SlackBuild | 2 +- deps/polkit-qt5-1/polkit-qt5-1.SlackBuild | 2 +- deps/qca-qt5/qca-qt5.SlackBuild | 2 +- deps/qt-gstreamer/doinst.sh | 5 + deps/qt-gstreamer/doinst.sh.gz | Bin 110 -> 0 bytes deps/qt-gstreamer/qt-gstreamer.SlackBuild | 17 +-- deps/qt-gstreamer0/doinst.sh | 5 + deps/qt-gstreamer0/qt-gstreamer0.SlackBuild | 126 +++++++++++++++++++++ deps/qt-gstreamer0/slack-desc | 19 ++++ deps/qt5/doinst.sh | 9 ++ deps/qt5/doinst.sh.gz | Bin 172 -> 0 bytes deps/qt5/qt5.SlackBuild | 11 +- deps/sni-qt/sni-qt.SlackBuild | 2 +- deps/updates.SlackBuild | 31 ++--- deps/wayland/wayland.SlackBuild | 3 +- deps/xapian-core/xapian-core.SlackBuild | 2 +- 30 files changed, 223 insertions(+), 80 deletions(-) create mode 100644 deps/akonadi-qt5/doinst.sh delete mode 100644 deps/akonadi-qt5/doinst.sh.gz create mode 100644 deps/qt-gstreamer/doinst.sh delete mode 100644 deps/qt-gstreamer/doinst.sh.gz create mode 100644 deps/qt-gstreamer0/doinst.sh create mode 100755 deps/qt-gstreamer0/qt-gstreamer0.SlackBuild create mode 100644 deps/qt-gstreamer0/slack-desc create mode 100644 deps/qt5/doinst.sh delete mode 100644 deps/qt5/doinst.sh.gz (limited to 'deps') diff --git a/deps/OpenAL/OpenAL.SlackBuild b/deps/OpenAL/OpenAL.SlackBuild index 28c42f6..984b4c1 100755 --- a/deps/OpenAL/OpenAL.SlackBuild +++ b/deps/OpenAL/OpenAL.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=OpenAL SRCNAM=openal-soft VERSION=${VERSION:-1.16.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} CWD=$(pwd) diff --git a/deps/akonadi-qt5/akonadi-qt5.SlackBuild b/deps/akonadi-qt5/akonadi-qt5.SlackBuild index 0d6852a..d9bccbf 100755 --- a/deps/akonadi-qt5/akonadi-qt5.SlackBuild +++ b/deps/akonadi-qt5/akonadi-qt5.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=akonadi-qt5 SRCNAM=akonadi VERSION=${VERSION:-1.13.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} @@ -116,7 +116,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/akonadi-qt5/doinst.sh b/deps/akonadi-qt5/doinst.sh new file mode 100644 index 0000000..aab1b9e --- /dev/null +++ b/deps/akonadi-qt5/doinst.sh @@ -0,0 +1,5 @@ + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 +fi + diff --git a/deps/akonadi-qt5/doinst.sh.gz b/deps/akonadi-qt5/doinst.sh.gz deleted file mode 100644 index bedb7a0..0000000 Binary files a/deps/akonadi-qt5/doinst.sh.gz and /dev/null differ diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild index 0f0dd7c..74c2aa5 100755 --- a/deps/alldeps.SlackBuild +++ b/deps/alldeps.SlackBuild @@ -14,53 +14,35 @@ TMP=${TMP:-/tmp} QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR ALLDEPS=" \ - qt \ - sni-qt \ - cmake \ extra-cmake-modules \ - harfbuzz \ - qt \ + sni-qt \ + sip \ + PyQt \ qt5 \ - soprano \ - akonadi \ - attica \ - shared-desktop-ontologies \ - LibRaw \ eigen2 \ - eigen3 \ - orc \ xapian-core \ - libfakekey \ - grantlee \ - librevenge \ - libwpd \ - libodfgen \ OpenAL \ - gstreamer1 \ - gst1-plugins-base \ - gst1-plugins-good \ - qt-gstreamer1 \ + qt-gstreamer0 \ + qt-gstreamer \ qjson \ - sip \ - PyQt \ phonon \ phonon-gstreamer \ - qt-gstreamer \ - strigi \ - libssh \ + sip \ + PyQt \ + PyQt5 \ qca-qt5 \ akonadi-qt5 \ libdbusmenu-qt5 \ polkit-qt-1 \ polkit-qt5-1 \ - poppler \ + grantlee-qt5 \ libepoxy \ - exiv2 \ wayland \ json-glib \ libdbusmenu-gtk \ libindicator \ libappindicator \ + cfitsio \ " # Allow for specification of individual packages to be built: diff --git a/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild b/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild index 615d6bb..80c2596 100755 --- a/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild +++ b/deps/extra-cmake-modules/extra-cmake-modules.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=extra-cmake-modules -VERSION=${VERSION:-1.7.0} +VERSION=${VERSION:-5.9.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/deps/json-glib/json-glib.SlackBuild b/deps/json-glib/json-glib.SlackBuild index 98ba978..29b7fd2 100755 --- a/deps/json-glib/json-glib.SlackBuild +++ b/deps/json-glib/json-glib.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=json-glib VERSION=${VERSION:-0.16.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} diff --git a/deps/libappindicator/libappindicator.SlackBuild b/deps/libappindicator/libappindicator.SlackBuild index 2e384f3..2c11c95 100755 --- a/deps/libappindicator/libappindicator.SlackBuild +++ b/deps/libappindicator/libappindicator.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=libappindicator VERSION=${VERSION:-12.10.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} diff --git a/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild b/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild index bfc39c8..19a0b7c 100755 --- a/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild +++ b/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=libdbusmenu-gtk SRCNAM=libdbusmenu VERSION=${VERSION:-12.10.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} diff --git a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild index 21ff2f6..68d613d 100755 --- a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild +++ b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild @@ -31,7 +31,7 @@ PKGNAM=libdbusmenu-qt5 VERSION=${VERSION:-r267_20140619} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/libepoxy/libepoxy.SlackBuild b/deps/libepoxy/libepoxy.SlackBuild index a4fa0b9..fdac249 100755 --- a/deps/libepoxy/libepoxy.SlackBuild +++ b/deps/libepoxy/libepoxy.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libepoxy VERSION=${VERSION:-1.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/deps/libindicator/libindicator.SlackBuild b/deps/libindicator/libindicator.SlackBuild index a3a7b61..0ecc19d 100755 --- a/deps/libindicator/libindicator.SlackBuild +++ b/deps/libindicator/libindicator.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=libindicator VERSION=${VERSION:-12.10.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j4 "} diff --git a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild index ccdbd8b..e355306 100755 --- a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild +++ b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=phonon-gstreamer SRCNAM=phonon-backend-gstreamer VERSION=${VERSION:-4.8.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j7 "} diff --git a/deps/phonon-vlc/phonon-vlc.SlackBuild b/deps/phonon-vlc/phonon-vlc.SlackBuild index 03b62be..8089973 100755 --- a/deps/phonon-vlc/phonon-vlc.SlackBuild +++ b/deps/phonon-vlc/phonon-vlc.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=phonon-vlc SRCNAM=phonon-backend-vlc VERSION=${VERSION:-0.8.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:" -j7 "} diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild index cda7266..6f7a8b5 100755 --- a/deps/phonon/phonon.SlackBuild +++ b/deps/phonon/phonon.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=phonon VERSION=${VERSION:-4.8.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild index cb5ecc5..657b172 100755 --- a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild +++ b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=polkit-qt5-1 VERSION=${VERSION:-3882e11_20140802git} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 445f8c4..3dce1f8 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=qca-qt5 VERSION=${VERSION:-2.1.0.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: diff --git a/deps/qt-gstreamer/doinst.sh b/deps/qt-gstreamer/doinst.sh new file mode 100644 index 0000000..aab1b9e --- /dev/null +++ b/deps/qt-gstreamer/doinst.sh @@ -0,0 +1,5 @@ + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 +fi + diff --git a/deps/qt-gstreamer/doinst.sh.gz b/deps/qt-gstreamer/doinst.sh.gz deleted file mode 100644 index bedb7a0..0000000 Binary files a/deps/qt-gstreamer/doinst.sh.gz and /dev/null differ diff --git a/deps/qt-gstreamer/qt-gstreamer.SlackBuild b/deps/qt-gstreamer/qt-gstreamer.SlackBuild index e75f55d..91950df 100755 --- a/deps/qt-gstreamer/qt-gstreamer.SlackBuild +++ b/deps/qt-gstreamer/qt-gstreamer.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA # Copyright 2014, 2015 Eric Hameleers, Eindhoven, NL # All rights reserved. # @@ -23,20 +23,21 @@ PKGNAM=qt-gstreamer -VERSION=${VERSION:-0.10.3} +VERSION=${VERSION:-1.2.0} BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i486 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; + *) export ARCH=$MARCH ;; esac - export ARCH fi if [ "$ARCH" = "i486" ]; then @@ -118,7 +119,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/qt-gstreamer0/doinst.sh b/deps/qt-gstreamer0/doinst.sh new file mode 100644 index 0000000..aab1b9e --- /dev/null +++ b/deps/qt-gstreamer0/doinst.sh @@ -0,0 +1,5 @@ + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database ./usr/share/mime >/dev/null 2>&1 +fi + diff --git a/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild b/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild new file mode 100755 index 0000000..aa0ff6c --- /dev/null +++ b/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild @@ -0,0 +1,126 @@ +#!/bin/sh + +# Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2014, 2015 Eric Hameleers, Eindhoven, NL +# 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. + + +PKGNAM=qt-gstreamer0 +SRCNAM=qt-gstreamer +VERSION=${VERSION:-0.10.3} +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + 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: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || 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 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DQT_VERSION=4 \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +# Conditional build of Qt5 support: +if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then + mkdir -p build-qt5 + cd build-qt5 + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DQT_VERSION=5 \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + cd - +fi + +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING HACKING NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +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-$VERSION-$ARCH-$BUILD.txz + diff --git a/deps/qt-gstreamer0/slack-desc b/deps/qt-gstreamer0/slack-desc new file mode 100644 index 0000000..16b3300 --- /dev/null +++ b/deps/qt-gstreamer0/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-----------------------------------------------------| +qt-gstreamer0: qt-gstreamer0 (C++ bindings for gstreamer 0.x) +qt-gstreamer0: +qt-gstreamer0: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API, +qt-gstreamer0: plus some helper classes and elements for integrating GStreamer +qt-gstreamer0: better in Qt applications. +qt-gstreamer0: The goal of this module is to allow easy use of GStreamer for +qt-gstreamer0: applications targetting MeeGo Mobile or the KDE desktop. +qt-gstreamer0: +qt-gstreamer0: Homepage: +qt-gstreamer0: http://gstreamer.freedesktop.org/modules/qt-gstreamer.html +qt-gstreamer0: diff --git a/deps/qt5/doinst.sh b/deps/qt5/doinst.sh new file mode 100644 index 0000000..3e5691a --- /dev/null +++ b/deps/qt5/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/deps/qt5/doinst.sh.gz b/deps/qt5/doinst.sh.gz deleted file mode 100644 index e17bef4..0000000 Binary files a/deps/qt5/doinst.sh.gz and /dev/null differ diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index a76d018..06608fc 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -43,9 +43,10 @@ # 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 +# Modifications for qt 5.4.1 2015 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5 -VERSION=${VERSION:-5.4.0} +VERSION=${VERSION:-5.4.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -111,6 +112,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix dangling symlinks, thanks Larry Hajali: +rm -f qtwebengine/src/3rdparty/chromium/third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api +rm -f qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf +ln -s ../../../../../tools/perf \ + qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/ + # Fix path to mysql header: cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 @@ -282,8 +289,8 @@ if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then fi mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh 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-$VERSION-$ARCH-$BUILD.txz diff --git a/deps/sni-qt/sni-qt.SlackBuild b/deps/sni-qt/sni-qt.SlackBuild index 3f492df..766d6c0 100755 --- a/deps/sni-qt/sni-qt.SlackBuild +++ b/deps/sni-qt/sni-qt.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=sni-qt VERSION=${VERSION:-0.2.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild index 9e33427..22dfb2f 100755 --- a/deps/updates.SlackBuild +++ b/deps/updates.SlackBuild @@ -14,47 +14,30 @@ TMP=${TMP:-/tmp} QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR ALLDEPS=" \ - qt \ - sni-qt \ - cmake \ extra-cmake-modules \ - strigi \ - soprano \ - akonadi \ - attica \ - shared-desktop-ontologies \ - LibRaw \ + sni-qt \ + sip \ + PyQt \ eigen2 \ - eigen3 \ - orc \ OpenAL \ - harfbuzz \ - poppler \ xapian-core \ - libssh \ - libfakekey \ - grantlee \ - librevenge \ - libwpd \ - libodfgen \ - gstreamer1 \ - gst1-plugins-base \ - gst1-plugins-good \ qt5 \ qca-qt5 \ libdbusmenu-qt5 \ + qt-gstreamer0 \ qt-gstreamer \ - qt-gstreamer1 \ phonon \ phonon-gstreamer \ + PyQt5 \ polkit-qt5-1 \ + grantlee-qt5 \ libepoxy \ - exiv2 \ wayland \ json-glib \ libdbusmenu-gtk \ libindicator \ libappindicator \ + cfitsio \ " # needed only by future kdepimlibs-framework #akonadi-qt5 \ diff --git a/deps/wayland/wayland.SlackBuild b/deps/wayland/wayland.SlackBuild index cf3d95f..8414afb 100755 --- a/deps/wayland/wayland.SlackBuild +++ b/deps/wayland/wayland.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=wayland -VERSION=${VERSION:-1.6.0} +VERSION=${VERSION:-1.7.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} @@ -98,6 +98,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-static=no \ + --disable-documentation \ --build=$TARGET # Build and install: diff --git a/deps/xapian-core/xapian-core.SlackBuild b/deps/xapian-core/xapian-core.SlackBuild index c9a8065..08ae1a3 100755 --- a/deps/xapian-core/xapian-core.SlackBuild +++ b/deps/xapian-core/xapian-core.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=xapian-core VERSION=${VERSION:-1.2.19} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} -- cgit v1.2.3