From nobody Wed Oct 30 22:43:20 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xf2GJ6nGcz5c9Jj; Wed, 30 Oct 2024 22:43:20 +0000 (UTC) (envelope-from git@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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xf2GJ6Dx8z4M07; Wed, 30 Oct 2024 22:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730328200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oL6scXD4Lm3RqXyvF+2bYjfRKYJteJyLr6ACLxXxfxw=; b=MNQNHVF0DsWxsw+C2cfiszBxno3vqVZAwCdmDQr4WAamB8D6a5+PVZv0zhv/h4LluqQOP0 xSkewDTv5hl7RiqIajoY68q4xHQBsToXnt1sr3apJd8gdqFNaPYOvAhRbZ6mN1FhvCFscc Ig/iymjL3XZbOiui/x2Lo7jJyqYhqjTjmJGgUDycjQn/pK43vkh5bCbZKpEl7F1b9rt8TP hgsoVsIw+Q1O6BN7Q64H35hugjNFU20HcocFcvWhuK9pI4vPPqw/AMsEXhArHL6foPPI+z n2oBNePMjGCrCvk2aq1bCSNh2PUvRAiPOGG2xEobiSGKf+tjZ4glBqa4omLTXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730328200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oL6scXD4Lm3RqXyvF+2bYjfRKYJteJyLr6ACLxXxfxw=; b=J1tS4p1aKvis12IG4JA96JMCmQ4h0bsFCWlRL+CwUUDLTMijdO+0AgcPs2lY5gYXXov3Nu yX3oiw2j1SHZFtzmsFdLpvGIsYctQ9czR0t0C0q3um9PZac45uEqJ67l+lkJXs+Ns5fyIZ 0ZDyHWKQy/NTtIkc4APBt0fya2xtTQQwtIrBCgsca4JwPHL7KLZuB8dmHe1jtII3iX39/l Wq1aBad8p55QSo1ODdWvbM8pnFiW2sBSnSC1aVHJdzE61PDBTx4hCpCQZBg6n+r0aWV0Pj v5ujEfHhXbajQOHNkIbKCpMKQuVIK1d2RJeceWyTQyWQMe5ndbMmYLc/BHpgoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730328200; a=rsa-sha256; cv=none; b=QlkVTpGRZEpy8MOa2DdQSBar3sQwQOnkEweJ85ReNYPEA6mcp5K3sV9D9lnfLG2ZRw5dPo nfm8v40aSmZX5WZ41AtBRE1YEBF4UKp9/CryasrxikrnIxFqQIvpB1TvGLU/SICnqQqK8d O4er8P7GHs3AAfgwFutRz4Fv7HShFwZOApp3iEt2qBPW72pJgpJm/FXffr4MSPw51rtmDs 7F+GVs0J+bDjqqeZD4PhNYFClow9T60W62jF8bhd79vwNr+ebTn6g39Br+LF5MdKtGYNGB 7kLPm3T1Md3CcAlOjYkWghcy241xOl+vrsA7t8X2UFDOauPdf5eVlTiegb3mAg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xf2GJ5j2Lz1QMd; Wed, 30 Oct 2024 22:43:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49UMhKN2036570; Wed, 30 Oct 2024 22:43:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UMhKLV036567; Wed, 30 Oct 2024 22:43:20 GMT (envelope-from git) Date: Wed, 30 Oct 2024 22:43:20 GMT Message-Id: <202410302243.49UMhKLV036567@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 2d51b2dc978c - main - audio/musescore3: fix build on 15-CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d51b2dc978c1a8ee9a203709ab0066e8e0b8ab1 Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d51b2dc978c1a8ee9a203709ab0066e8e0b8ab1 commit 2d51b2dc978c1a8ee9a203709ab0066e8e0b8ab1 Author: Adriaan de Groot AuthorDate: 2024-10-30 22:23:37 +0000 Commit: Adriaan de Groot CommitDate: 2024-10-30 22:43:18 +0000 audio/musescore3: fix build on 15-CURRENT Error message is === /wrkdirs/usr/ports/audio/musescore3/work/MuseScore-3.6.2/thirdparty/dtl/dtl/Diff.hpp:166:27: error: cannot assign to non-static data member within const member function 'enableTrivial' 166 | this->trivial = true; /wrkdirs/usr/ports/audio/musescore3/work/MuseScore-3.6.2/thirdparty/dtl/dtl/Diff.hpp:165:14: note: member function 'dtl::Diff::enableTrivial' is declared const here 165 | void enableTrivial () const { === While enableTrivial() is never called -- it's a template, and never instantiated -- clang is now more strict about would-be-ill-formed- if-instantiated, it seems. --- audio/musescore3/Makefile | 2 +- .../musescore3/files/patch-thirdparty_dtl_dtl_Diff.hpp | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/audio/musescore3/Makefile b/audio/musescore3/Makefile index 671615583dba..e1c58ceed5c8 100644 --- a/audio/musescore3/Makefile +++ b/audio/musescore3/Makefile @@ -1,7 +1,7 @@ PORTNAME= ${GH_PROJECT:tl}3 DISTVERSIONPREFIX= v DISTVERSION= 3.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MAINTAINER= adridg@FreeBSD.org diff --git a/audio/musescore3/files/patch-thirdparty_dtl_dtl_Diff.hpp b/audio/musescore3/files/patch-thirdparty_dtl_dtl_Diff.hpp new file mode 100644 index 000000000000..5e6310181e2e --- /dev/null +++ b/audio/musescore3/files/patch-thirdparty_dtl_dtl_Diff.hpp @@ -0,0 +1,17 @@ +--- thirdparty/dtl/dtl/Diff.hpp.orig 2024-10-29 20:20:10 UTC ++++ thirdparty/dtl/dtl/Diff.hpp +@@ -162,14 +162,6 @@ namespace dtl { + return trivial; + } + +- void enableTrivial () const { +- this->trivial = true; +- } +- +- void disableTrivial () { +- this->trivial = false; +- } +- + void editDistanceOnlyEnabled () { + this->editDistanceOnly = true; + }