git: 2b1635c9a406 - main - editors/notepadnext: Update 0.5.1 -> 0.5.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 27 May 2022 20:25:41 UTC
The branch main has been updated by yuri:

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

commit 2b1635c9a4063223b4773e4a6e5f69e863bed95f
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-05-27 20:24:41 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-05-27 20:25:34 +0000

    editors/notepadnext: Update 0.5.1 -> 0.5.2
    
    Reported by:    piortscout
---
 editors/notepadnext/Makefile                        |  6 +-----
 editors/notepadnext/distinfo                        |  8 +++-----
 .../files/patch-src_NotepadNext_ScintillaNext.cpp   |  8 ++++----
 editors/notepadnext/files/patch-src_i18n.pri        | 21 +++++++++++++++++++++
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/editors/notepadnext/Makefile b/editors/notepadnext/Makefile
index 2c1907c1aa37..054df0a16869 100644
--- a/editors/notepadnext/Makefile
+++ b/editors/notepadnext/Makefile
@@ -1,12 +1,8 @@
 PORTNAME=	notepadnext
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.1
-PORTREVISION=	1
+DISTVERSION=	0.5.2
 CATEGORIES=	editors
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	ece83c8d9dc72e987798b5b158770a4b6a502aff.patch:-p1 # https://github.com/dail8859/NotepadNext/pull/124 - fix installed file locations
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Reimplementation of Notepad++
 
diff --git a/editors/notepadnext/distinfo b/editors/notepadnext/distinfo
index 647a2c5b06de..f61b15abcab0 100644
--- a/editors/notepadnext/distinfo
+++ b/editors/notepadnext/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1651458691
-SHA256 (dail8859-NotepadNext-v0.5.1_GH0.tar.gz) = 6033f82d41be516f04fabd31213ead35ca2a4ead5adb74501766c9464a3d9548
-SIZE (dail8859-NotepadNext-v0.5.1_GH0.tar.gz) = 4544658
+TIMESTAMP = 1653681742
+SHA256 (dail8859-NotepadNext-v0.5.2_GH0.tar.gz) = 0dce97c9d63e1e9846506ff093c6ea25284752c39b718066cedb216572def626
+SIZE (dail8859-NotepadNext-v0.5.2_GH0.tar.gz) = 4571063
 SHA256 (alex-spataru-QSimpleUpdater-62e0ce7dde4c76e7533f2f0ee53f19ee1690c8dd_GH0.tar.gz) = 1cc98b82e117f10d8eb563357a53c541e2b5e70a7b6845c4ae855b2a27edf448
 SIZE (alex-spataru-QSimpleUpdater-62e0ce7dde4c76e7533f2f0ee53f19ee1690c8dd_GH0.tar.gz) = 298412
 SHA256 (editorconfig-editorconfig-core-qt-52820d59769fcba6d0ed94f685406c0383fe1a30_GH0.tar.gz) = c28d5fded91231985f2b08729dd3f9ad5adbe6d117fbd9b00ab4c5314a761f6a
@@ -11,5 +11,3 @@ SHA256 (githubuser0xFFFF-Qt-Advanced-Docking-System-d5fefaa35fb53e299b7f39b0d8f5
 SIZE (githubuser0xFFFF-Qt-Advanced-Docking-System-d5fefaa35fb53e299b7f39b0d8f541954c710d94_GH0.tar.gz) = 10206316
 SHA256 (itay-grudev-SingleApplication-d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c_GH0.tar.gz) = e49a35dd366a3a2ddc4b97f1d5fb5af9bed84a04a693645f61248c78ba370676
 SIZE (itay-grudev-SingleApplication-d0c43a51ad7d4f74ae5cff8d8cbf8aba0cf5e51c_GH0.tar.gz) = 21560
-SHA256 (ece83c8d9dc72e987798b5b158770a4b6a502aff.patch) = 0b9653aa9c600642775c4d72d9c56ca5d78252ef7e478a7799f816f42b516cd2
-SIZE (ece83c8d9dc72e987798b5b158770a4b6a502aff.patch) = 1150
diff --git a/editors/notepadnext/files/patch-src_NotepadNext_ScintillaNext.cpp b/editors/notepadnext/files/patch-src_NotepadNext_ScintillaNext.cpp
index a1449e2ef07a..cc17f4d44a2e 100644
--- a/editors/notepadnext/files/patch-src_NotepadNext_ScintillaNext.cpp
+++ b/editors/notepadnext/files/patch-src_NotepadNext_ScintillaNext.cpp
@@ -1,9 +1,9 @@
---- src/NotepadNext/ScintillaNext.cpp.orig	2022-05-01 01:18:16 UTC
+--- src/NotepadNext/ScintillaNext.cpp.orig	2022-05-26 23:25:10 UTC
 +++ src/NotepadNext/ScintillaNext.cpp
-@@ -17,7 +17,7 @@
-  */
- 
+@@ -20,7 +20,7 @@
  #include "ScintillaNext.h"
+ #include "ScintillaCommenter.h"
+ 
 -#include "uchardet.h"
 +#include <uchardet.h>
  #include <cinttypes>
diff --git a/editors/notepadnext/files/patch-src_i18n.pri b/editors/notepadnext/files/patch-src_i18n.pri
new file mode 100644
index 000000000000..470a657c1617
--- /dev/null
+++ b/editors/notepadnext/files/patch-src_i18n.pri
@@ -0,0 +1,21 @@
+- translations are broken, see https://github.com/dail8859/NotepadNext/issues/147
+
+--- src/i18n.pri.orig	2022-05-27 20:06:21 UTC
++++ src/i18n.pri
+@@ -18,11 +18,11 @@
+ 
+ CONFIG += lrelease
+ 
+-TRANSLATIONS = \
+-    ../../i18n/NotepadNext.zh_CN.ts
++#TRANSLATIONS = \
++#    ../../i18n/NotepadNext.zh_CN.ts
+ 
+-EXTRA_TRANSLATIONS = \
+-    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm
++#EXTRA_TRANSLATIONS = \
++#    $$[QT_INSTALL_TRANSLATIONS]/qt_zh_CN.qm
+ 
+ # Output folder for `.qm` files
+-LRELEASE_DIR = $$OUT_PWD/i18n
++#LRELEASE_DIR = $$OUT_PWD/i18n