From nobody Tue Feb 13 20:37:27 2024 X-Original-To: dev-commits-ports-all@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 4TZCn41C9rz59jdd; Tue, 13 Feb 2024 20:37:28 +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 4TZCn40T6Vz4QRf; Tue, 13 Feb 2024 20:37:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707856648; 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=sUMOLLiHqF/q+vQTxapfLPLheYOZYP+iYkOEIdlhaeI=; b=fmU08j/bDIP3CANgr3sw5QFMVbO3po7x2+Q3xflpq2fDKdj9XfGJg0ezJOYeXCbJEvHUIB gY0c40yE+8M151MBMXeZZnE+Jbx6J73Itw3s+2pwnxWjsjnroYtrqKelCAZbIpNIqZZVw0 D5N7HzE9YCiuACxLKU+TQVfnBokkVtsK7FMsif5oRx0sSUjR+RWfB+BaB6hXCppPPFsEZG ZDccHiutCH6S9r/2DuX4N81pvqKS0J/FA8nX51cyCuW4km4p3JGY+ehNOzNao6cCL8cQdG 3P6lAt0Bo3XD7CB/NS/p3RQ2yG5oaWub0/8lSb20DYzOPIpornojIGIt3MosGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707856648; a=rsa-sha256; cv=none; b=LMD6gPt8H6CFOAnbASQBkQ12al7KEbk+TDue+/z3mfCiibQayHLWUCXilmNg4pDA65PrFt ha6LqLhgHlfjbv6/cHtNUlBCNJwXgzi0TU0f7Hnwdq/6b/RlX9AVMP7OpmP+onCAFaPH1h +04/bPA4ffWK5I3Slg5/eXUkws7TYSFIUR+8XaBd7RF6qxpWNaEVz52YNVqHxtUwWRlDIb RkM1bE5+0ZrCvk+o/dxrylB4CTO0SCtwcT5V2E3T/NIs0YlApaFDO72TVevROS5wYkiwdI FRnLKw1gAAMZAxv7LhLsQImkTDfyrurQZUeqIJzw1lm6TjI9Fzxxx7GTQdiC3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707856648; 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=sUMOLLiHqF/q+vQTxapfLPLheYOZYP+iYkOEIdlhaeI=; b=t1PLY4qpPzbPlmjAt8/RjP3JGMtTd5xUhzwIKxY4zuvJaMlt/A38WYBOAI41FQ9giUTjDM 4TRVr/83Az30AwHGGUYqNijzbU/tPlSvwl/oyCCnB9nMgsPenMTRoMGcwEOuHChdpNkEup L4Bz3t2GoskV2WFUvBYQG7gPmp9hJgjoNnTrBC93tBE3EhOtBuQjKgfIUSS0gHPGX2RW/d p6ppeMZcSqUjSMcXv/qQigIJ8dwkI0oElIGZUdozjFMsRIv78yMEvXA7NV9sCnCcSqvhF4 gkFuvML67eT7GfAM303n0IMXWQJX/uYHS2U3H/tGXsPfZBNvehLrXoI1i3gXdg== 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 4TZCn36dNyzTSM; Tue, 13 Feb 2024 20:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41DKbRUS025965; Tue, 13 Feb 2024 20:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41DKbRJY025962; Tue, 13 Feb 2024 20:37:27 GMT (envelope-from git) Date: Tue, 13 Feb 2024 20:37:27 GMT Message-Id: <202402132037.41DKbRJY025962@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: e2bf2ed86103 - main - editors/ghostwriter: Update to 24.01.95 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: e2bf2ed8610362c56fb58ebfb4e52f30de72a44d Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2bf2ed8610362c56fb58ebfb4e52f30de72a44d commit e2bf2ed8610362c56fb58ebfb4e52f30de72a44d Author: Guido Falsi AuthorDate: 2024-02-13 20:36:15 +0000 Commit: Guido Falsi CommitDate: 2024-02-13 20:37:23 +0000 editors/ghostwriter: Update to 24.01.95 This new version has runtime detection for cmark and pandoc, adding options (defualt on) to add runtime dependencies for them. Submitted by: acm (via email) --- editors/ghostwriter/Makefile | 34 ++++++++++++++------------ editors/ghostwriter/distinfo | 6 ++--- editors/ghostwriter/pkg-plist | 57 ++++++++++++++++++++++++++++--------------- 3 files changed, 59 insertions(+), 38 deletions(-) diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile index 28f69d882a1a..3c9e0faac6d1 100644 --- a/editors/ghostwriter/Makefile +++ b/editors/ghostwriter/Makefile @@ -1,6 +1,5 @@ PORTNAME= ghostwriter -DISTVERSION= 2.2.0 -PORTREVISION= 3 +DISTVERSION= 24.01.95 CATEGORIES= editors kde MAINTAINER= madpilot@FreeBSD.org @@ -19,28 +18,33 @@ qt6_PKGNAMESUFFIX= -qt6 qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} -USES= compiler:c++11-lang desktop-file-utils kde:5 pkgconfig qmake +USES= cmake compiler:c++11-lang desktop-file-utils pkgconfig +USE_KDE= configwidgets coreaddons doctools ecm:build sonnet widgetsaddons xmlgui .if ${FLAVOR} == qt5 -USES+= qt:5 -USE_QT= buildtools:build core gui linguisttools:build svg \ +USES+= kde:5 qt:5 +USE_QT= buildtools:build core gui linguisttools:build qmake:build \ webchannel webengine widgets -RCCREGEXP= \/lib\/qt5\/bin\/rcc .else -USES+= qt:6 -USE_QT= 5compat base svg tools webchannel webengine -RCCREGEXP= \/libexec\/qt6\/rcc +CMAKE_ARGS= -DBUILD_WITH_QT6=ON \ + -DQT_MAJOR_VERSION=6 +USES+= kde:6 qt:6 +USE_QT= 5compat base svg tools:build webchannel webengine .endif # cf. PR 224488 LDFLAGS+= -Wl,--as-needed -KDE_INVENT= 151268bcfdca57bba4944caa7172dde9549f0622 office +KDE_INVENT= 54a54608e6de707f3fa2552c83e044bebea25477 office -post-configure: - @${REINPLACE_CMD} -e 's|^\(build/release/qrc_QtAwesomeFree.cpp:[^\\]*\)\\|\1|' \ - -e '/3rdparty\/QtAwesome\/fonts\/Font/d' \ - -e '/${RCCREGEXP} \\/d' \ - ${WRKSRC}/Makefile +OPTIONS_DEFINE= CMARK PANDOC +OPTIONS_DEFAULT= CMARK PANDOC + +CMARK_DESC= Add runtime dependency on cmark parser +PANDOC_DESC= Add runtime dependency on pandoc parser + +CMARK_BUILD_DEPENDS= cmark>0:textproc/cmark + +PANDOC_BUILD_DEPENDS= hs-pandoc>0:textproc/hs-pandoc .include diff --git a/editors/ghostwriter/distinfo b/editors/ghostwriter/distinfo index e59d6558302b..2d240bd2afc4 100644 --- a/editors/ghostwriter/distinfo +++ b/editors/ghostwriter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668073469 -SHA256 (office-ghostwriter-151268bcfdca57bba4944caa7172dde9549f0622_GL0.tar.gz) = bbaccaf2fd4170dcb3b69d9d89af4b35e242d11cbff62680ec05fcfbe3ee0047 -SIZE (office-ghostwriter-151268bcfdca57bba4944caa7172dde9549f0622_GL0.tar.gz) = 7758672 +TIMESTAMP = 1707763548 +SHA256 (office-ghostwriter-54a54608e6de707f3fa2552c83e044bebea25477_GL0.tar.gz) = 104126c20d0597e6e34095c83fa51516324dc3e7e11bde28d42d56a330862e09 +SIZE (office-ghostwriter-54a54608e6de707f3fa2552c83e044bebea25477_GL0.tar.gz) = 9142983 diff --git a/editors/ghostwriter/pkg-plist b/editors/ghostwriter/pkg-plist index 15bcc8f07041..6f4913153844 100644 --- a/editors/ghostwriter/pkg-plist +++ b/editors/ghostwriter/pkg-plist @@ -1,29 +1,46 @@ bin/ghostwriter -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 -%%DATADIR%%/translations/ghostwriter_es.qm -%%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/applications/org.kde.ghostwriter.desktop share/icons/hicolor/128x128/apps/ghostwriter.png share/icons/hicolor/16x16/apps/ghostwriter.png share/icons/hicolor/22x22/apps/ghostwriter.png -share/icons/hicolor/24x24/apps/ghostwriter.png share/icons/hicolor/256x256/apps/ghostwriter.png share/icons/hicolor/32x32/apps/ghostwriter.png -share/icons/hicolor/48x48/apps/ghostwriter.png share/icons/hicolor/64x64/apps/ghostwriter.png share/icons/hicolor/scalable/apps/ghostwriter.svg +share/locale/ca/LC_MESSAGES/ghostwriter_qt.qm +share/locale/ca@valencia/LC_MESSAGES/ghostwriter_qt.qm +share/locale/cs/LC_MESSAGES/ghostwriter_qt.qm +share/locale/de/LC_MESSAGES/ghostwriter_qt.qm +share/locale/en/LC_MESSAGES/ghostwriter_qt.qm +share/locale/en_GB/LC_MESSAGES/ghostwriter_qt.qm +share/locale/es/LC_MESSAGES/ghostwriter_qt.qm +share/locale/eu/LC_MESSAGES/ghostwriter_qt.qm +share/locale/fi/LC_MESSAGES/ghostwriter_qt.qm +share/locale/fr/LC_MESSAGES/ghostwriter_qt.qm +share/locale/id/LC_MESSAGES/ghostwriter_qt.qm +share/locale/it/LC_MESSAGES/ghostwriter_qt.qm +share/locale/ja/LC_MESSAGES/ghostwriter_qt.qm +share/locale/ka/LC_MESSAGES/ghostwriter_qt.qm +share/locale/ko/LC_MESSAGES/ghostwriter_qt.qm +share/locale/lt/LC_MESSAGES/ghostwriter_qt.qm +share/locale/nl/LC_MESSAGES/ghostwriter_qt.qm +share/locale/pl/LC_MESSAGES/ghostwriter_qt.qm +share/locale/pt/LC_MESSAGES/ghostwriter_qt.qm +share/locale/pt_BR/LC_MESSAGES/ghostwriter_qt.qm +share/locale/ru/LC_MESSAGES/ghostwriter_qt.qm +share/locale/sk/LC_MESSAGES/ghostwriter_qt.qm +share/locale/sl/LC_MESSAGES/ghostwriter_qt.qm +share/locale/sv/LC_MESSAGES/ghostwriter_qt.qm +share/locale/tr/LC_MESSAGES/ghostwriter_qt.qm +share/locale/uk/LC_MESSAGES/ghostwriter_qt.qm +share/locale/zh_CN/LC_MESSAGES/ghostwriter_qt.qm +share/locale/zh_TW/LC_MESSAGES/ghostwriter_qt.qm +share/man/ca/man1/ghostwriter.1.gz +share/man/es/man1/ghostwriter.1.gz +share/man/it/man1/ghostwriter.1.gz share/man/man1/ghostwriter.1.gz -share/metainfo/ghostwriter.appdata.xml +share/man/nl/man1/ghostwriter.1.gz +share/man/ru/man1/ghostwriter.1.gz +share/man/sv/man1/ghostwriter.1.gz +share/man/uk/man1/ghostwriter.1.gz +share/metainfo/org.kde.ghostwriter.metainfo.xml