summaryrefslogtreecommitdiffstats
path: root/audio/ncmpcpp
diff options
context:
space:
mode:
Diffstat (limited to 'audio/ncmpcpp')
-rw-r--r--audio/ncmpcpp/gcc10.patch26
-rw-r--r--audio/ncmpcpp/ncmpcpp.SlackBuild20
-rw-r--r--audio/ncmpcpp/ncmpcpp.info2
3 files changed, 43 insertions, 5 deletions
diff --git a/audio/ncmpcpp/gcc10.patch b/audio/ncmpcpp/gcc10.patch
new file mode 100644
index 0000000000..466abceecf
--- /dev/null
+++ b/audio/ncmpcpp/gcc10.patch
@@ -0,0 +1,26 @@
+From 399e0f47008b487df3505476c959b4f42d8bc1b1 Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sat, 9 May 2020 14:31:52 +0200
+Subject: [PATCH] Fix build with GCC 10 by adding missing include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes the following error:
+./mpdpp.h:438:15: error: ‘runtime_error’ is not a member of ‘std’
+---
+ src/mpdpp.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mpdpp.h b/src/mpdpp.h
+index a2bb79eb..abd3666c 100644
+--- a/src/mpdpp.h
++++ b/src/mpdpp.h
+@@ -25,6 +25,7 @@
+ #include <exception>
+ #include <random>
+ #include <set>
++#include <stdexcept>
+ #include <vector>
+
+ #include <mpd/client.h>
diff --git a/audio/ncmpcpp/ncmpcpp.SlackBuild b/audio/ncmpcpp/ncmpcpp.SlackBuild
index 3bb21baf73..85f14b7bbc 100644
--- a/audio/ncmpcpp/ncmpcpp.SlackBuild
+++ b/audio/ncmpcpp/ncmpcpp.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for ncmpcpp
# Copyright 2006 Andrew Brouwers <abrouwers@gmail.com>
-# Copyright 2015-2017 Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2015-2017 Jostein Berntsen <jvbernts@online.no>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,10 +25,13 @@
# Modified by the SlackBuilds.org project
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=ncmpcpp
VERSION=${VERSION:-0.7.7}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -38,7 +41,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -72,6 +82,8 @@ 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 {} \;
+patch -p1 < $CWD/gcc10.patch
+
sed -ie 's/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4, false))/if (!mpeg_file->save(TagLib::MPEG::File::ID3v2, true, 4))/g' src/tags.cpp
./autogen.sh
@@ -96,4 +108,4 @@ mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/ncmpcpp/ncmpcpp.info b/audio/ncmpcpp/ncmpcpp.info
index 4fe60f6bb2..cb47162253 100644
--- a/audio/ncmpcpp/ncmpcpp.info
+++ b/audio/ncmpcpp/ncmpcpp.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libmpdclient"
MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"