CVS commit: pkgsrc/editors/focuswriter

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

Module Name:    pkgsrc
Committed By:   pin
Date:           Tue Jan 16 21:26:03 UTC 2024

Modified Files:
        pkgsrc/editors/focuswriter: Makefile PLIST distinfo
        pkgsrc/editors/focuswriter/patches: patch-CMakeLists.txt
            patch-src_text__codec.cpp

Log Message:
editors/focuswriter: update to 1.8.6

Bug Fixes
    FIXED: Always incremented number for imported themes
    FIXED: Unable to update contents of theme background image
    FIXED: Modifying themes sometimes removed backgrounds
    FIXED: Decompression failed in Haiku

Code Improvements
    Added shortcuts for selecting by paragraph
    Replaced deprecated code
    Updated Unicode symbols database
    Updated Windows dictionaries

Translation Updates

Portuguese, Portuguese (Brazil), Swedish


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/editors/focuswriter/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/focuswriter/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/editors/focuswriter/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/editors/focuswriter/patches/patch-CMakeLists.txt \
    pkgsrc/editors/focuswriter/patches/patch-src_text__codec.cpp

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.30 pkgsrc/editors/focuswriter/Makefile:1.31
--- pkgsrc/editors/focuswriter/Makefile:1.30    Sun Nov 12 13:21:15 2023
+++ pkgsrc/editors/focuswriter/Makefile Tue Jan 16 21:26:03 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2023/11/12 13:21:15 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2024/01/16 21:26:03 pin Exp $
 
-DISTNAME=      focuswriter-1.8.5
-PKGREVISION=   3
+DISTNAME=      focuswriter-1.8.6
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=gottcode/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/editors/focuswriter/PLIST
diff -u pkgsrc/editors/focuswriter/PLIST:1.2 pkgsrc/editors/focuswriter/PLIST:1.3
--- pkgsrc/editors/focuswriter/PLIST:1.2        Wed Sep  6 11:23:36 2023
+++ pkgsrc/editors/focuswriter/PLIST    Tue Jan 16 21:26:03 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/09/06 11:23:36 pin Exp $
+@comment $NetBSD: PLIST,v 1.3 2024/01/16 21:26:03 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/symbols1500.dat
+share/focuswriter/symbols1510.dat
 share/focuswriter/themes/bitterskies.theme
 share/focuswriter/themes/enchantment.theme
 share/focuswriter/themes/gentleblues.theme

Index: pkgsrc/editors/focuswriter/distinfo
diff -u pkgsrc/editors/focuswriter/distinfo:1.6 pkgsrc/editors/focuswriter/distinfo:1.7
--- pkgsrc/editors/focuswriter/distinfo:1.6     Fri Sep 15 16:45:01 2023
+++ pkgsrc/editors/focuswriter/distinfo Tue Jan 16 21:26:03 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2023/09/15 16:45:01 nros Exp $
+$NetBSD: distinfo,v 1.7 2024/01/16 21:26:03 pin Exp $
 
-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
-SHA1 (patch-CMakeLists.txt) = e75a2dbac5e2a7c2eb0dcce6daf86ff28e5f666b
-SHA1 (patch-src_text__codec.cpp) = 88ff738380d3c47390f4237cb874ce362f58f91b
+BLAKE2s (focuswriter-1.8.6.tar.gz) = 51fb9b390f2daff059f08cc4b6c804439862507d2b7b8fb8e549ea58a283ac91
+SHA512 (focuswriter-1.8.6.tar.gz) = aed0ffca1b2bd0f54e313ab89a78687368be8c436057d653e4256bc33f50adbbe6cae188a70669e9198877a09444140c7469ac6bc8060d37828885a03c08b006
+Size (focuswriter-1.8.6.tar.gz) = 11149842 bytes
+SHA1 (patch-CMakeLists.txt) = b75f76c952fd8590e56ace152f35e5d424c46495
+SHA1 (patch-src_text__codec.cpp) = b9f23cf411a286b87683a4c923876e553b1eb0bc

Index: pkgsrc/editors/focuswriter/patches/patch-CMakeLists.txt
diff -u pkgsrc/editors/focuswriter/patches/patch-CMakeLists.txt:1.1 pkgsrc/editors/focuswriter/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/editors/focuswriter/patches/patch-CMakeLists.txt:1.1 Fri Sep 15 16:45:01 2023
+++ pkgsrc/editors/focuswriter/patches/patch-CMakeLists.txt     Tue Jan 16 21:26:03 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2023/09/15 16:45:01 nros Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/01/16 21:26:03 pin Exp $
 
-* Make iconv test work in NetBSD 9
+Make iconv test work in NetBSD 9.
 
---- CMakeLists.txt.orig        2023-06-27 13:32:39.000000000 +0000
+--- CMakeLists.txt.orig        2024-01-16 21:01:15.262713776 +0000
 +++ CMakeLists.txt
 @@ -5,7 +5,7 @@
  cmake_minimum_required(VERSION 3.16)
  
  # Configure project
--project(focuswriter VERSION 1.8.5 LANGUAGES CXX)
-+project(focuswriter VERSION 1.8.5 LANGUAGES C CXX)
+-project(focuswriter VERSION 1.8.6 LANGUAGES CXX)
++project(focuswriter VERSION 1.8.6 LANGUAGES C CXX)
  
- set(project_copyright "2008-2023 Graeme Gott")
+ set(project_copyright "2008-2024 Graeme Gott")
  
Index: pkgsrc/editors/focuswriter/patches/patch-src_text__codec.cpp
diff -u pkgsrc/editors/focuswriter/patches/patch-src_text__codec.cpp:1.1 pkgsrc/editors/focuswriter/patches/patch-src_text__codec.cpp:1.2
--- pkgsrc/editors/focuswriter/patches/patch-src_text__codec.cpp:1.1    Fri Sep 15 16:45:01 2023
+++ pkgsrc/editors/focuswriter/patches/patch-src_text__codec.cpp        Tue Jan 16 21:26:03 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_text__codec.cpp,v 1.1 2023/09/15 16:45:01 nros Exp $
+$NetBSD: patch-src_text__codec.cpp,v 1.2 2024/01/16 21:26:03 pin Exp $
 
-* NetBSD 9 uses const in the second argument to iconv 
+NetBSD 9 uses const in the second argument to iconv.
 
---- src/text_codec.cpp.orig    2023-06-27 13:32:39.000000000 +0000
+--- src/text_codec.cpp.orig    2024-01-16 21:02:09.859731226 +0000
 +++ src/text_codec.cpp
-@@ -14,6 +14,15 @@
+@@ -14,6 +14,13 @@
  
  #include <errno.h>
  
@@ -15,12 +15,10 @@ $NetBSD: patch-src_text__codec.cpp,v 1.1
 +#endif
 +#endif
 +
-+
-+
  //-----------------------------------------------------------------------------
  
  namespace
-@@ -79,7 +88,7 @@ TextCodecIconv::~TextCodecIconv()
+@@ -79,7 +86,7 @@ TextCodecIconv::~TextCodecIconv()
  QByteArray TextCodecIconv::fromUnicode(const QString& input)
  {
        QByteArray in = TextCodec::fromUnicode(input);
@@ -29,7 +27,7 @@ $NetBSD: patch-src_text__codec.cpp,v 1.1
        // POSIX requires the source to not be const, even though it does not modify it
        char* source = in.data();
  #else
-@@ -128,7 +137,7 @@ QByteArray TextCodecIconv::fromUnicode(c
+@@ -128,7 +135,7 @@ QByteArray TextCodecIconv::fromUnicode(c
  
  QString TextCodecIconv::toUnicode(const QByteArray& input)
  {