From owner-svn-ports-head@freebsd.org Sat Jul 18 18:06:56 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0738636FFA4; Sat, 18 Jul 2020 18:06:56 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B8GCg6SxKz4YTb; Sat, 18 Jul 2020 18:06:55 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BDC47E5EB; Sat, 18 Jul 2020 18:06:55 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06II6tMQ070597; Sat, 18 Jul 2020 18:06:55 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06II6t2a070596; Sat, 18 Jul 2020 18:06:55 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202007181806.06II6t2a070596@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sat, 18 Jul 2020 18:06:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542519 - in head/multimedia/musikcube: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/multimedia/musikcube: . files X-SVN-Commit-Revision: 542519 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2020 18:06:56 -0000 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 + #include + +-#if MHD_VERSION < 0x00097000 ++#if MHD_VERSION < 0x00097001 + #define MHD_Result int + #endif +