diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2021-06-03 16:31:13 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2021-06-03 16:31:13 +0000 |
| commit | 5514cdd5881b025308c76a565b827c105d1aa208 (patch) | |
| tree | 3c0feba421c72ba895447614aabbd4706a0d39af /editors | |
| parent | 1221c0a5a66849afe0bbf9a81d505db5f7b7f785 (diff) | |
| download | pkgsrc-5514cdd5881b025308c76a565b827c105d1aa208.tar.gz | |
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.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/pluma/Makefile | 4 | ||||
| -rw-r--r-- | editors/pluma/PLIST | 6 | ||||
| -rw-r--r-- | editors/pluma/distinfo | 3 | ||||
| -rw-r--r-- | editors/pluma/patches/patch-help_Makefile.in | 15 |
4 files changed, 20 insertions, 8 deletions
diff --git a/editors/pluma/Makefile b/editors/pluma/Makefile index 50f3034e903..9a2f543061e 100644 --- a/editors/pluma/Makefile +++ b/editors/pluma/Makefile @@ -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 diff --git a/editors/pluma/PLIST b/editors/pluma/PLIST index 60cd4753552..e7acdbfab21 100644 --- a/editors/pluma/PLIST +++ b/editors/pluma/PLIST @@ -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_files_menu_icon.png 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 diff --git a/editors/pluma/distinfo b/editors/pluma/distinfo index 30baa416551..a577b343629 100644 --- a/editors/pluma/distinfo +++ b/editors/pluma/distinfo @@ -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 diff --git a/editors/pluma/patches/patch-help_Makefile.in b/editors/pluma/patches/patch-help_Makefile.in new file mode 100644 index 00000000000..759c0774549 --- /dev/null +++ b/editors/pluma/patches/patch-help_Makefile.in @@ -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))) ) |