On Sat, Nov 07 2020, Rafael Sadowski <raf...@sizeofvoid.org> wrote:
> Fix upplay with upcoming jsoncpp update.
Actually you could just drop the patch. The build would then pass c++
a bogus -I/usr/include/jsoncpp but it doesn't harm.
dirbrowser/dirb_json.cpp:#include <json/json.h>
> While here, fix WANTLIB and
> remove qtscript dependency.
>
> OK?
LGTM, ok jca@ once the jsoncpp update is in.
> diff --git a/multimedia/upplay/Makefile b/multimedia/upplay/Makefile
> index 4f5c22d5fbd..3266c6b4a13 100644
> --- a/multimedia/upplay/Makefile
> +++ b/multimedia/upplay/Makefile
> @@ -3,6 +3,7 @@
> COMMENT = UPnP audio control point
>
> DISTNAME = upplay-1.3.3
> +REVISION = 0
>
> CATEGORIES = multimedia net
>
> @@ -13,9 +14,8 @@ MAINTAINER = Pascal Stumpf <pas...@stumpf.co>
> # GPLv3+
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Script
> -WANTLIB += Qt5WebKit Qt5WebKitWidgets Qt5Widgets Qt5Xml c jsoncpp
> -WANTLIB += m upnpp
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5WebKit
> +WANTLIB += Qt5WebKitWidgets Qt5Widgets c jsoncpp m upnpp
>
> MASTER_SITES = https://www.lesbonscomptes.com/upplay/downloads/
>
> @@ -29,7 +29,6 @@ RUN_DEPENDS = devel/desktop-file-utils \
> x11/gtk+3,-guic
> LIB_DEPENDS = devel/jsoncpp \
> net/libupnpp>=0.17.1 \
> - x11/qt5/qtscript \
> x11/qt5/qtwebkit
>
> NO_TEST = Yes
> diff --git a/multimedia/upplay/patches/patch-upplay_pro
> b/multimedia/upplay/patches/patch-upplay_pro
> index 5b976050929..1882c44b18d 100644
> --- a/multimedia/upplay/patches/patch-upplay_pro
> +++ b/multimedia/upplay/patches/patch-upplay_pro
> @@ -8,7 +8,7 @@ Index: upplay.pro
> message("Prefix is $$PREFIX")
> DEFINES += PREFIX=\\\"$$PREFIX\\\"
> - INCLUDEPATH += /usr/include/jsoncpp
> -+ INCLUDEPATH += ${LOCALBASE}/include/jsoncpp
> ++ INCLUDEPATH += ${LOCALBASE}/include/json
>
> # Installation stuff
> target.path = "$$PREFIX/bin"
>
--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
