Download raw body.
UPDATE: focuswriter-1.8.12
Simple update focuswriter-1.8.12. Tested on amd64. OK?
Cheers Rafael
diff --git a/editors/focuswriter/Makefile b/editors/focuswriter/Makefile
index bbc0aaf2ad6..4827e92fcba 100644
--- a/editors/focuswriter/Makefile
+++ b/editors/focuswriter/Makefile
@@ -1,33 +1,34 @@
COMMENT = simple, distraction-free writing environment
-DISTNAME = focuswriter-1.7.6
+DISTNAME = focuswriter-1.8.12
CATEGORIES = editors
-EXTRACT_SUFX = -src.tar.bz2
-REVISION = 1
HOMEPAGE = https://gottcode.org/focuswriter/
SITES = ${HOMEPAGE}
+EXTRACT_SUFX = .tar.bz2
+
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# GPLv3+
PERMIT_PACKAGE = Yes
-MODULES += devel/qmake \
- x11/qt5
-RUN_DEPENDS += devel/desktop-file-utils \
+WANTLIB += ${COMPILER_LIBCXX} GL Qt6Concurrent Qt6Core Qt6Gui
+WANTLIB += Qt6Multimedia Qt6Network Qt6PrintSupport Qt6Widgets
+WANTLIB += c hunspell-1.7 iconv m z
+
+MODULES = devel/cmake \
+ x11/qt6
+
+BUILD_DEPENDS = devel/gettext,-tools
+
+RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
-LIB_DEPENDS += textproc/hunspell \
- x11/qt5/qtmultimedia
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Gui
-WANTLIB += Qt5Multimedia Qt5Network Qt5PrintSupport Qt5Widgets
-WANTLIB += c hunspell-1.7 m z
+LIB_DEPENDS = converters/libiconv \
+ textproc/hunspell \
+ x11/qt6/qtmultimedia
NO_TEST = Yes
-post-install:
- mv ${PREFIX}/share/man/man1/focuswriter.1 ${PREFIX}/man/man1
- rm -Rf ${PREFIX}/share/man/
-
.include <bsd.port.mk>
diff --git a/editors/focuswriter/distinfo b/editors/focuswriter/distinfo
index 4342441e22b..a59bbf7dc75 100644
--- a/editors/focuswriter/distinfo
+++ b/editors/focuswriter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (focuswriter-1.7.6-src.tar.bz2) = NPV2pJyf5krtrWbgLvr8KchAtsPdyYpC2H39pJlxBUE=
-SIZE (focuswriter-1.7.6-src.tar.bz2) = 10311965
+SHA256 (focuswriter-1.8.12.tar.bz2) = g+Q3ANQNfSr5DB3fz7WVq6G4AL1bwQIyuU6Hxd2HHSs=
+SIZE (focuswriter-1.8.12.tar.bz2) = 10475452
diff --git a/editors/focuswriter/patches/patch-src_fileformats_rtf_writer_cpp b/editors/focuswriter/patches/patch-src_fileformats_rtf_writer_cpp
index dd4a1668480..317fded907c 100644
--- a/editors/focuswriter/patches/patch-src_fileformats_rtf_writer_cpp
+++ b/editors/focuswriter/patches/patch-src_fileformats_rtf_writer_cpp
@@ -1,11 +1,11 @@
Index: src/fileformats/rtf_writer.cpp
--- src/fileformats/rtf_writer.cpp.orig
+++ src/fileformats/rtf_writer.cpp
-@@ -32,6 +32,7 @@
- #include <clocale>
- #endif
+@@ -12,6 +12,7 @@
+ #include <QTextBlock>
+ #include <QTextDocument>
+#include <locale.h>
//-----------------------------------------------------------------------------
- namespace
+ bool RtfWriter::write(QIODevice* device, const QTextDocument* text, bool full)
diff --git a/editors/focuswriter/pkg/PLIST b/editors/focuswriter/pkg/PLIST
index 2b9eaa13407..e810791facd 100644
--- a/editors/focuswriter/pkg/PLIST
+++ b/editors/focuswriter/pkg/PLIST
@@ -7,13 +7,12 @@ share/focuswriter/icons/hicolor/
share/focuswriter/icons/hicolor/16/
share/focuswriter/icons/hicolor/16/accessories-dictionary.png
share/focuswriter/icons/hicolor/16/application-exit.png
-share/focuswriter/icons/hicolor/16/applications-graphics.png
share/focuswriter/icons/hicolor/16/arrow-down.png
-share/focuswriter/icons/hicolor/16/arrow-right.png
-share/focuswriter/icons/hicolor/16/arrow-up.png
share/focuswriter/icons/hicolor/16/character-set.png
share/focuswriter/icons/hicolor/16/chronometer.png
+share/focuswriter/icons/hicolor/16/configure.png
share/focuswriter/icons/hicolor/16/dialog-close.png
+share/focuswriter/icons/hicolor/16/document-close.png
share/focuswriter/icons/hicolor/16/document-new.png
share/focuswriter/icons/hicolor/16/document-open.png
share/focuswriter/icons/hicolor/16/document-print.png
@@ -48,26 +47,23 @@ share/focuswriter/icons/hicolor/16/format-text-underline.png
share/focuswriter/icons/hicolor/16/go-down.png
share/focuswriter/icons/hicolor/16/go-up.png
share/focuswriter/icons/hicolor/16/help-about.png
+share/focuswriter/icons/hicolor/16/preferences-desktop-color.png
share/focuswriter/icons/hicolor/16/preferences-desktop-locale.png
-share/focuswriter/icons/hicolor/16/preferences-desktop-printer.png
-share/focuswriter/icons/hicolor/16/preferences-system.png
share/focuswriter/icons/hicolor/16/tools-check-spelling.png
share/focuswriter/icons/hicolor/16/view-calendar.png
share/focuswriter/icons/hicolor/16/view-choose.png
share/focuswriter/icons/hicolor/16/view-fullscreen.png
share/focuswriter/icons/hicolor/16/view-refresh.png
-share/focuswriter/icons/hicolor/16/window-close.png
share/focuswriter/icons/hicolor/16/window-new.png
share/focuswriter/icons/hicolor/22/
share/focuswriter/icons/hicolor/22/accessories-dictionary.png
share/focuswriter/icons/hicolor/22/application-exit.png
-share/focuswriter/icons/hicolor/22/applications-graphics.png
share/focuswriter/icons/hicolor/22/arrow-down.png
-share/focuswriter/icons/hicolor/22/arrow-right.png
-share/focuswriter/icons/hicolor/22/arrow-up.png
share/focuswriter/icons/hicolor/22/character-set.png
share/focuswriter/icons/hicolor/22/chronometer.png
+share/focuswriter/icons/hicolor/22/configure.png
share/focuswriter/icons/hicolor/22/dialog-close.png
+share/focuswriter/icons/hicolor/22/document-close.png
share/focuswriter/icons/hicolor/22/document-new.png
share/focuswriter/icons/hicolor/22/document-open.png
share/focuswriter/icons/hicolor/22/document-print.png
@@ -102,26 +98,23 @@ share/focuswriter/icons/hicolor/22/format-text-underline.png
share/focuswriter/icons/hicolor/22/go-down.png
share/focuswriter/icons/hicolor/22/go-up.png
share/focuswriter/icons/hicolor/22/help-about.png
+share/focuswriter/icons/hicolor/22/preferences-desktop-color.png
share/focuswriter/icons/hicolor/22/preferences-desktop-locale.png
-share/focuswriter/icons/hicolor/22/preferences-desktop-printer.png
-share/focuswriter/icons/hicolor/22/preferences-system.png
share/focuswriter/icons/hicolor/22/tools-check-spelling.png
share/focuswriter/icons/hicolor/22/view-calendar.png
share/focuswriter/icons/hicolor/22/view-choose.png
share/focuswriter/icons/hicolor/22/view-fullscreen.png
share/focuswriter/icons/hicolor/22/view-refresh.png
-share/focuswriter/icons/hicolor/22/window-close.png
share/focuswriter/icons/hicolor/22/window-new.png
share/focuswriter/icons/hicolor/32/
share/focuswriter/icons/hicolor/32/accessories-dictionary.png
share/focuswriter/icons/hicolor/32/application-exit.png
-share/focuswriter/icons/hicolor/32/applications-graphics.png
share/focuswriter/icons/hicolor/32/arrow-down.png
-share/focuswriter/icons/hicolor/32/arrow-right.png
-share/focuswriter/icons/hicolor/32/arrow-up.png
share/focuswriter/icons/hicolor/32/character-set.png
share/focuswriter/icons/hicolor/32/chronometer.png
+share/focuswriter/icons/hicolor/32/configure.png
share/focuswriter/icons/hicolor/32/dialog-close.png
+share/focuswriter/icons/hicolor/32/document-close.png
share/focuswriter/icons/hicolor/32/document-new.png
share/focuswriter/icons/hicolor/32/document-open.png
share/focuswriter/icons/hicolor/32/document-print.png
@@ -156,26 +149,23 @@ share/focuswriter/icons/hicolor/32/format-text-underline.png
share/focuswriter/icons/hicolor/32/go-down.png
share/focuswriter/icons/hicolor/32/go-up.png
share/focuswriter/icons/hicolor/32/help-about.png
+share/focuswriter/icons/hicolor/32/preferences-desktop-color.png
share/focuswriter/icons/hicolor/32/preferences-desktop-locale.png
-share/focuswriter/icons/hicolor/32/preferences-desktop-printer.png
-share/focuswriter/icons/hicolor/32/preferences-system.png
share/focuswriter/icons/hicolor/32/tools-check-spelling.png
share/focuswriter/icons/hicolor/32/view-calendar.png
share/focuswriter/icons/hicolor/32/view-choose.png
share/focuswriter/icons/hicolor/32/view-fullscreen.png
share/focuswriter/icons/hicolor/32/view-refresh.png
-share/focuswriter/icons/hicolor/32/window-close.png
share/focuswriter/icons/hicolor/32/window-new.png
share/focuswriter/icons/hicolor/48/
share/focuswriter/icons/hicolor/48/accessories-dictionary.png
share/focuswriter/icons/hicolor/48/application-exit.png
-share/focuswriter/icons/hicolor/48/applications-graphics.png
share/focuswriter/icons/hicolor/48/arrow-down.png
-share/focuswriter/icons/hicolor/48/arrow-right.png
-share/focuswriter/icons/hicolor/48/arrow-up.png
share/focuswriter/icons/hicolor/48/character-set.png
share/focuswriter/icons/hicolor/48/chronometer.png
+share/focuswriter/icons/hicolor/48/configure.png
share/focuswriter/icons/hicolor/48/dialog-close.png
+share/focuswriter/icons/hicolor/48/document-close.png
share/focuswriter/icons/hicolor/48/document-new.png
share/focuswriter/icons/hicolor/48/document-open.png
share/focuswriter/icons/hicolor/48/document-print.png
@@ -210,26 +200,23 @@ share/focuswriter/icons/hicolor/48/format-text-underline.png
share/focuswriter/icons/hicolor/48/go-down.png
share/focuswriter/icons/hicolor/48/go-up.png
share/focuswriter/icons/hicolor/48/help-about.png
+share/focuswriter/icons/hicolor/48/preferences-desktop-color.png
share/focuswriter/icons/hicolor/48/preferences-desktop-locale.png
-share/focuswriter/icons/hicolor/48/preferences-desktop-printer.png
-share/focuswriter/icons/hicolor/48/preferences-system.png
share/focuswriter/icons/hicolor/48/tools-check-spelling.png
share/focuswriter/icons/hicolor/48/view-calendar.png
share/focuswriter/icons/hicolor/48/view-choose.png
share/focuswriter/icons/hicolor/48/view-fullscreen.png
share/focuswriter/icons/hicolor/48/view-refresh.png
-share/focuswriter/icons/hicolor/48/window-close.png
share/focuswriter/icons/hicolor/48/window-new.png
share/focuswriter/icons/hicolor/64/
share/focuswriter/icons/hicolor/64/accessories-dictionary.png
share/focuswriter/icons/hicolor/64/application-exit.png
-share/focuswriter/icons/hicolor/64/applications-graphics.png
share/focuswriter/icons/hicolor/64/arrow-down.png
-share/focuswriter/icons/hicolor/64/arrow-left.png
-share/focuswriter/icons/hicolor/64/arrow-up.png
share/focuswriter/icons/hicolor/64/character-set.png
share/focuswriter/icons/hicolor/64/chronometer.png
+share/focuswriter/icons/hicolor/64/configure.png
share/focuswriter/icons/hicolor/64/dialog-close.png
+share/focuswriter/icons/hicolor/64/document-close.png
share/focuswriter/icons/hicolor/64/document-new.png
share/focuswriter/icons/hicolor/64/document-open.png
share/focuswriter/icons/hicolor/64/document-print.png
@@ -264,21 +251,19 @@ share/focuswriter/icons/hicolor/64/format-text-underline.png
share/focuswriter/icons/hicolor/64/go-down.png
share/focuswriter/icons/hicolor/64/go-up.png
share/focuswriter/icons/hicolor/64/help-about.png
+share/focuswriter/icons/hicolor/64/preferences-desktop-color.png
share/focuswriter/icons/hicolor/64/preferences-desktop-locale.png
-share/focuswriter/icons/hicolor/64/preferences-desktop-printer.png
-share/focuswriter/icons/hicolor/64/preferences-system.png
share/focuswriter/icons/hicolor/64/tools-check-spelling.png
share/focuswriter/icons/hicolor/64/view-calendar.png
share/focuswriter/icons/hicolor/64/view-choose.png
share/focuswriter/icons/hicolor/64/view-fullscreen.png
share/focuswriter/icons/hicolor/64/view-refresh.png
-share/focuswriter/icons/hicolor/64/window-close.png
share/focuswriter/icons/hicolor/64/window-new.png
share/focuswriter/icons/hicolor/index.theme
share/focuswriter/sounds/
share/focuswriter/sounds/keyany.wav
share/focuswriter/sounds/keyenter.wav
-share/focuswriter/symbols1000.dat
+share/focuswriter/symbols1600.dat
share/focuswriter/themes/
share/focuswriter/themes/bitterskies.theme
share/focuswriter/themes/enchantment.theme
@@ -309,6 +294,7 @@ share/focuswriter/translations/focuswriter_en_GB.qm
share/focuswriter/translations/focuswriter_eo.qm
share/focuswriter/translations/focuswriter_es.qm
share/focuswriter/translations/focuswriter_es_MX.qm
+share/focuswriter/translations/focuswriter_et.qm
share/focuswriter/translations/focuswriter_fi.qm
share/focuswriter/translations/focuswriter_fr.qm
share/focuswriter/translations/focuswriter_fur.qm
@@ -320,8 +306,12 @@ share/focuswriter/translations/focuswriter_id.qm
share/focuswriter/translations/focuswriter_ig.qm
share/focuswriter/translations/focuswriter_it.qm
share/focuswriter/translations/focuswriter_ja.qm
+share/focuswriter/translations/focuswriter_ka.qm
share/focuswriter/translations/focuswriter_ko.qm
share/focuswriter/translations/focuswriter_lt.qm
+share/focuswriter/translations/focuswriter_mr.qm
+share/focuswriter/translations/focuswriter_nb.qm
+share/focuswriter/translations/focuswriter_nb_NO.qm
share/focuswriter/translations/focuswriter_nl.qm
share/focuswriter/translations/focuswriter_pl.qm
share/focuswriter/translations/focuswriter_pt.qm
@@ -352,7 +342,5 @@ share/icons/hicolor/64x64/apps/focuswriter.png
share/icons/hicolor/scalable/apps/focuswriter.svg
share/metainfo/
share/metainfo/focuswriter.appdata.xml
-share/pixmaps/
-share/pixmaps/focuswriter.xpm
@tag gtk-update-icon-cache %D/share/icons/hicolor
@tag update-desktop-database
UPDATE: focuswriter-1.8.12