Date: Fri, 16 Sep 2022 22:23:45 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4425ca701c0e - main - editors/focuswriter: use upstream version fix patch Message-ID: <202209162223.28GMNjpL075447@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=4425ca701c0ed0a54189973a6bc597cd30039f3e commit 4425ca701c0ed0a54189973a6bc597cd30039f3e Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2022-09-16 22:18:38 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209162223.28GMNjpL075447>