git: e2bf2ed86103 - main - editors/ghostwriter: Update to 24.01.95

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Tue, 13 Feb 2024 20:37:27 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e2bf2ed8610362c56fb58ebfb4e52f30de72a44d

commit e2bf2ed8610362c56fb58ebfb4e52f30de72a44d
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2024-02-13 20:36:15 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
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 <bsd.port.mk>
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