From nobody Fri May 27 20:25:41 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 5F11A1B5B1B7; Fri, 27 May 2022 20:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L8xBt0k5Gz3HP1; Fri, 27 May 2022 20:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653683142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ody8AA0kgHeEYtqFxUtqCpf87IrqAcOO49PgOuSpccY=; b=AuTf8TLDw69MnhTUZon4hnpueP36bfjR3iv5hJrxCehKCTi9q2Mo0KLL2VN/X7NywxB0WX n6+/NohuYCHbtlOr8b1DU+v3OB0qrwATyC7JbplOTRCWUhxHasY1Ysbu0JPb6LphKwNtZV kPMLc/Tw7PJLL0h6qqMmk6Klew2tFZwBkPqD1N6/s1mNAuQzaZ+nAKRGpZNXcBjpZV1845 d0tEe613fzp9uCMDesmUa2weqfBAhSfJKNeukZINxrAS5vANRgH8I0Aerc40dPq0xlbrbI +NljT/dL2EQbStEKE1LzjT7A3cHtSC4YuLWNEZUbIq5Is2/Wh1rfLaA+h3KqoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9430F29029; Fri, 27 May 2022 20:25:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24RKPfbI021777; Fri, 27 May 2022 20:25:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24RKPfRj021776; Fri, 27 May 2022 20:25:41 GMT (envelope-from git) Date: Fri, 27 May 2022 20:25:41 GMT Message-Id: <202205272025.24RKPfRj021776@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 2b1635c9a406 - main - editors/notepadnext: Update 0.5.1 -> 0.5.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b1635c9a4063223b4773e4a6e5f69e863bed95f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653683142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ody8AA0kgHeEYtqFxUtqCpf87IrqAcOO49PgOuSpccY=; b=i3OZJR9owTLDmOdvqSH7VhSX2CFqhH/2kbFL56JhxDv471v33ELfC17rmw7AE6TWCnbSZ6 BgFm9eipLog/8QtbPLN7SDrRHV6zBpUnuRFs02kkmaRIYTTXLz6mAJElPSxAU2bIiS8frd KaJq7ykPLiEmJJkwlntsmSk0/qOjOyZtG1h/5U1OWNhUVv3lNyuJB1c5Eq75ME93s4Sv5M oJJqDRqstDusu72YcwuaTng7lTCclP5AiEpP4wnzUiGkGQVATG2fIOgE7krkonmbYLp0q3 RxCTmPQcK45QHLDSGuk/FDa1n/q3WCsNkEOjQ+j9PmTlRW6WuMjI/qGQ157w4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653683142; a=rsa-sha256; cv=none; b=xR94ZaCp+iWk9g+u2zTlwTh0MsRCf5nePlbOl2wAu8xF50gpiN0qsAyiugCNCqHSRNTX62 t97q6w4ihT17Kl3IBN/4qeXw9oXrE3MUKb2mxUHWNhhzullmIW9wf47Hjynkn1JfRrF9Ot 7vKS8Kc6t6Hai23Om158PLDxuEm3L15Mnxqc/g27ComhicPAEBd4aSuG/a6l3e0G/iTKxJ 2795bnOxjRLxn30yP6c6MP+hMYAiTLk+BsiOVxStmnehAFJrqHsQ8/KFC0n4SeykxrhobE s1HL8t2eyKgBMHkpp0fMceSGshZKFuNwHT7zX9igCsXGIVQ6bxyYjdbugwqOjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2b1635c9a4063223b4773e4a6e5f69e863bed95f commit 2b1635c9a4063223b4773e4a6e5f69e863bed95f Author: Yuri Victorovich AuthorDate: 2022-05-27 20:24:41 +0000 Commit: Yuri Victorovich 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 #include 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