git: eebfbce98dc2 - main - editors/diamond: fix build against Copperspice 1.7.4

The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=eebfbce98dc2feda33244508251ba19e2de368a8

commit eebfbce98dc2feda33244508251ba19e2de368a8
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2022-05-08 21:14:36 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2022-05-08 21:16:23 +0000

    editors/diamond: fix build against Copperspice 1.7.4
    
    1.7.4 introduces source-incompatible changes; there is no
    corresponding Diamond release, so patch with an upstream
    commit that fixes it.
    
    See https://github.com/copperspice/diamond/issues/23
---
 editors/diamond/Makefile                           |  4 ++--
 ...h-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff | 28 ++++++++++++++++++++++
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/editors/diamond/Makefile b/editors/diamond/Makefile
index 0c1433fde6b1..59576b460796 100644
--- a/editors/diamond/Makefile
+++ b/editors/diamond/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	diamond
 DISTVERSION=	1.3.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	editors
 MASTER_SITES=	https://download.copperspice.com/${PORTNAME}/source/
 PKGNAMESUFFIX=	-cs
@@ -32,6 +32,6 @@ USE_XORG=	ice sm x11 xau xcb xcursor xext xfixes xi xinerama xrandr xrender
 # GH_PROJECT=	diamond
 #
 NO_WRKSUBDIR=	yes
-DOS2UNIX_FILES=	CMakeLists.txt src/CMakeLists.txt src/json.cpp src/recent_tabs.cpp
+DOS2UNIX_FILES=	CMakeLists.txt src/CMakeLists.txt src/dialog_macro.cpp src/json.cpp src/recent_tabs.cpp
 
 .include <bsd.port.mk>
diff --git a/editors/diamond/files/patch-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff b/editors/diamond/files/patch-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff
new file mode 100644
index 000000000000..328c381be992
--- /dev/null
+++ b/editors/diamond/files/patch-aeca606910d28cb9b1007e840a09dd6af3e1dc94.diff
@@ -0,0 +1,28 @@
+diff --git a/src/dialog_macro.cpp b/src/dialog_macro.cpp
+index 47d0ab0..d8ca280 100644
+--- src/dialog_macro.cpp
++++ src/dialog_macro.cpp
+@@ -169,19 +169,19 @@ void Dialog_Macro::view()
+             msg += " ";
+             break;
+ 
+-         case Qt::SHIFT:
++         case Qt::ShiftModifier:
+             msg += "Shift";
+             break;
+ 
+-         case Qt::CTRL:
++         case Qt::ControlModifier:
+             msg += "Control";
+             break;
+ 
+-         case Qt::META:
++         case Qt::MetaModifier:
+             msg += "Meta";
+             break;
+ 
+-         case Qt::ALT:
++         case Qt::AltModifier:
+             msg += "Alt";
+             break;
+