editors/cpeditor: Update 6.6.5 -> 6.8.1

3 files changed, 17 insertions, 32 deletions

diff --git a/editors/cpeditor/Makefile b/editors/cpeditor/Makefile
index cec68ea1f73a..f04e29565ae9 100644
--- a/editors/cpeditor/Makefile
+++ b/editors/cpeditor/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpeditor
-DISTVERSION=	6.6.5
+DISTVERSION=	6.8.1
 CATEGORIES=	editors devel
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,14 +14,15 @@ USES=		cmake compiler:c++14-lang qt:5
 USE_QT=		core gui network widgets buildtools_build linguisttools_build qmake_build
 USE_GITHUB=	yes
 GH_TUPLE=	\
-		cpeditor:QCodeEditor:97cdee8a47a0c6d61a1587d23e6f26b870333936:cpeditor_QCodeEditor/third_party/QCodeEditor \
-		itay-grudev:SingleApplication:e93c12ab69a25fcaa963416f0e348d3269263190:itay_grudev_SingleApplication/third_party/singleapplication \
+		cpeditor:QCodeEditor:32719697664220911921b4c9f3bb09cdb43166ce:cpeditor_QCodeEditor/third_party/QCodeEditor \
+		itay-grudev:SingleApplication:4aeac8fa3e7e96385ba556346ebb6020e35ffdd8:itay_grudev_SingleApplication/third_party/singleapplication \
 		cpeditor:QtFindReplaceDialog:d6adb0091641aed078e1f41a48278374fa3b328b:cpeditor_QtFindReplaceDialog/third_party/QtFindReplaceDialog \
 		cpeditor:lsp-cpp:44e7cdea787c19646f3c88ba8cbd0ed5da02b9cd:cpeditor_lsp_cpp/third_party/lsp-cpp \
-		MikeMirzayanov:testlib:1277b269ec417dc01a786a6775a10b9189a0fadc:MikeMirzayanov_testlib/third_party/testlib \
+		cpeditor:qhttp:fd780d2a0bee1246f2ab0a17f6eebab6403fce64:cpeditor_qhttp/third_party/qhttp \
+		MikeMirzayanov:testlib:f5b55f138709e97916f51bdb7a23baed941b5751:MikeMirzayanov_testlib/third_party/testlib
 
 PLIST_FILES=	bin/cpeditor \
 		share/applications/cpeditor.desktop \
-		share/icons/cpeditor-icon.png
+		share/icons/hicolor/512x512/apps/cpeditor.png
 
 .include <bsd.port.mk>
diff --git a/editors/cpeditor/distinfo b/editors/cpeditor/distinfo
index 7af161055e5c..0c2ee25dbb7c 100644
--- a/editors/cpeditor/distinfo
+++ b/editors/cpeditor/distinfo
@@ -1,13 +1,15 @@
-TIMESTAMP = 1601627993
-SHA256 (cpeditor-cpeditor-6.6.5_GH0.tar.gz) = b96b10fdcb6a45802d45153b97deae321d3dbd908bb1906359923c15c39cb24b
-SIZE (cpeditor-cpeditor-6.6.5_GH0.tar.gz) = 440118
-SHA256 (cpeditor-QCodeEditor-97cdee8a47a0c6d61a1587d23e6f26b870333936_GH0.tar.gz) = dc4be6c154873d67474a9016628709da2a8232a79832d33d28f61ec51c110d14
-SIZE (cpeditor-QCodeEditor-97cdee8a47a0c6d61a1587d23e6f26b870333936_GH0.tar.gz) = 94353
-SHA256 (itay-grudev-SingleApplication-e93c12ab69a25fcaa963416f0e348d3269263190_GH0.tar.gz) = 370d8ea1c3883cada3db24745b0b814e6b212c53b93694b67f4995e65abcd23f
-SIZE (itay-grudev-SingleApplication-e93c12ab69a25fcaa963416f0e348d3269263190_GH0.tar.gz) = 19320
+TIMESTAMP = 1613280630
+SHA256 (cpeditor-cpeditor-6.8.1_GH0.tar.gz) = bc15e83d8d935c5c51f0440ba8ccabc71e1932611f15c5dc1580451f30640aec
+SIZE (cpeditor-cpeditor-6.8.1_GH0.tar.gz) = 492315
+SHA256 (cpeditor-QCodeEditor-32719697664220911921b4c9f3bb09cdb43166ce_GH0.tar.gz) = d3ca81f6668958faa855a2d284038e3cf3a39176a2b134a5051ca5a929361e13
+SIZE (cpeditor-QCodeEditor-32719697664220911921b4c9f3bb09cdb43166ce_GH0.tar.gz) = 94358
+SHA256 (itay-grudev-SingleApplication-4aeac8fa3e7e96385ba556346ebb6020e35ffdd8_GH0.tar.gz) = b5066c6dab3a35459a01b839e3e1c3b1d6d1cb70e83bd245110cd1c86476aa32
+SIZE (itay-grudev-SingleApplication-4aeac8fa3e7e96385ba556346ebb6020e35ffdd8_GH0.tar.gz) = 20885
 SHA256 (cpeditor-QtFindReplaceDialog-d6adb0091641aed078e1f41a48278374fa3b328b_GH0.tar.gz) = 3514b5c5d9509b32277f16500d86b32a964c4c911f8745d68739cc2d20d8ae18
 SIZE (cpeditor-QtFindReplaceDialog-d6adb0091641aed078e1f41a48278374fa3b328b_GH0.tar.gz) = 146972
 SHA256 (cpeditor-lsp-cpp-44e7cdea787c19646f3c88ba8cbd0ed5da02b9cd_GH0.tar.gz) = 43545556df3b32b506a2ab4e8db7d1167e1d00e4cf2533b520812a9e3f005127
 SIZE (cpeditor-lsp-cpp-44e7cdea787c19646f3c88ba8cbd0ed5da02b9cd_GH0.tar.gz) = 154649
-SHA256 (MikeMirzayanov-testlib-1277b269ec417dc01a786a6775a10b9189a0fadc_GH0.tar.gz) = 08b92917a080e04086a67bdaa6fa85efe76f1984d44fd9be1ddac2070148d786
-SIZE (MikeMirzayanov-testlib-1277b269ec417dc01a786a6775a10b9189a0fadc_GH0.tar.gz) = 40557
+SHA256 (cpeditor-qhttp-fd780d2a0bee1246f2ab0a17f6eebab6403fce64_GH0.tar.gz) = 5530eea87808f18bf62d11d865ec8a09ad9d78c8bdaeb6e21474f7012038ebc9
+SIZE (cpeditor-qhttp-fd780d2a0bee1246f2ab0a17f6eebab6403fce64_GH0.tar.gz) = 57108
+SHA256 (MikeMirzayanov-testlib-f5b55f138709e97916f51bdb7a23baed941b5751_GH0.tar.gz) = 96612193b9420c6ce950b5decfdbb7623240ef825422de5004b906135e100ca1
+SIZE (MikeMirzayanov-testlib-f5b55f138709e97916f51bdb7a23baed941b5751_GH0.tar.gz) = 40692
diff --git a/editors/cpeditor/files/patch-src_Settings_settings.json b/editors/cpeditor/files/patch-src_Settings_settings.json
deleted file mode 100644
index b93ae671524b..000000000000
--- a/editors/cpeditor/files/patch-src_Settings_settings.json
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/Settings/settings.json.orig	2020-07-22 20:35:15 UTC
-+++ src/Settings/settings.json
-@@ -120,7 +120,7 @@
-     {
-         "name": "C++/Compile Command",
-         "type": "QString",
--        "default": "g++ -Wall",
-+        "default": "c++ -Wall",
-         "tip": "The command used to compile C++. It should NOT include the path to the source file or \"-o <output file>\"."
-     },
-     {
-@@ -984,4 +984,4 @@
-         "default": "true",
-         "trtip": "tr(\"When there are file changes that are not made in CP Editor and is not automatically loaded by\\n\\\"%1\\\", ask for whether to load the changes.\\nIf this is disabled, external file changes will be ignored unless they are loaded by\\n\\\"%1\\\".\").arg(tr(\"Auto-load external file changes if there's no unsaved modification\"))"
-     }
--]
-\ No newline at end of file
-+]