From nobody Sun Mar 27 11:15:14 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 3E4AD1A369C6; Sun, 27 Mar 2022 11:15:15 +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 4KRCsv07lJz3l5C; Sun, 27 Mar 2022 11:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648379715; 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=Eq+oGMxbJiIOwtPSjYRa39QlnrjbHoTUHrk6JOZaUSM=; b=HimMBrC9Iz6G2QkXeCM/PjQypMkssGFdqeE3PNAz/sS2aYCRcZjS6EUJK0LcUoIJhIrtY9 Z7WSgf219tNTTRZmy4akmYFH1wkIi1emLGjUozKBV3h8jdWcfiVtU3EoIDcgWHCeGZNIiu o8VnGi0fvpUJk/73UkwZM/ZVpVEnm6RwbPlflsNb5afT3Xh+twP64HylHBxjcWqLfM3A2C OqlX/ATnARHBatWDHhY0wnBbfx/+aMDfmPt+Wal91LaEkPOafMj1iyjgPv4DegujZZIBtK i3OB3mFViUFc4SLo95VcWrDynlEBT3wsYbK7Cd25Axl9qHiCNQkYP2qD2rv6Qg== 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 C8E671437A; Sun, 27 Mar 2022 11:15:14 +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 22RBFEeX008810; Sun, 27 Mar 2022 11:15:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22RBFEIH008809; Sun, 27 Mar 2022 11:15:14 GMT (envelope-from git) Date: Sun, 27 Mar 2022 11:15:14 GMT Message-Id: <202203271115.22RBFEIH008809@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 517405950222 - main - editors/ghostwriter: Update to 2.1.2 and take maintainership 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5174059502221cde3c3a7a5b96a385590d278809 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648379715; 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=Eq+oGMxbJiIOwtPSjYRa39QlnrjbHoTUHrk6JOZaUSM=; b=CRB3QuXMLX+5dl5h0NEpAIhMSnvtWj07R6pmRO1GVS5Tq0blout767oEfnhYBi3MLGQEYI 2O3Rmy5lOjT5PZN2LTLVGFESvMZS/8iXFZ3l2GVALOXsQDPX9fnwRAJKCFMMMQwzd7r/pW tYJ1cqupDOkgOVSx6L768XsEdhHZzX5SCraqbFyo/ntbp7lge7LYVEi7XS6NwlbofL3T3v x096idK5kXkbebZFtpKy844Vqkd9+4i1Sj00Lw1NlARCtFRkaJmbfpchJebJr5W8m5veG3 LDsBV+nZaZeQ5GeMDh0UHcJWNL4Na4iLjzxiwXZ3XvtRyTKjiMD3B4GXibfeoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648379715; a=rsa-sha256; cv=none; b=h7XK+/zNena+g1JMwVUJMqxFb2IFXMnOd5fu5ziijsJtZeTk2WjsDtCvoBPeDJPBZ1ikA+ Ky2dRTU+rA4z8G3XIh9hQqIdiluYydhjRTlR9kGNd3kpDf6VEGKi6O3CeEj8c1dlrvdc/g Z6+R8tCAHYRtF2iZU2Y9V3mgouH+1Kzds6ZgXSThAn5k7fhpDUesQTyrFKfJdc2N+bjgAM 0XR57mVM/zkQPz5jb5PolSKt00rUwKdzPegbTu1zqnV47wIYAESqLgrKRFEwbWw+9rt7be OvOmpRgI9HZGwjrizT3JWN2wddvqy+/yY/1voGKVY4FdbZBcQ4hQsbpmZSXAwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=5174059502221cde3c3a7a5b96a385590d278809 commit 5174059502221cde3c3a7a5b96a385590d278809 Author: Guido Falsi AuthorDate: 2022-03-27 11:13:05 +0000 Commit: Guido Falsi CommitDate: 2022-03-27 11:13:05 +0000 editors/ghostwriter: Update to 2.1.2 and take maintainership This version includes qt resources containing spaces which cause build failures due to the incorrectly escaped spaces that end up in the Makefile. Added a port-configure patch that removes the offending lines. --- editors/ghostwriter/Makefile | 11 ++++++++--- editors/ghostwriter/distinfo | 6 +++--- editors/ghostwriter/files/patch-src_MarkdownEditor.cpp | 10 ---------- editors/ghostwriter/pkg-plist | 6 ++++-- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile index 5f7c7e34edfe..8e2ace8d8aaf 100644 --- a/editors/ghostwriter/Makefile +++ b/editors/ghostwriter/Makefile @@ -1,9 +1,8 @@ PORTNAME= ghostwriter -DISTVERSIONPREFIX= v -DISTVERSION= 1.8.1 +DISTVERSION= 2.1.2 CATEGORIES= editors -MAINTAINER= ports@FreeBSD.org +MAINTAINER= madpilot@FreeBSD.org COMMENT= Distraction-free Markdown editor LICENSE= GPLv3+ @@ -20,4 +19,10 @@ USE_QT= core gui svg webchannel webengine widgets buildtools_build \ # cf. PR 224488 LDFLAGS+= -Wl,--as-needed +post-configure: + @${REINPLACE_CMD} -e 's|^\(build/release/qrc_QtAwesomeFree.cpp:[^\\]*\)\\|\1|' \ + -e '/3rdparty\/QtAwesome\/fonts\/Font/d' \ + -e '/\/lib\/qt5\/bin\/rcc \\/d' \ + ${WRKSRC}/Makefile + .include diff --git a/editors/ghostwriter/distinfo b/editors/ghostwriter/distinfo index ebe99a81b285..970ff8bf6a29 100644 --- a/editors/ghostwriter/distinfo +++ b/editors/ghostwriter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582434096 -SHA256 (wereturtle-ghostwriter-v1.8.1_GH0.tar.gz) = 2b73fed6a95ebcd45333fe4b12acb491eb4171fca8a11eea1af9bbdc73ed4b69 -SIZE (wereturtle-ghostwriter-v1.8.1_GH0.tar.gz) = 1220000 +TIMESTAMP = 1648229424 +SHA256 (wereturtle-ghostwriter-2.1.2_GH0.tar.gz) = 65aa523a9c3d4f4c68f2cb6f5ab600cf24c98b4f0673a622d757a8e28eab120f +SIZE (wereturtle-ghostwriter-2.1.2_GH0.tar.gz) = 7722873 diff --git a/editors/ghostwriter/files/patch-src_MarkdownEditor.cpp b/editors/ghostwriter/files/patch-src_MarkdownEditor.cpp deleted file mode 100644 index 89c3e7114850..000000000000 --- a/editors/ghostwriter/files/patch-src_MarkdownEditor.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/MarkdownEditor.cpp.orig 2020-05-21 07:40:36 UTC -+++ src/MarkdownEditor.cpp -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/editors/ghostwriter/pkg-plist b/editors/ghostwriter/pkg-plist index 199d1c40018f..15bcc8f07041 100644 --- a/editors/ghostwriter/pkg-plist +++ b/editors/ghostwriter/pkg-plist @@ -1,7 +1,7 @@ bin/ghostwriter -share/appdata/ghostwriter.appdata.xml share/applications/ghostwriter.desktop %%DATADIR%%/translations/ghostwriter_ar.qm +%%DATADIR%%/translations/ghostwriter_ca.qm %%DATADIR%%/translations/ghostwriter_cs.qm %%DATADIR%%/translations/ghostwriter_de.qm %%DATADIR%%/translations/ghostwriter_en.qm @@ -9,10 +9,12 @@ share/applications/ghostwriter.desktop %%DATADIR%%/translations/ghostwriter_fr.qm %%DATADIR%%/translations/ghostwriter_it.qm %%DATADIR%%/translations/ghostwriter_ja.qm +%%DATADIR%%/translations/ghostwriter_nb_NO.qm %%DATADIR%%/translations/ghostwriter_nl.qm %%DATADIR%%/translations/ghostwriter_pl.qm %%DATADIR%%/translations/ghostwriter_pt_BR.qm %%DATADIR%%/translations/ghostwriter_ru.qm +%%DATADIR%%/translations/ghostwriter_sv.qm %%DATADIR%%/translations/ghostwriter_zh.qm share/icons/hicolor/128x128/apps/ghostwriter.png share/icons/hicolor/16x16/apps/ghostwriter.png @@ -24,4 +26,4 @@ share/icons/hicolor/48x48/apps/ghostwriter.png share/icons/hicolor/64x64/apps/ghostwriter.png share/icons/hicolor/scalable/apps/ghostwriter.svg share/man/man1/ghostwriter.1.gz -share/pixmaps/ghostwriter.xpm +share/metainfo/ghostwriter.appdata.xml