From ddfdebbe9bad6eeb4328fd23f657b86bb9fc0fb9 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 14 Sep 2019 13:08:13 +0200
Subject: Deps: updated for the upcoming release

The qt5 and qt5-speech packages have been updated to 5.13.1,
PyQt5 was updated to 5.13.0.
There's a new official polkit-qt5-1 version too: 0.113.0.
The cryfs package was updated to 0.10.2.
Tthe phonon layer is now Qt5-only:
  phonon 4.11.0, phonon-gstreamer 4.10.0, phonon-vlc 0.11.0.
---
 deps/wayland-protocols/.url                         |  4 ++--
 deps/wayland-protocols/wayland-protocols.SlackBuild | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'deps/wayland-protocols')

diff --git a/deps/wayland-protocols/.url b/deps/wayland-protocols/.url
index 45e2e88..b501805 100644
--- a/deps/wayland-protocols/.url
+++ b/deps/wayland-protocols/.url
@@ -1,3 +1,3 @@
-https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz
-https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz.sig
+https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz
+https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz.sig
 
diff --git a/deps/wayland-protocols/wayland-protocols.SlackBuild b/deps/wayland-protocols/wayland-protocols.SlackBuild
index 9e94b93..044da9f 100755
--- a/deps/wayland-protocols/wayland-protocols.SlackBuild
+++ b/deps/wayland-protocols/wayland-protocols.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2017  Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2017, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -22,14 +22,14 @@
 #   SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 
+cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=wayland-protocols
-VERSION=${VERSION:-1.12}
+VERSION=${VERSION:-1.18}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -44,12 +44,17 @@ if [ -z "$ARCH" ]; then
   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-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
-- 
cgit v1.2.3