summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Woodfall <dave@slackbuilds.org>2020-04-20 02:59:37 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2020-04-24 08:18:55 +0700
commit78fcbc5b3fcb44a72d1edceaeac6bb9f466d24e1 (patch)
treeb25d5d5ed980806c2fd3f4d4928543ba21458d74
parent4722eda76ce2713a873720759316b03ffd56cbef (diff)
downloadslackbuilds-78fcbc5b3fcb44a72d1edceaeac6bb9f466d24e1.tar.gz
libraries/qt5-webkit: Fix source directory.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/qt5-webkit/qt5-webkit.SlackBuild17
-rw-r--r--libraries/qt5-webkit/qt5-webkit.info2
2 files changed, 5 insertions, 14 deletions
diff --git a/libraries/qt5-webkit/qt5-webkit.SlackBuild b/libraries/qt5-webkit/qt5-webkit.SlackBuild
index c8693bff38..71efbc8fac 100644
--- a/libraries/qt5-webkit/qt5-webkit.SlackBuild
+++ b/libraries/qt5-webkit/qt5-webkit.SlackBuild
@@ -30,9 +30,8 @@
PRGNAM=qt5-webkit
SRCNAM=qtwebkit
VERSION=${VERSION:-5.212.0_alpha4}
-SRCDIR=${SRCNAM}-$(echo $VERSION | sed -r "s,\.[[:digit:]]+_.*,,")
-SRCVERSION=$(echo v$VERSION | tr -s '_' '-')
-BUILD=${BUILD:-2}
+SRCVERSION=$(echo $VERSION | tr -s '_' '-')
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -67,9 +66,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $SRCDIR
+rm -rf $SRCNAM-$SRCVERSION
tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz
-cd $SRCDIR
+cd $SRCNAM-$SRCVERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -77,14 +76,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Use -reduce-relocations only on i?86 and x86_64 architextures.
-# https://bugreports.qt-project.org/browse/QTBUG-36129
-if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
- RELOCATIONS="-reduce-relocations"
-else
- RELOCATIONS=""
-fi
-
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
diff --git a/libraries/qt5-webkit/qt5-webkit.info b/libraries/qt5-webkit/qt5-webkit.info
index b73e5eee11..744f377419 100644
--- a/libraries/qt5-webkit/qt5-webkit.info
+++ b/libraries/qt5-webkit/qt5-webkit.info
@@ -2,7 +2,7 @@ PRGNAM="qt5-webkit"
VERSION="5.212.0_alpha4"
HOMEPAGE="https://www.qt.io"
DOWNLOAD="https://github.com/qt/qtwebkit/archive/v5.212.0-alpha4/qtwebkit-5.212.0-alpha4.tar.gz"
-MD5SUM="cd77f90cbf312f88d23699a65cd76ee4"
+MD5SUM="22e442063e7d0362439934442e269ed2"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="qt5 hyphen"