From nobody Fri Sep 16 22:23:45 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 4MTpWQ0Kq6z4cGX0; Fri, 16 Sep 2022 22:23:46 +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 4MTpWP6tzZz3jyC; Fri, 16 Sep 2022 22:23:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663367026; 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=UojL7n8gbtdxRpsxvx/iQPEJku8HybRKMYIF1BY6wEE=; b=LngbeD2/rRYUw9/lrlW8N+k6xMUhbQ4guN4OYK3RQ27FUjY6toPHYc2jb68GdxoKSCYAVy 91oYARkFjz3gZd03RAPBmV5o29T7d/DfsdY95Z+U2ea+F3ErCavquLEAPdZZMdDxqzaShd l+yHhAH5TnSrqVrPlJOu5HnMlhBewJ/IiA5gIj13iLYFpz1NpD71k1LfNslJMeXiu7WiwB vinKrelx9sP1qTAH62h9f3N+xVldRVm7pi5zDqRZWcAYXvEY8KFhzNHLoi9yjL6LTEIfqQ oMdILBS5NX8wa+llQUza0+P8e5S6cEDdWvyARYAx/XAGDg8/oeTEVQ7kB5lGsg== 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 4MTpWP5c1FzW03; Fri, 16 Sep 2022 22:23:45 +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 28GMNjMc075448; Fri, 16 Sep 2022 22:23:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GMNjpL075447; Fri, 16 Sep 2022 22:23:45 GMT (envelope-from git) Date: Fri, 16 Sep 2022 22:23:45 GMT Message-Id: <202209162223.28GMNjpL075447@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 4425ca701c0e - main - editors/focuswriter: use upstream version fix patch 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4425ca701c0ed0a54189973a6bc597cd30039f3e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663367026; 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=UojL7n8gbtdxRpsxvx/iQPEJku8HybRKMYIF1BY6wEE=; b=Hln+PQbbhLx35rEfRYm7wk24xMx4B3ktkCi+pHio3KuPlopwLFMz/MQiRnEjbctBUdS8mF l/SbeOMUlbCgxYIOlAmqE8S0R7svy5/PVSnAg5H6xrghUcc6Yg8+yxOAm6xm8yqT1OxQMn d50n0DSt1cqVN79CTI16CD/QW6lznsw32NrewSX0ru7n/3IRqTGkxl32AAbVyn1h/MpfjR EtYu1J0okBWVa6/pyNDMxprq64anxyucJX+8XkKYFFanCXazJ9wMNKznscC8btZ/uF66HA oqnfdKEaWKVC30se7x8BgM9kQ1iJZnbdao9QbvoqnQ3qmX9qB9vG3n9jp9FkCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663367026; a=rsa-sha256; cv=none; b=p2H4ThXKCOdUFdhIfCASeG0hT3SCsowc5IouYyVab6z6ciXfKgo/Aiv9XPNJS+EeKUKHOS 4UAE9LnIKmp9bEauJufrO/f2/I/xJlzn9r1QZaOJhsz9Lsa0KIyhDM4zFhrW6UjwhGtYZ3 SN1CU6HI2pSxYYWU1ek+UpRKP0dLJQwce44x/GPRDev9QN0bcb/yza52IHuu/nuL/APjo3 9EXjqc7B6rCuwCgdbJ1TA/thsmZWRIUH1PiOdtZ+dGweoXxNHpzX4Cfq05GRxS+t9jdkZ5 nZ/XbF36vhnP21J/aGHI8YGVu+waRsvMsBQ0bF5KscTypGNhp+XKiXgCTtu8xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4425ca701c0ed0a54189973a6bc597cd30039f3e commit 4425ca701c0ed0a54189973a6bc597cd30039f3e Author: Nuno Teixeira AuthorDate: 2022-09-16 22:18:38 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-16 22:23:32 +0000 editors/focuswriter: use upstream version fix patch - bump PORTREVISION --- editors/focuswriter/Makefile | 5 ++++- editors/focuswriter/distinfo | 4 +++- .../patch-cmake_AddVersionCompileDefinition.cmake | 24 ---------------------- 3 files changed, 7 insertions(+), 26 deletions(-) diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile index 0b7fbf30ebe8..469b4bd73417 100644 --- a/editors/focuswriter/Makefile +++ b/editors/focuswriter/Makefile @@ -1,9 +1,12 @@ PORTNAME= focuswriter DISTVERSION= 1.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= https://gottcode.org/${PORTNAME}/ +PATCH_SITES= https://github.com/gottcode/${PORTNAME}/commit/ +PATCHFILES= 0c642bec1e966b6e3f340d65e30558fb638010d9.patch:-p1 # version fix + MAINTAINER= eduardo@FreeBSD.org COMMENT= Simple, distraction-free writing environment WWW= https://gottcode.org/focuswriter/ diff --git a/editors/focuswriter/distinfo b/editors/focuswriter/distinfo index 93327dd4e98b..7c7c89e2e5d9 100644 --- a/editors/focuswriter/distinfo +++ b/editors/focuswriter/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1662112781 +TIMESTAMP = 1663359905 SHA256 (focuswriter-1.8.2.tar.bz2) = 9fd6384009a33840218c653bb8d3ab69af5e80de884d7be3cd778500484cb583 SIZE (focuswriter-1.8.2.tar.bz2) = 10342213 +SHA256 (0c642bec1e966b6e3f340d65e30558fb638010d9.patch) = ffec476e04b76469c1e7d27761dc99715b314be1431b6a131259f2c00773eb19 +SIZE (0c642bec1e966b6e3f340d65e30558fb638010d9.patch) = 1129 diff --git a/editors/focuswriter/files/patch-cmake_AddVersionCompileDefinition.cmake b/editors/focuswriter/files/patch-cmake_AddVersionCompileDefinition.cmake deleted file mode 100644 index 37016448e711..000000000000 --- a/editors/focuswriter/files/patch-cmake_AddVersionCompileDefinition.cmake +++ /dev/null @@ -1,24 +0,0 @@ ---- cmake/AddVersionCompileDefinition.cmake.orig 2022-09-01 14:29:17 UTC -+++ cmake/AddVersionCompileDefinition.cmake -@@ -3,9 +3,6 @@ function(add_version_compile_definition versionstr_fil - # SPDX-License-Identifier: GPL-3.0-or-later - - function(add_version_compile_definition versionstr_file versionstr_def) -- # Use project's VERSION by default -- set(versionstr ${PROJECT_VERSION}) -- - find_package(Git QUIET) - if(Git_FOUND) - # Find git repository -@@ -38,6 +35,11 @@ function(add_version_compile_definition versionstr_fil - ) - endif() - endif() -+ endif() -+ -+ # Fall back to project's VERSION -+ if ("${versionstr}" STREQUAL "") -+ set(versionstr ${PROJECT_VERSION}) - endif() - - # Pass version as compile definition to file