CVS commit: pkgsrc/editors/focuswriter

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Wed Sep  6 11:23:36 UTC 2023

Modified Files:
        pkgsrc/editors/focuswriter: Makefile PLIST distinfo
Removed Files:
        pkgsrc/editors/focuswriter/patches: patch-focuswriter.pro

Log Message:
editors/focuswriter: update to 1.8.5

v1.7.6 was the last vesrion supporting Qt5 and has been around in pkgsrc for
that very reason. Now that Qt6 is stable, bring the package up-to-date.

1.8.5
-----
* FIXED: Unable to paste HTML into web browser.
* Translation updates: Russian, Turkish, Ukrainian.

1.8.4
-----
* FIXED: Did not ignore user input when force processing events.
* FIXED: Did not compile on macOS.
* FIXED: Did not compile on OS/2.
* Disabled typewriter sounds on OS/2.
* Replaced deprecated code.

1.8.3
-----
* FIXED: Did not play sound effect when pressing enter.
* FIXED: Played sound effect when opening files.
* FIXED: Missing version number.
* Translation updates: Dutch.

1.8.2
-----
* FIXED: Could not change language in portable mode.
* FIXED: Crashed during paste from context menu.
* FIXED: First line indent was lost on empty paragraphs.
* Always write RTF as Latin1.
* Replaced ICU with iconv.
* Improved Linux deployment.
* Translation updates: German, Korean, Portuguese (Brazil), Russian, Swedish.

1.8.1
-----
* Always write plain text as UTF-8.
* Always write RTF as codepage 1252.
* Replaced QTextCodec with ICU.
* Translation updates: Estonian, German.

1.8.0
-----
* FIXED: Lines were randomly duplicated in ODT.
* FIXED: Did not read text from lists in ODT.
* FIXED: Formatting was lost when restoring untitled documents from cache.
* FIXED: Loading headings caused document to shift vertically.
* FIXED: Timers did not show countdown in tooltip.
* FIXED: Sometimes could not remove dictionaries.
* Only restore changed files from cache.
* Refactored code.
* Removed XPM icon.
* Switched to Qt 6.
* Updated Unicode symbols database.
* Updated Windows dictionaries.
* Translation updates: Armenian, Bosnian, Czech, Dutch, French, Georgian,
  Italian, Lithuanian, Norwegian Bokmål, Norwegian Bokmål (Norway), Portuguese,
  Romanian, Swedish, Turkish, Ukrainian.

1.7.6
-----
* FIXED: Did not load locales with underscores.
* FIXED: Compile failure due to missing header.
* Translation updates: Slovenian, Swedish, Turkish.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/editors/focuswriter/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/focuswriter/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/editors/focuswriter/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/editors/focuswriter/patches/patch-focuswriter.pro

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/focuswriter/Makefile
diff -u pkgsrc/editors/focuswriter/Makefile:1.24 pkgsrc/editors/focuswriter/Makefile:1.25
--- pkgsrc/editors/focuswriter/Makefile:1.24    Mon May 22 21:00:22 2023
+++ pkgsrc/editors/focuswriter/Makefile Wed Sep  6 11:23:36 2023
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2023/05/22 21:00:22 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2023/09/06 11:23:36 pin Exp $
 
-DISTNAME=      focuswriter-1.7.6
-PKGREVISION=   20
+DISTNAME=      focuswriter-1.8.5
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gottcode/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    pin%NetBSD.org@localhost
 HOMEPAGE=      https://gottcode.org/focuswriter/
 COMMENT=       Simple, distraction-free writing environment
 LICENSE=       gnu-gpl-v3
@@ -15,19 +14,15 @@ USE_PKGLOCALEDIR=   yes
 USE_LANGUAGES=         c++
 USE_TOOLS+=            pkg-config
 
-INSTALL_MAKE_FLAGS+=   INSTALL_ROOT=${DESTDIR}
+CMAKE_ARGS+=   -DCMAKE_INSTALL_PREFIX=${PREFIX}
+CMAKE_ARGS+=   -DCMAKE_INSTALL_MANDIR=${PKGMANDIR}
+CMAKE_ARGS+=   -DCMAKE_INSTALL_DATADIR=${PREFIX}/share
 
-do-configure:
-       cd ${WRKSRC} && \
-       ${SETENV} ${CONFIGURE_ENV} \
-       ${QTDIR}/bin/qmake -o Makefile \
-               PREFIX=${PREFIX} PKGMANDIR=${PKGMANDIR}
-
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
-
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
+TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
+
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../multimedia/qt6-qtmultimedia/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/editors/focuswriter/PLIST
diff -u pkgsrc/editors/focuswriter/PLIST:1.1 pkgsrc/editors/focuswriter/PLIST:1.2
--- pkgsrc/editors/focuswriter/PLIST:1.1        Mon Apr  6 08:28:38 2020
+++ pkgsrc/editors/focuswriter/PLIST    Wed Sep  6 11:23:36 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/04/06 08:28:38 pin Exp $
+@comment $NetBSD: PLIST,v 1.2 2023/09/06 11:23:36 pin Exp $
 bin/focuswriter
 man/man1/focuswriter.1
 share/applications/focuswriter.desktop
@@ -270,7 +270,7 @@ share/focuswriter/icons/hicolor/64/windo
 share/focuswriter/icons/hicolor/index.theme
 share/focuswriter/sounds/keyany.wav
 share/focuswriter/sounds/keyenter.wav
-share/focuswriter/symbols1000.dat
+share/focuswriter/symbols1500.dat
 share/focuswriter/themes/bitterskies.theme
 share/focuswriter/themes/enchantment.theme
 share/focuswriter/themes/gentleblues.theme
@@ -298,6 +298,7 @@ share/focuswriter/translations/focuswrit
 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
@@ -309,8 +310,11 @@ share/focuswriter/translations/focuswrit
 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_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
@@ -338,4 +342,3 @@ share/icons/hicolor/512x512/apps/focuswr
 share/icons/hicolor/64x64/apps/focuswriter.png
 share/icons/hicolor/scalable/apps/focuswriter.svg
 share/metainfo/focuswriter.appdata.xml
-share/pixmaps/focuswriter.xpm

Index: pkgsrc/editors/focuswriter/distinfo
diff -u pkgsrc/editors/focuswriter/distinfo:1.4 pkgsrc/editors/focuswriter/distinfo:1.5
--- pkgsrc/editors/focuswriter/distinfo:1.4     Tue Oct 26 10:21:28 2021
+++ pkgsrc/editors/focuswriter/distinfo Wed Sep  6 11:23:36 2023
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:21:28 nia Exp $
+$NetBSD: distinfo,v 1.5 2023/09/06 11:23:36 pin Exp $
 
-BLAKE2s (focuswriter-1.7.6.tar.gz) = 5e9cdafdc267f2f1602b6a36f4d58167ceaaca963a9c46c6841516124b8fb3c8
-SHA512 (focuswriter-1.7.6.tar.gz) = 6c4e4f5f68ee9006f84b71fbd3200d8fcfc3a72a1b834d046a7fa38873debdfbd3f314de1fb5b96dd77c9b2bc32f39e35436c459debedad6aea9bfba7337ef72
-Size (focuswriter-1.7.6.tar.gz) = 10513715 bytes
-SHA1 (patch-focuswriter.pro) = 23764285b604fc533c28b67d25e62d5498d5f7b0
+BLAKE2s (focuswriter-1.8.5.tar.gz) = d53a7cc040e88bbaadbe5a746ce37f5e29cd02f324ce3d798b79cf764a44d30a
+SHA512 (focuswriter-1.8.5.tar.gz) = 862c0e82657cfcb0d0c5feb014ac3d8f3c557f735bf7145cbda8a35df3abc1029ca57b5a21fe63996563c9af4c8132cdd6640c733665da7df19a001b6d997d1b
+Size (focuswriter-1.8.5.tar.gz) = 11149590 bytes