From 958155f4b84654f6bc8eb2945c394e28b5872ccb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 6 Jan 2021 23:57:49 +0100
Subject: [PATCH] musikcube: rebuild against OpenSSL

---
 common/shlibs                              |  2 +-
 srcpkgs/musikcube/patches/microhttpd.patch | 16 ++++++++++++++++
 srcpkgs/musikcube/template                 |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/musikcube/patches/microhttpd.patch

diff --git a/common/shlibs b/common/shlibs
index a3791ef8faf..c6e8b2c32fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -593,7 +593,7 @@ libcanberra-gtk.so.0 libcanberra-gtk-0.30_6
 libcanberra-gtk3.so.0 libcanberra-gtk3-0.30_6
 libgtop-2.0.so.11 libgtop-2.38.0_1
 librarian.so.0 rarian-0.8.1_1
-libmusikcore.so musikcube-0.60.1_1
+libmusikcore.so musikcube-0.93.1_3
 libgnome-menu-3.so.0 gnome-menus-2.91.6_1
 libart_lgpl_2.so.2 libart-2.3.20_1
 libgnomecanvas-2.so.0 libgnomecanvas-2.30.1_1
diff --git a/srcpkgs/musikcube/patches/microhttpd.patch b/srcpkgs/musikcube/patches/microhttpd.patch
new file mode 100644
index 00000000000..dc807dbf6bf
--- /dev/null
+++ b/srcpkgs/musikcube/patches/microhttpd.patch
@@ -0,0 +1,16 @@
+Although musikcube thinks that MHD (microhttpd) version 0.9.70
+defines MHD_Result, the headers installed by our version 0.9.70
+(see PR 247180) don't define that type. So bump the version
+check here trivially, to keep using int.
+ 
+--- src/plugins/server/HttpServer.h.orig	2020-07-18 17:58:19 UTC
++++ src/plugins/server/HttpServer.h
+@@ -43,7 +43,7 @@ extern "C" {
+ #include <mutex>
+ #include <vector>
+ 
+-#if MHD_VERSION < 0x00097000
++#if MHD_VERSION < 0x00097001
+ #define MHD_Result int
+ #endif
+ 
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index c5d5cb0b40c..bf42f9e53c2 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,13 +1,13 @@
 # Template file for 'musikcube'
 pkgname=musikcube
 version=0.93.1
-revision=2
+revision=3
 build_style=cmake
 make_cmd=make
 configure_args="-DNO_NCURSESW=1 -DENABLE_SNDIO=true -DDISABLE_STRIP=true"
 hostmakedepends="pkg-config"
 makedepends="boost-devel libogg-devel libmicrohttpd-devel ffmpeg-devel
- libressl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
+ openssl-devel pulseaudio-devel lame-devel zlib-devel alsa-lib-devel
  libvorbis-devel libcurl-devel ncurses-devel libev-devel taglib-devel
  sndio-devel"
 short_desc="Terminal-based music player in c++"