aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdriaan de Groot <adridg@FreeBSD.org>2024-10-30 22:23:37 +0000
committerAdriaan de Groot <adridg@FreeBSD.org>2024-10-30 22:43:18 +0000
commit2d51b2dc978c1a8ee9a203709ab0066e8e0b8ab1 (patch)
treefd0d900bd817debfd51c1b0f83395d399e4090ca
parent58566c547fc5d0c69277fc5b1049697a644c0b36 (diff)
downloadports-2d51b2dc978c1a8ee9a203709ab0066e8e0b8ab1.tar.gz
ports-2d51b2dc978c1a8ee9a203709ab0066e8e0b8ab1.zip
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.
-rw-r--r--audio/musescore3/Makefile2
-rw-r--r--audio/musescore3/files/patch-thirdparty_dtl_dtl_Diff.hpp17
2 files changed, 18 insertions, 1 deletions
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;
+ }