diff --git a/editors/diamond/Makefile b/editors/diamond/Makefile index 0c1433fde6b1..59576b460796 100644 --- a/editors/diamond/Makefile +++ b/editors/diamond/Makefile @@ -1,37 +1,37 @@ PORTNAME= diamond DISTVERSION= 1.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= https://download.copperspice.com/${PORTNAME}/source/ PKGNAMESUFFIX= -cs DISTNAME= Diamond-${DISTVERSION} MAINTAINER= adridg@FreeBSD.org COMMENT= Compact programmers editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE NOT_FOR_ARCHS= i386 LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell BUILD_DEPENDS= copperspice>=1.7:x11-toolkits/copperspice RUN_DEPENDS= copperspice>=1.7:x11-toolkits/copperspice USES= compiler:c++17-lang cmake dos2unix gl gnome iconv jpeg pkgconfig ssl tar:bz2 xorg USE_GL= gl USE_GNOME= cairo glib20 libxml2 USE_XORG= ice sm x11 xau xcb xcursor xext xfixes xi xinerama xrandr xrender # It's a bit up-in-the-air if the GitHub tarballs are less fragile # than the upstream source tarballs, which have their own peculiarities # (e.g. CRLF, no subdir). We dos2unix the files that need patching. # # USE_GITHUB= yes # GH_ACCOUNT= copperspice # 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 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; +