CVS commit: pkgsrc/editors/pluma

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jun  3 16:31:13 UTC 2021

Modified Files:
        pkgsrc/editors/pluma: Makefile PLIST distinfo
Added Files:
        pkgsrc/editors/pluma/patches: patch-help_Makefile.in

Log Message:
pluma: fix builds with latest itstool & py-libxml2 combination

A (hopefully temporary) workaround to fix a regression where itstool
with py-libxml2 2.9.12 ends up causing a Python segfault. (This did not
occur with py-libxml2 2.9.10.) For now, disable the help file target
that triggers the issue. Addresses PR pkg/56229 from Andrius V.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/editors/pluma/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/editors/pluma/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/editors/pluma/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/pluma/patches/patch-help_Makefile.in

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

Modified files:

Index: pkgsrc/editors/pluma/Makefile
diff -u pkgsrc/editors/pluma/Makefile:1.39 pkgsrc/editors/pluma/Makefile:1.40
--- pkgsrc/editors/pluma/Makefile:1.39  Mon May 24 19:52:08 2021
+++ pkgsrc/editors/pluma/Makefile       Thu Jun  3 16:31:13 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2021/05/24 19:52:08 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2021/06/03 16:31:13 gutteridge Exp $
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../meta-pkgs/mate/Makefile.common"
 
 DISTNAME=      pluma-${VERSION:R}.2

Index: pkgsrc/editors/pluma/PLIST
diff -u pkgsrc/editors/pluma/PLIST:1.8 pkgsrc/editors/pluma/PLIST:1.9
--- pkgsrc/editors/pluma/PLIST:1.8      Tue Nov 10 00:53:30 2020
+++ pkgsrc/editors/pluma/PLIST  Thu Jun  3 16:31:13 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/11/10 00:53:30 gutteridge Exp $
+@comment $NetBSD: PLIST,v 1.9 2021/06/03 16:31:13 gutteridge Exp $
 bin/pluma
 include/pluma/pluma-app.h
 include/pluma/pluma-commands.h
@@ -514,10 +514,6 @@ share/help/xh/pluma/figures/pluma_recent
 share/help/xh/pluma/figures/pluma_window.png
 share/help/xh/pluma/index.docbook
 share/help/xh/pluma/legal.xml
-share/help/zh_CN/pluma/figures/pluma_recent_files_menu_icon.png
-share/help/zh_CN/pluma/figures/pluma_window.png
-share/help/zh_CN/pluma/index.docbook
-share/help/zh_CN/pluma/legal.xml
 share/help/zh_HK/pluma/figures/pluma_recent_files_menu_icon.png
 share/help/zh_HK/pluma/figures/pluma_window.png
 share/help/zh_HK/pluma/index.docbook

Index: pkgsrc/editors/pluma/distinfo
diff -u pkgsrc/editors/pluma/distinfo:1.11 pkgsrc/editors/pluma/distinfo:1.12
--- pkgsrc/editors/pluma/distinfo:1.11  Wed May  5 00:47:21 2021
+++ pkgsrc/editors/pluma/distinfo       Thu Jun  3 16:31:13 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.11 2021/05/05 00:47:21 gutteridge Exp $
+$NetBSD: distinfo,v 1.12 2021/06/03 16:31:13 gutteridge Exp $
 
 SHA1 (pluma-1.24.2.tar.xz) = 92b7e2d8ac4f5ac25b1d91b5eb9ec7be2fc3f538
 RMD160 (pluma-1.24.2.tar.xz) = 5bf0fe427f525c614765b07b2c24e5f669dd5d1f
 SHA512 (pluma-1.24.2.tar.xz) = 588640744f8a0bec08d0c51c0309380a57cb6319c98124885e30d05e7dd8488ba7bd5acec1bf21fb0d6832626ae8925b24cd241202265af1a631a91313cdad2b
 Size (pluma-1.24.2.tar.xz) = 3745160 bytes
 SHA1 (patch-configure) = c2f4aef21c7b23bafeb0c6d3f751e7d21e0a618e
+SHA1 (patch-help_Makefile.in) = 530dee5e63b49452fd2f397e6572bc2482ba5286

Added files:

Index: pkgsrc/editors/pluma/patches/patch-help_Makefile.in
diff -u /dev/null pkgsrc/editors/pluma/patches/patch-help_Makefile.in:1.1
--- /dev/null   Thu Jun  3 16:31:13 2021
+++ pkgsrc/editors/pluma/patches/patch-help_Makefile.in Thu Jun  3 16:31:13 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-help_Makefile.in,v 1.1 2021/06/03 16:31:13 gutteridge Exp $
+
+Disable zh_CN, as it causes a segfault in itstool.
+
+--- help/Makefile.in.orig      2021-03-27 21:54:03.000000000 +0000
++++ help/Makefile.in
+@@ -329,7 +329,7 @@ HELP_MEDIA = \
+ 
+ 
+ # Add linguas to be ignored, e.g. IGNORE_HELP_LINGUAS = ca de es fr
+-IGNORE_HELP_LINGUAS = 
++IGNORE_HELP_LINGUAS = zh_CN
+ HELP_LINGUAS = $(if $(IGNORE_HELP_LINGUAS), \
+       $(filter-out $(IGNORE_HELP_LINGUAS),$(subst /,,$(dir $(wildcard */*.po)))), \
+       $(subst /,,$(dir $(wildcard */*.po))) )