On 22/04/17 08:20AM, Landry Breuil wrote:
> Le Sat, Apr 16, 2022 at 08:44:58AM +0000, Yifei Zhan a ?crit :
> > Here is an update to bring ghostwriter to the latest version, tested
> > on amd64 and arm64. I have to comment out a few lines regarding to a
> > 3rd party dep (font awesome for qt) in pre-build stage to make it
> > compile properly. fonts from fontawesome are fine after this change.
>
> looking at the generated Makefile in build-amd64/Makefile, the matching lines are
>
> build/release/qrc_QtAwesomeFree.cpp:
> ../3rdparty/QtAwesome/QtAwesomeFree.qrc \
> /usr/local/lib/qt5/bin/rcc \
> ../3rdparty/QtAwesome/fonts/Font\ Awesome\ 5 Brands-Regular-400.otf \
> ../3rdparty/QtAwesome/fonts/Font\ Awesome\ 5 Free-Regular-400.otf \
> ../3rdparty/QtAwesome/fonts/Font\ Awesome\ 5 Free-Solid-900.otf
> /usr/local/lib/qt5/bin/rcc -name QtAwesomeFree ./3rdparty/QtAwesome/QtAwesomeFree.qrc -o build/release/qrc_QtAwesomeFree.cpp
>
> which fail with
> make: don't know how to make ../3rdparty/QtAwesome/fonts/Font\ (prerequisite of: build/release/qrc_QtAwesomeFree.cpp)
>
> i dont think our make handles that (or maybe with some quoting in the
> Makefile generator?), but USE_GMAKE=Yes seems to help instead of
> patching a generated Makefile.
Thanks for the tip! didn't realize gmake can deal with it before. this
looks better than my Makefile hack.
Updated diff attached, also updating a comment line.
diff --git a/editors/ghostwriter/Makefile b/editors/ghostwriter/Makefile
index 8adf7966603..461b60fa24f 100644
--- a/editors/ghostwriter/Makefile
+++ b/editors/ghostwriter/Makefile
@@ -1,12 +1,11 @@
-# qt5 webkit
+# qt5 webengine
USE_WXNEEDED = Yes
COMMENT = distraction-free Markdown editor
GH_ACCOUNT = wereturtle
GH_PROJECT = ghostwriter
-GH_TAGNAME = v1.7.4
-REVISION = 2
+GH_TAGNAME = 2.1.2
CATEGORIES = editors
@@ -17,10 +16,12 @@ MAINTAINER = Adam Wolk <awolk@openbsd.org>
# GPLv3 code, CC BY-SA 4.0 resources
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Network Qt5PrintSupport
-WANTLIB += Qt5Svg Qt5WebKit Qt5WebKitWidgets Qt5Widgets c hunspell-1.7
-WANTLIB += m pthread
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Gui
+WANTLIB += Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
+WANTLIB += Qt5Quick Qt5Svg Qt5WebChannel Qt5WebEngine Qt5WebEngineCore
+WANTLIB += Qt5WebEngineWidgets Qt5Widgets c hunspell-1.7 m
+
+USE_GMAKE = Yes
MODULES = devel/qmake \
x11/qt5
@@ -29,7 +30,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = textproc/hunspell \
x11/qt5/qtbase \
x11/qt5/qtsvg \
- x11/qt5/qtwebkit
+ x11/qt5/qtwebengine
NO_TEST = Yes
diff --git a/editors/ghostwriter/distinfo b/editors/ghostwriter/distinfo
index 14ebca6f7ba..6ea7f487a58 100644
--- a/editors/ghostwriter/distinfo
+++ b/editors/ghostwriter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ghostwriter-1.7.4.tar.gz) = SYcSbnGjdVbldfvOIALFUEzxWgTBG8zmBKJ49Z7JwRo=
-SIZE (ghostwriter-1.7.4.tar.gz) = 1195162
+SHA256 (ghostwriter-2.1.2.tar.gz) = ZapSOpw9T0xo8stvWrYAzyTJi08Gc6Yi11eo4o6rEg8=
+SIZE (ghostwriter-2.1.2.tar.gz) = 7722873
diff --git a/editors/ghostwriter/patches/patch-src_MarkdownEditor_cpp b/editors/ghostwriter/patches/patch-src_MarkdownEditor_cpp
deleted file mode 100644
index 7a8fa8e74fd..00000000000
--- a/editors/ghostwriter/patches/patch-src_MarkdownEditor_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: src/MarkdownEditor.cpp
---- src/MarkdownEditor.cpp.orig
-+++ src/MarkdownEditor.cpp
-@@ -34,6 +34,7 @@
- #include <QUrl>
- #include <QPixmap>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QFileInfo>
- #include <QDir>
-
diff --git a/editors/ghostwriter/pkg/PLIST b/editors/ghostwriter/pkg/PLIST
index e5d9ed7bf5f..df1857fd4a0 100644
--- a/editors/ghostwriter/pkg/PLIST
+++ b/editors/ghostwriter/pkg/PLIST
@@ -1,10 +1,10 @@
@bin bin/ghostwriter
@man man/man1/ghostwriter.1
-share/appdata/
-share/appdata/ghostwriter.appdata.xml
share/applications/ghostwriter.desktop
share/ghostwriter/
share/ghostwriter/translations/
+share/ghostwriter/translations/ghostwriter_ar.qm
+share/ghostwriter/translations/ghostwriter_ca.qm
share/ghostwriter/translations/ghostwriter_cs.qm
share/ghostwriter/translations/ghostwriter_de.qm
share/ghostwriter/translations/ghostwriter_en.qm
@@ -12,9 +12,12 @@ share/ghostwriter/translations/ghostwriter_es.qm
share/ghostwriter/translations/ghostwriter_fr.qm
share/ghostwriter/translations/ghostwriter_it.qm
share/ghostwriter/translations/ghostwriter_ja.qm
+share/ghostwriter/translations/ghostwriter_nb_NO.qm
+share/ghostwriter/translations/ghostwriter_nl.qm
share/ghostwriter/translations/ghostwriter_pl.qm
share/ghostwriter/translations/ghostwriter_pt_BR.qm
share/ghostwriter/translations/ghostwriter_ru.qm
+share/ghostwriter/translations/ghostwriter_sv.qm
share/ghostwriter/translations/ghostwriter_zh.qm
share/icons/hicolor/128x128/apps/ghostwriter.png
share/icons/hicolor/16x16/apps/ghostwriter.png
@@ -25,7 +28,7 @@ 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/pixmaps/
-share/pixmaps/ghostwriter.xpm
@tag update-desktop-database
@tag gtk-update-icon-cache %D/share/icons/hicolor
+share/metainfo/
+share/metainfo/ghostwriter.appdata.xml
No comments:
Post a Comment