CVS commit: pkgsrc/editors

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 18 Nov 2025 17:26:22 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Nov 18 17:26:22 UTC 2025

Modified Files:
        pkgsrc/editors/abiword: Makefile Makefile.common distinfo
        pkgsrc/editors/abiword-plugins: Makefile PLIST
        pkgsrc/editors/abiword/patches:
            patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
Added Files:
        pkgsrc/editors/abiword/patches: patch-plugins_wordperfect_plugin.m4
            patch-plugins_wpg_plugin.m4
Removed Files:
        pkgsrc/editors/abiword/patches: patch-plugin-configure.m4
            patch-src_af_util_xp_ut__stringbuf.cpp

Log Message:
abiword[-plugins]: Update to 3.0.7

Remove support for broken plugins (mostly ones that used a web service
that's been discontinued). Verified to build on at least NetBSD & Linux.
Otherwise this update is just bug fixes.

3.0.7 - 2025/07/30

- Fix memory leaks in Styles, Font Chooser, Borders, List, Clip Art,
  Replace, Tabs and Table dialogs.
- Fix memory leaks in XHTML import.
- Fix memory leaks in cut and paste.
- Fix memory leaks in the ODF exporter.
- Fix memory leaks in the GdkPixbuf importer.
- Fix crash when editing lists.
- Fix crash when inserting a JPEG image.
- Restored icons from page setup dialog (Removed XPM in 3.0.6).
- Minor spacing adjustement in the status bar.

3.0.6 - 2024/11/03

- Removed XPM icons and moved the PNG to gresources (backported)
  This is necessary due to a break in the GNOME platform where XPM
  is not longer supported causing many icons to be missing.
- Fix build with recent libxml2. Some headers are now explicitly required.
- Fix build of methview plugin with recent gcc.
  https://gitlab.gnome.org/World/AbiWord/-/issues/27
- Fixes to the AppStream file for validation.
  https://gitlab.gnome.org/World/AbiWord/-/issues/16
- Fix to the table widget in the toolbar.
- Fix build with glib
  https://gitlab.gnome.org/World/AbiWord/-/issues/15
- Disable "Install new plugin" on flatpak. Require
  `CPPFLAGS=-DFLATPAK_BUILD`. Bug #13927
- Fix a crash loading files under some condition.


To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 pkgsrc/editors/abiword/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/editors/abiword/Makefile.common
cvs rdiff -u -r1.86 -r1.87 pkgsrc/editors/abiword/distinfo
cvs rdiff -u -r1.169 -r1.170 pkgsrc/editors/abiword-plugins/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/editors/abiword-plugins/PLIST
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/editors/abiword/patches/patch-plugin-configure.m4
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_plugin.m4 \
    pkgsrc/editors/abiword/patches/patch-plugins_wpg_plugin.m4
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/editors/abiword/patches/patch-src_af_util_xp_ut__stringbuf.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/abiword/Makefile
diff -u pkgsrc/editors/abiword/Makefile:1.242 pkgsrc/editors/abiword/Makefile:1.243
--- pkgsrc/editors/abiword/Makefile:1.242       Thu Oct 23 20:36:40 2025
+++ pkgsrc/editors/abiword/Makefile     Tue Nov 18 17:26:21 2025
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.242 2025/10/23 20:36:40 wiz Exp $
+# $NetBSD: Makefile,v 1.243 2025/11/18 17:26:21 nia Exp $
 
-PKGREVISION=   33
 .include       "Makefile.common"
 
-DISTNAME=      abiword-${ABIVERSION}
-CATEGORIES=    editors
-MASTER_SITES=  http://www.nl.abisource.com/downloads/abiword/${PKGVERSION_NOREV}/source/
+PKGNAME=       ${DISTNAME:tl:S/-release//1}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.abisource.com/
@@ -19,7 +16,10 @@ TOOL_DEPENDS+=       autoconf-archive-[0-9]*:.
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_TOOLS+=    autoconf automake gmake pkg-config
+USE_TOOLS+=    autoconf automake gmake pkg-config perl
+
+REPLACE_PERL+= tools/cdump/xp/cdump.pl
+REPLACE_PERL+= po/*.pl
 
 CONFIGURE_ARGS+=       --disable-default-plugins       # Do not build any plugins by default
 CONFIGURE_ARGS+=       --enable-spell         # (Gtk+ only) include spell checking support
@@ -31,8 +31,7 @@ CONFIGURE_ARGS+=      --with-evolution-data-s
 PKGCONFIG_OVERRIDE+=   libabiword.pc.in
 
 pre-configure:
-       cd ${WRKSRC}; \
-       autoreconf --force --install
+       cd ${WRKSRC} && ${ALL_ENV} ${SH} autogen.sh
 
 .include "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/editors/abiword/Makefile.common
diff -u pkgsrc/editors/abiword/Makefile.common:1.52 pkgsrc/editors/abiword/Makefile.common:1.53
--- pkgsrc/editors/abiword/Makefile.common:1.52 Mon Apr  1 15:46:40 2024
+++ pkgsrc/editors/abiword/Makefile.common      Tue Nov 18 17:26:21 2025
@@ -1,7 +1,11 @@
-# $NetBSD: Makefile.common,v 1.52 2024/04/01 15:46:40 gutteridge Exp $
+# $NetBSD: Makefile.common,v 1.53 2025/11/18 17:26:21 nia Exp $
 # used by editors/abiword-plugins/Makefile
 
-ABIVERSION=    3.0.5
+ABIVERSION=    3.0.7
+
+DISTNAME=      AbiWord-release-${ABIVERSION}
+CATEGORIES=    editors
+MASTER_SITES=  https://gitlab.gnome.org/World/AbiWord/-/archive/release-${ABIVERSION}/
 
 USE_LANGUAGES=         c c++
 USE_CXX_FEATURES=      c++11

Index: pkgsrc/editors/abiword/distinfo
diff -u pkgsrc/editors/abiword/distinfo:1.86 pkgsrc/editors/abiword/distinfo:1.87
--- pkgsrc/editors/abiword/distinfo:1.86        Tue Feb  6 03:48:34 2024
+++ pkgsrc/editors/abiword/distinfo     Tue Nov 18 17:26:21 2025
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.86 2024/02/06 03:48:34 gutteridge Exp $
+$NetBSD: distinfo,v 1.87 2025/11/18 17:26:21 nia Exp $
 
-BLAKE2s (abiword-3.0.5.tar.gz) = 3d6ee3bfcdf533ae92f068921473c9c99c4d35a10f73591ecd49c0505145bb6b
-SHA512 (abiword-3.0.5.tar.gz) = a2484268901ff47307c9d1f1928622e364f1006f22ce38257c585144df9411dfe3c2dea28c1f1f50a6e545e8cc579cce34117a89dfa771e20312e3ea1a9989d6
-Size (abiword-3.0.5.tar.gz) = 11084159 bytes
+BLAKE2s (AbiWord-release-3.0.7.tar.gz) = 4bd4792637447aabf795ec079d8082509d58ddea8b54571bb84c9571aa8f6acc
+SHA512 (AbiWord-release-3.0.7.tar.gz) = 6e7bc42d80790a7979551f9403ec8a8b1d3ce438bfedcd3a4b96711af5c2ba74c1d6a1a994ccc4dc9768ed65316264b66d4758adbad78906370faf249742232d
+Size (AbiWord-release-3.0.7.tar.gz) = 11490324 bytes
 SHA1 (patch-configure.ac) = 239c0635c2c616c7e0a986a5fd92428393af38b7
-SHA1 (patch-plugin-configure.m4) = 396c7ec04298b5af3807248f94f2c8630f3579ac
 SHA1 (patch-plugins_aiksaurus_Makefile.am) = 1529d5098b7fb798c428fe02cc50879374cb3e9d
 SHA1 (patch-plugins_command_Makefile.am) = e003a6bf9a6e0566abc85f09868fdf1aa93234d7
 SHA1 (patch-plugins_gdict_Makefile.am) = fd5afa1be1752ea1f5172e1585c91648b5b735e1
@@ -15,18 +14,19 @@ SHA1 (patch-plugins_ots_Makefile.am) = 6
 SHA1 (patch-plugins_paint_xp_AbiGeneric.cpp) = d0b6f3c23c1512c6517775ce9a5ae78f168931fc
 SHA1 (patch-plugins_paint_xp_AbiPaint.cpp) = 3cdad7a1755db036e3299368b4b11e10feff1875
 SHA1 (patch-plugins_psion_Makefile.am) = d18356c2a273d99918076d5aefafec595af3f898
+SHA1 (patch-plugins_wordperfect_plugin.m4) = a7f9ccc6701d8a0c24576a730bc12862610d4648
 SHA1 (patch-plugins_wordperfect_xp_Makefile.am) = 027dadfb6effbb25fafda6b69e9c92c8046e52f7
-SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = e677c06d7e6c0a97ab7a4003471adae2148ce435
+SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp) = 1154bd6bc622a21406dee202b262dde9666a0d58
 SHA1 (patch-plugins_wordperfect_xp_ie__imp__WordPerfect.h) = 4931688c7cb82b9fe41cb42bb9bc604f6606ef4e
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.cpp) = 255ac57f2f127d76aff6bdbf1f0ddc223a673ca9
 SHA1 (patch-plugins_wordperfect_xp_ie__impexp__WordPerfect.h) = a3eac8abff26bf91f698948430e89bff13db710b
+SHA1 (patch-plugins_wpg_plugin.m4) = 03247a9ff1d3e6a073a87c61d22f5034b8f0142a
 SHA1 (patch-plugins_wpg_xp_ie__impGraphic__WPG.cpp) = 7eb0296fdff2fa27288f4c68fc337ba105695551
 SHA1 (patch-src_af_util_xp_ut__endian.h) = e1dd4cc0df3b0eb66dbd673fb5c0d2e3b24b30a4
 SHA1 (patch-src_af_util_xp_ut__iconv.cpp) = 18529454262fe6cb3ae15fd485c7bcc8adb00ae3
 SHA1 (patch-src_af_util_xp_ut__iconv.h) = bbcfa2098ea77d393feb50d69de9ae29fcce302f
 SHA1 (patch-src_af_util_xp_ut__mbtowc.cpp) = cf7078a6bfdf9ac9b30478d11d9d3a81a95b8ed1
 SHA1 (patch-src_af_util_xp_ut__misc.cpp) = f552ecbb87490355d8e74218dd59fd3961f1af5d
-SHA1 (patch-src_af_util_xp_ut__stringbuf.cpp) = 0814851b7ea92b474f129096be9c67a78d54f9c6
 SHA1 (patch-src_af_xap_xp_enchant__checker.cpp) = 5ad3b8bb4e186e998d7e8930247534c9f058c534
 SHA1 (patch-src_text_fmt_xp_fv__FrameEdit.h) = 684310bf9aece4ce72d004dfae9a4b4b6ca69570
 SHA1 (patch-src_wp_ap_gtk_ap__UnixApp.cpp) = 0269d41c71db3501afc0f06ba1d21cd68f3f9304

Index: pkgsrc/editors/abiword-plugins/Makefile
diff -u pkgsrc/editors/abiword-plugins/Makefile:1.169 pkgsrc/editors/abiword-plugins/Makefile:1.170
--- pkgsrc/editors/abiword-plugins/Makefile:1.169       Thu Oct 23 20:36:40 2025
+++ pkgsrc/editors/abiword-plugins/Makefile     Tue Nov 18 17:26:22 2025
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.169 2025/10/23 20:36:40 wiz Exp $
+# $NetBSD: Makefile,v 1.170 2025/11/18 17:26:22 nia Exp $
 
-PKGREVISION=   41
 .include       "../../editors/abiword/Makefile.common"
-DISTNAME=      abiword-${ABIVERSION}
+
 PKGNAME=       abiword-plugins-${ABIVERSION}
-CATEGORIES=    editors
-MASTER_SITES=  http://www.nl.abisource.com/downloads/abiword/${PKGVERSION_NOREV}/source/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.abisource.com/
@@ -41,7 +38,6 @@ CONFIGURE_ARGS+=      --with-evolution-data-s
 CONFIGURE_ARGS+=       --enable-plugins="\
        aiksaurus \
        applix \
-       babelfish \
        bmp \
        clarisworks \
        collab \
@@ -49,9 +45,7 @@ CONFIGURE_ARGS+=      --enable-plugins="\
        docbook \
        eml \
        epub \
-       freetranslation \
        garble \
-       gdict \
        gimp \
        goffice \
        google \
@@ -94,8 +88,7 @@ CONFIGURE_ARGS+=      --enable-collab-backend
 PKGCONFIG_OVERRIDE+=   libabiword.pc.in
 
 pre-configure:
-       cd ${WRKSRC}; \
-       autoreconf --force --install
+       cd ${WRKSRC} && ${ALL_ENV} ${SH} autogen.sh
 
 BUILDLINK_TRANSFORM+=  opt:-no-undefined:-Wl,--no-undefined
 
@@ -108,7 +101,6 @@ BUILDLINK_TRANSFORM+=       opt:-no-undefined:
 .include "../../converters/libwps/buildlink3.mk"
 .include "../../chat/loudmouth/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
-#.include "../../devel/asio/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
@@ -117,7 +109,6 @@ BUILDLINK_TRANSFORM+=       opt:-no-undefined:
 .include "../../geography/libchamplain012/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../misc/goffice0.10/buildlink3.mk"
-#.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../net/libsoup/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"

Index: pkgsrc/editors/abiword-plugins/PLIST
diff -u pkgsrc/editors/abiword-plugins/PLIST:1.15 pkgsrc/editors/abiword-plugins/PLIST:1.16
--- pkgsrc/editors/abiword-plugins/PLIST:1.15   Mon Apr  1 15:41:08 2024
+++ pkgsrc/editors/abiword-plugins/PLIST        Tue Nov 18 17:26:22 2025
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.15 2024/04/01 15:41:08 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.16 2025/11/18 17:26:22 nia Exp $
 lib/abiword-3.0/plugins/aiksaurus.la
 lib/abiword-3.0/plugins/applix.la
-lib/abiword-3.0/plugins/babelfish.la
 lib/abiword-3.0/plugins/bmp.la
 lib/abiword-3.0/plugins/clarisworks.la
 lib/abiword-3.0/plugins/collab.la
@@ -9,9 +8,7 @@ lib/abiword-3.0/plugins/command.la
 lib/abiword-3.0/plugins/docbook.la
 lib/abiword-3.0/plugins/eml.la
 lib/abiword-3.0/plugins/epub.la
-lib/abiword-3.0/plugins/freetranslation.la
 lib/abiword-3.0/plugins/garble.la
-lib/abiword-3.0/plugins/gdict.la
 lib/abiword-3.0/plugins/gimp.la
 lib/abiword-3.0/plugins/goffice.la
 lib/abiword-3.0/plugins/google.la

Index: pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp
diff -u pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp:1.2 pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp:1.3
--- pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp:1.2    Sat Jun  8 10:40:53 2019
+++ pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp        Tue Nov 18 17:26:21 2025
@@ -1,9 +1,9 @@
-$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.2 2019/06/08 10:40:53 rillig Exp $
+$NetBSD: patch-plugins_wordperfect_xp_ie__imp__WordPerfect.cpp,v 1.3 2025/11/18 17:26:21 nia Exp $
 
 * adapt wordperfect plugins to dependecies available in pkgsrc 
   from abiword svn date 2014-12-27
 
---- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp.orig 2013-04-07 13:53:03.000000000 +0000
+--- plugins/wordperfect/xp/ie_imp_WordPerfect.cpp.orig 2025-07-31 01:33:21.000000000 +0000
 +++ plugins/wordperfect/xp/ie_imp_WordPerfect.cpp
 @@ -31,6 +31,8 @@
  #include <stdlib.h>
@@ -632,13 +632,15 @@ $NetBSD: patch-plugins_wordperfect_xp_ie
                        {
                                UT_DEBUGMSG(("AbiMSWorks: ERROR: %i!\n", (int)error));
                                return UT_IE_IMPORTERROR;
-@@ -1286,13 +1388,17 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::
+@@ -1286,13 +1388,19 @@ UT_Confidence_t IE_Imp_MSWorks_Sniffer::
  {
        AbiWordperfectInputStream gsfInput(input);
  
 -      WPSConfidence confidence = WPSDocument::isFileFormatSupported(&gsfInput);
 +      libwps::WPSKind kind;
-+      libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind);
++        libwps::WPSCreator creator;
++        bool needsEncoding = false;
++      libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(&gsfInput, kind, creator, needsEncoding);
 +      
 +      if (kind != libwps::WPS_TEXT)
 +              confidence = libwps::WPS_CONFIDENCE_NONE;

Added files:

Index: pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_plugin.m4
diff -u /dev/null pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_plugin.m4:1.1
--- /dev/null   Tue Nov 18 17:26:22 2025
+++ pkgsrc/editors/abiword/patches/patch-plugins_wordperfect_plugin.m4  Tue Nov 18 17:26:21 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-plugins_wordperfect_plugin.m4,v 1.1 2025/11/18 17:26:21 nia Exp $
+
+Fix version numbers for current reality of dependencies.
+
+--- plugins/wordperfect/plugin.m4.orig 2025-11-16 16:17:25.572834946 +0000
++++ plugins/wordperfect/plugin.m4
+@@ -1,6 +1,6 @@
+ 
+-wordperfect_pkgs="libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0 $gsf_req"
+-wordperfect_wps_pkgs='libwps-0.2 >= 0.1.0'
++wordperfect_pkgs="libwpg-0.3 >= 0.3.0 libwpd-0.10 >= 0.10.0 $gsf_req"
++wordperfect_wps_pkgs='libwps-0.4 >= 0.4.0'
+ wordperfect_deps="no"
+ 
+ WORDPERFECT_CFLAGS=
Index: pkgsrc/editors/abiword/patches/patch-plugins_wpg_plugin.m4
diff -u /dev/null pkgsrc/editors/abiword/patches/patch-plugins_wpg_plugin.m4:1.1
--- /dev/null   Tue Nov 18 17:26:22 2025
+++ pkgsrc/editors/abiword/patches/patch-plugins_wpg_plugin.m4  Tue Nov 18 17:26:21 2025
@@ -0,0 +1,13 @@
+$NetBSD: patch-plugins_wpg_plugin.m4,v 1.1 2025/11/18 17:26:21 nia Exp $
+
+Fix version numbers for current reality of dependencies.
+
+--- plugins/wpg/plugin.m4.orig 2025-11-16 16:00:48.701317790 +0000
++++ plugins/wpg/plugin.m4
+@@ -1,5 +1,5 @@
+ 
+-wpg_pkgs="$gsf_req libwpg-0.2 >= 0.2.0 libwpd-0.9 >= 0.9.0 libwpd-stream-0.9 >= 0.9.0"
++wpg_pkgs="$gsf_req libwpg-0.3 >= 0 libwpd-0.10 >= 0"
+ wpg_deps="no"
+ 
+ if test "$enable_wpg" != ""; then

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index