From nobody Thu Mar 10 04:07:08 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 7EB0919F21D9; Thu, 10 Mar 2022 04:07:08 +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 4KDb9m37FNz3NgJ; Thu, 10 Mar 2022 04:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646885228; 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=KE34D74d+zeLajzDMYajOJaliwTE11m9ZCc8RiIaEyE=; b=ZKj9umONXHqSqxiRSZQmZMEmMkF8keKrW+x/OqRnkpA5SA+WMoujAiUxitDkBvnsLRbMtK dl1M2+R1HqoGxhwz+B1sGnOOSnnE7UORd3oKOaHmUrR4Vc10O8Cj+qvfeTWSFze8BLRDud e47ZgX/M6Y44AI+QIRUaknqeKpIMzWC7L0d197cW6fCjC6bbXnhkVc1Gh6iXaoDWDLm/vO +8MErphsJYOMcfjfNO7bGqyWnIcKSFnlwxwpNpa0csLiINv6emTflS6jWP5W+1uIEaKtPe HCk9xiC+EkGGWyVdzAGTujYhYy3aUx/12gj2iz+CH8UwDYAf373UXivZsNh1UA== 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 4AFE11DE66; Thu, 10 Mar 2022 04:07:08 +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 22A478tq042423; Thu, 10 Mar 2022 04:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22A478OY042422; Thu, 10 Mar 2022 04:07:08 GMT (envelope-from git) Date: Thu, 10 Mar 2022 04:07:08 GMT Message-Id: <202203100407.22A478OY042422@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 864a1f86fa20 - main - deskutils/mindforger: update the port to version 1.54.0 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 864a1f86fa20ecd88eec31e8b8bf02edfeef66f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646885228; 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=KE34D74d+zeLajzDMYajOJaliwTE11m9ZCc8RiIaEyE=; b=LC3uM5uI3VNQ3XoU1fM2ajsCbcxCCxR6tQqIESofGhxIC7+nC8W831/CLbudmhY3/vg7er SetRQzDaX2CiteqYVGK5X6GTpT0bwS216Ee9PNvvrmUt2b0xVot8kSoo4/DTyXGTAhKYbx madm5xOns0yY2zNY9ln51+q/c53R5+ED9dyCn5a81iURl4U3LF+sL4sSil0WXWVSt2KS3a LMfNXTX+jzF+LVVcgihB+4oqZv/btgijUA31KW54RE75v7hh84o8qaJkFyTSjf0YI0+atY x7ADTvYEx9XfCSkBgKrSoY2+eQ5pHwCk9MPYoWSXx/6OdhTykc0lhMdGZDcbJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646885228; a=rsa-sha256; cv=none; b=poM4/aoa4DHaFF26Q/yIMfO3+1tRLUA49548w9BPNQHJShNwmk63zV3y2FGJVZHreoF1pY 6gjNZOho5W7oG6tXJ1VJHlrMYeqtrgUojHg2tWs9GzCJsI3NA7c65oW/Wp+vqUTiRwB5/m 5w10po4UrnCz7/aLUvwSHsOv1bBqVtG3IIkPme/2FWEPcrJStzoPA/AUBSuMdt7UErfQUY B001n7mMWMbSBDSfKweFZ0vRFTBcrJMkide/wNdf+yrQd8xPDjTvHHIl1xv5ItDmKUEgys rnFuHHCbf7mLg47k1Tbz92lOOO9Bv4IbF3NeXNluF41Af15igCrbAcfi6Y+3Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=864a1f86fa20ecd88eec31e8b8bf02edfeef66f9 commit 864a1f86fa20ecd88eec31e8b8bf02edfeef66f9 Author: Alexey Dokuchaev AuthorDate: 2022-03-10 04:01:06 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-03-10 04:01:06 +0000 deskutils/mindforger: update the port to version 1.54.0 Apply a minor fix so that correct version would be reported in the About dialog and window title (the tree had been tagged for the release before the fix had been committed to the master). Reported by: portscout --- deskutils/mindforger/Makefile | 3 ++- deskutils/mindforger/distinfo | 6 +++--- deskutils/mindforger/files/patch-app_app.pro | 9 +++++---- .../mindforger/files/patch-lib_src_gear_string__utils.h | 15 ++++++++------- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/deskutils/mindforger/Makefile b/deskutils/mindforger/Makefile index cf5df8b3c2aa..f57e835cf78d 100644 --- a/deskutils/mindforger/Makefile +++ b/deskutils/mindforger/Makefile @@ -1,7 +1,7 @@ # Created by: Alexey Dokuchaev PORTNAME= mindforger -PORTVERSION= 1.53.0 +PORTVERSION= 1.54.0 CATEGORIES= deskutils MAINTAINER= danfe@FreeBSD.org @@ -48,6 +48,7 @@ post-patch: ${WRKSRC}/app/src/qt/note_view_presenter.cpp \ ${WRKSRC}/app/src/qt/note_view_presenter.h \ ${WRKSRC}/app/src/qt/outline_header_view_presenter.cpp + @${REINPLACE_CMD} -e 's/53/54/' ${WRKSRC}/lib/src/app_info.h @${REINPLACE_CMD} -e 's/_current_dir_name(/cwd(nullptr, 0/' \ ${WRKSRC}/lib/src/gear/file_utils.cpp diff --git a/deskutils/mindforger/distinfo b/deskutils/mindforger/distinfo index 277f63fcc09e..3210b7a11c92 100644 --- a/deskutils/mindforger/distinfo +++ b/deskutils/mindforger/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1640528172 -SHA256 (dvorka-mindforger-1.53.0_GH0.tar.gz) = a8a917c4b6eb28b16ab09322108049408c9bcb897baeba786042c1bcb1389ce7 -SIZE (dvorka-mindforger-1.53.0_GH0.tar.gz) = 2137346 +TIMESTAMP = 1641748185 +SHA256 (dvorka-mindforger-1.54.0_GH0.tar.gz) = 1f274b810cf1a4ee31e7d3aa9adc21660f11d2cfff23e1e6950141d96068de5a +SIZE (dvorka-mindforger-1.54.0_GH0.tar.gz) = 2128313 SHA256 (dvorka-cmark-4ca8688_GH0.tar.gz) = 8486c44ed23ae3865f5ebba034e319ed9e65340ffca1df09a4edd4b4677ab6cb SIZE (dvorka-cmark-4ca8688_GH0.tar.gz) = 288979 diff --git a/deskutils/mindforger/files/patch-app_app.pro b/deskutils/mindforger/files/patch-app_app.pro index 07e4ced9de25..dba5719015cd 100644 --- a/deskutils/mindforger/files/patch-app_app.pro +++ b/deskutils/mindforger/files/patch-app_app.pro @@ -1,13 +1,14 @@ ---- app/app.pro.orig 2021-12-26 14:16:12 UTC +--- app/app.pro.orig 2022-01-09 17:09:45 UTC +++ app/app.pro -@@ -137,12 +137,8 @@ macx { +@@ -160,13 +160,8 @@ macx { ./src/qt/spelling/dictionary_provider_voikko.cpp } else:unix { -- # pkgconfig-based configuration does not work @ Ubuntu distribution build +- # pkgconfig-based configuration does not work @ Ubuntu - # CONFIG += link_pkgconfig - # PKGCONFIG += hunspell -- # hardcoded paths are unfortunately more robust: +- +- # hardcoded paths are (unfortunately) more robust: - INCLUDEPATH += /usr/include/hunspell - LIBS += -lhunspell + CONFIG += link_pkgconfig diff --git a/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h b/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h index 65a3b2159cc7..a439ac5ea776 100644 --- a/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h +++ b/deskutils/mindforger/files/patch-lib_src_gear_string__utils.h @@ -1,11 +1,12 @@ ---- lib/src/gear/string_utils.h.orig 2020-03-08 17:03:52 UTC +--- lib/src/gear/string_utils.h.orig 2022-01-09 17:09:45 UTC +++ lib/src/gear/string_utils.h -@@ -114,12 +114,12 @@ static inline char *stringTrim(const char *s) { - } - - static inline std::string &stringLeftTrim(std::string& s) { -- s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun(isspace)))); -+ s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int c) { return !std::isspace(c); })); +@@ -118,13 +118,13 @@ static inline std::string &stringLeftTrim(std::string& + s.begin(), + std::find_if(s.begin(), + s.end(), +- std::not1(std::ptr_fun(isspace))) ++ [](int c) { return !std::isspace(c); }) + ); return s; }