summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2021-04-19 00:36:05 -0500
committerKyle Guinn <elyk03@gmail.com>2021-04-19 00:48:44 -0500
commitb9e3032309043c344f076f572bc3695d594e14cd (patch)
tree8a37234628802f86049fa11e312701373ddc952e /misc
parent12054dff6e52430ac9f201e6591b2b840b85ccd0 (diff)
downloadslackbuilds-b9e3032309043c344f076f572bc3695d594e14cd.tar.gz
misc/rbutil: Updated for Slackware 15.0
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'misc')
-rw-r--r--misc/rbutil/rbutil.SlackBuild12
-rw-r--r--misc/rbutil/rbutil.info2
2 files changed, 9 insertions, 5 deletions
diff --git a/misc/rbutil/rbutil.SlackBuild b/misc/rbutil/rbutil.SlackBuild
index 276898c55c..0811db9146 100644
--- a/misc/rbutil/rbutil.SlackBuild
+++ b/misc/rbutil/rbutil.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for RockboxUtility
-# Copyright 2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2020-2021 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@
PRGNAM=rbutil
SRCNAM=RockboxUtility
VERSION=${VERSION:-1.4.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -74,14 +74,18 @@ chmod -R u+w,go-w,a+rX-st .
cd rbutil/rbutilqt
# Use the system quazip. Thanks to gentoo.
-# Remove the quazip5 -> quazip renaming if using qt5.
patch -p1 < $CWD/patches/rbutil-1.4.1-quazip.patch
sed -i 's/quazip5/quazip/' base/ziputil.cpp
sed -i 's/quazip5/quazip/' base/ziputil.h
-sed -i 's/quazip5/quazip/' rbutilqt.pro
+sed -i 's/ -lquazip5//' rbutilqt.pro
sed -i 's/\$\$_PRO_FILE_PWD_\/zlib//' rbutilqt.pro
+echo "INCLUDEPATH += $(pkg-config --cflags-only-I quazip1-qt5 | sed s/-I//g)" >> rbutilqt.pro
+echo "LIBS += $(pkg-config --libs quazip1-qt5)" >> rbutilqt.pro
rm -rf quazip zlib
+# Respect SLKCFLAGS, add -fcommon for gcc >= 10.x
+sed -i "s/-O3/$SLKCFLAGS -fcommon/" ../mkimxboot/Makefile
+
# Decrease the amount of log spam.
sed -i 's/Logger::Debug/Logger::Warning/' logger/AbstractAppender.cpp
diff --git a/misc/rbutil/rbutil.info b/misc/rbutil/rbutil.info
index 33684dfc2d..7eb6347287 100644
--- a/misc/rbutil/rbutil.info
+++ b/misc/rbutil/rbutil.info
@@ -5,6 +5,6 @@ DOWNLOAD="https://download.rockbox.org/rbutil/source/RockboxUtility-v1.4.1-src.t
MD5SUM="0e29f60ee87f433087c6ead09dde81f3"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="quazip-qt4"
+REQUIRES=""
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"