Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Jul 2020 18:06:55 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r542519 - in head/multimedia/musikcube: . files
Message-ID:  <202007181806.06II6t2a070596@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adridg
Date: Sat Jul 18 18:06:55 2020
New Revision: 542519
URL: https://svnweb.freebsd.org/changeset/ports/542519

Log:
  Fix multimedia/musikcube in the face of new microhttpd.
  
  Explanation is in the patch -- there's a mismatch in expectations
  when MHD_Result is supposed to be defined. This shows up in the
  exp-run for KF5 5.72 but is otherwise unrelated to KF5.
  
  PR:		247907

Added:
  head/multimedia/musikcube/files/
  head/multimedia/musikcube/files/patch-src_plugins_server_HttpServer.h   (contents, props changed)
Modified:
  head/multimedia/musikcube/Makefile

Modified: head/multimedia/musikcube/Makefile
==============================================================================
--- head/multimedia/musikcube/Makefile	Sat Jul 18 17:38:21 2020	(r542518)
+++ head/multimedia/musikcube/Makefile	Sat Jul 18 18:06:55 2020	(r542519)
@@ -2,6 +2,7 @@
 
 PORTNAME=	musikcube
 DISTVERSION=	0.93.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	yuri@FreeBSD.org

Added: head/multimedia/musikcube/files/patch-src_plugins_server_HttpServer.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/musikcube/files/patch-src_plugins_server_HttpServer.h	Sat Jul 18 18:06:55 2020	(r542519)
@@ -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
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007181806.06II6t2a070596>