From nobody Fri Sep 16 12:37:32 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 4MTYW069fdz4chYs; Fri, 16 Sep 2022 12:37:32 +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 4MTYW0581dz4M8Y; Fri, 16 Sep 2022 12:37:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663331852; 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=wNqX6v9F1fiDtUsaz59ulp+vGSOxvR/Kl5MMlbvYEvY=; b=nJ1zC8Y+X+v1QLEkM2WbbJ446uPwDWgX/29zjJvr/S7vctLRrst5HmI0tcdHtxUb7kgVST L+85Us8A1GdUGGK+B8O+Hgwzu1DNQWJfi17cpQPEkL2H0kyorMoZ5jvTAHRR/ThGC432Wu Xj568X9GtpM6QSfCXdHn00nNEMYGzSM6+JyJN4Q9aSvXQF5shCCeaoyJ8t2YwoLIycGvW4 Q8uIElx8QZjRtxpkm3gzyUg2X3HEPcYaCwLcMT5ucXlLpmv7lUx6OeecF4s2O/s544YmL1 IV22jNflzS9xaRxooqyNLvHw221PfwB966NogaTppdRKkPKETAM9Zei5bEKNOw== 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 4MTYW041XBzLw3; Fri, 16 Sep 2022 12:37:32 +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 28GCbW9k038705; Fri, 16 Sep 2022 12:37:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GCbWRU038704; Fri, 16 Sep 2022 12:37:32 GMT (envelope-from git) Date: Fri, 16 Sep 2022 12:37:32 GMT Message-Id: <202209161237.28GCbWRU038704@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: c4f9e628de90 - main - editors/focuswriter: Port improvements 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: c4f9e628de90729f36ff6f8d7c70da329fed081c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663331852; 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=wNqX6v9F1fiDtUsaz59ulp+vGSOxvR/Kl5MMlbvYEvY=; b=LXNguCm75o0nuy+cxqxDI82IAC8jXDtBCfnBN/dpbUGtkU66dH7DrBRUW3IASieXuN7MeV oO0ewmeOAm1pavnwlqg+i/gFb1mfDqfmWwR8DvIP7CbmnBJ6BhccYyzHn0H/bbWrqU8pq0 wPbzg5av7I9gw2uwOsJUbmAeFKPp0kT430sFqDaaPoH1ZynsRvzydnW4uPNpgfM9PkPvOT 8Ua5ntz9KwuynDtIZqylQHEpitA3FXHYS4S4sSg1y2NEJG82/hONDWHe/WvbmVa8OwkmfI eu74/2IMiy64rrHfDE1QdFcUA3CXjciqbiVcXBOz6gVA7QPV1i2nGhi+hsozjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663331852; a=rsa-sha256; cv=none; b=cpunNXiBDqtQD7sFGONA8YeAEi6VSdRMTcUS0odhPRdiEpoC7I47Cx/yVIF/TRy+cdvIh2 wnJguT24Uae4HEhV/rs/14wnbOnGqsWyavTrK8M8FAWUtBS7ILGZBGIatn+wIPkW3Pf/L1 jhDuhm3TnXN1ggxbCWX4G4lnNDEavk8itQayj7a8Q5znreP41YNBQ7ypmE7RjxapZRf1Se yVBnNxwQZzjiBi3k/0cJAqQgcZlPEHR9qcQq68gSpMnbmMX7kmP3k8m0jS/yhLZRo7tVG+ qJi4LLN/w9PyjArQ+miR9YkhMXYjmKjRHmECoQQk9jClJpXwLxwR+/bCizcTsQ== 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=c4f9e628de90729f36ff6f8d7c70da329fed081c commit c4f9e628de90729f36ff6f8d7c70da329fed081c Author: Nuno Teixeira AuthorDate: 2022-09-16 12:03:12 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-16 12:37:20 +0000 editors/focuswriter: Port improvements - Add LTO option - Fix version not showing up in command line and About dialog - Bump PORTREVISION --- editors/focuswriter/Makefile | 10 ++++++--- .../patch-cmake_AddVersionCompileDefinition.cmake | 24 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile index f8bc11d3bb57..0b7fbf30ebe8 100644 --- a/editors/focuswriter/Makefile +++ b/editors/focuswriter/Makefile @@ -1,5 +1,6 @@ PORTNAME= focuswriter DISTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= https://gottcode.org/${PORTNAME}/ @@ -19,9 +20,12 @@ USES= cmake compiler:c++17-lang desktop-file-utils gl iconv pkgconfig \ USE_GL= gl USE_QT= base multimedia tools:build -PORTDATA= * -PORTDOCS= CREDITS ChangeLog README -OPTIONS_DEFINE= DOCS +PORTDATA= * +PORTDOCS= CREDITS ChangeLog README +OPTIONS_DEFINE= DOCS LTO +OPTIONS_DEFAULT= LTO + +LTO_CMAKE_BOOL= ENABLE_LINK_TIME_OPTIMIZATION post-install-DOCS-on: cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} diff --git a/editors/focuswriter/files/patch-cmake_AddVersionCompileDefinition.cmake b/editors/focuswriter/files/patch-cmake_AddVersionCompileDefinition.cmake new file mode 100644 index 000000000000..37016448e711 --- /dev/null +++ b/editors/focuswriter/files/patch-cmake_AddVersionCompileDefinition.cmake @@ -0,0 +1,24 @@ +--- 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