Skip to content
Permalink
Browse files

As of 3.51, searchFile() is no longer provided in highlight's Perl

bindings (at least on NetBSD and OS X, as built from pkgsrc). This
leaves us falling through to getConfDir(), which has been gone
rather longer.

From highlight git, it appears searchFile() and getFiletypesConfPath()
both originated in the 3.14 release. The latter is still available in
3.51, and returns the same result searchFile() used to. Switch to it.

(From upstream git 4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce.)

Bump PKGREVISION.
  • Loading branch information...
schmonz committed May 27, 2019
1 parent 3fe479f commit 448a4bfb8ca7508c4c3e56cbf1f04eaccac33b64
Showing with 25 additions and 3 deletions.
  1. +2 −2 www/ikiwiki/Makefile
  2. +2 −1 www/ikiwiki/distinfo
  3. +21 −0 www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm
@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.163 2019/04/25 07:33:27 maya Exp $
# $NetBSD: Makefile,v 1.164 2019/05/27 03:53:31 schmonz Exp $
#

DISTNAME= ikiwiki_3.20190228.orig
PKGNAME= ${DISTNAME:S/_/-/:S/.orig//}
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= www textproc
MASTER_SITES= ${MASTER_SITE_DEBIAN:=pool/main/i/ikiwiki/}
EXTRACT_SUFX= .tar.xz
@@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.132 2019/02/28 22:00:48 schmonz Exp $
$NetBSD: distinfo,v 1.133 2019/05/27 03:53:31 schmonz Exp $

SHA1 (ikiwiki_3.20190228.orig.tar.xz) = 46f5b0a1498c1e098fe248eae1f2e3f56b25dc2f
RMD160 (ikiwiki_3.20190228.orig.tar.xz) = f47968a69528aea864ad412c8508a8c5063edb9d
SHA512 (ikiwiki_3.20190228.orig.tar.xz) = 125147d83dae6166b45541ed9176398ba4bd22ef3389d3efb3f442e558e326e0b004583d29aa32ed4bfca489c9d55b4232f074aab5fa649e51d9edd103685172
Size (ikiwiki_3.20190228.orig.tar.xz) = 2672244 bytes
SHA1 (patch-IkiWiki_Plugin_highlight.pm) = 14a2d8e1d3eb671863cdef4a936ebbb7b09ce3b9
SHA1 (patch-ikiwiki-mass-rebuild) = b8d5785d77736508de9cfc0f059cc36e0e607bce
@@ -0,0 +1,21 @@
$NetBSD: patch-IkiWiki_Plugin_highlight.pm,v 1.1 2019/05/27 03:53:31 schmonz Exp $

Catch up to highlight 3.51 API change.
From upstream git 4d06df9583e6c4145f8c6fc2fd51d7894c0b85ce

--- IkiWiki/Plugin/highlight.pm.orig 2019-02-26 23:01:54.000000000 +0000
+++ IkiWiki/Plugin/highlight.pm
@@ -62,10 +62,10 @@ sub checkconfig () {
if (! exists $config{filetypes_conf}) {
if (! $data_dir ) {
$config{filetypes_conf}= "/etc/highlight/filetypes.conf";
- } elsif ( $data_dir -> can('searchFile') ) {
- # 3.18 +
+ } elsif ( $data_dir -> can('getFiletypesConfPath') ) {
+ # 3.14 +
$config{filetypes_conf}=
- $data_dir -> searchFile("filetypes.conf");
+ $data_dir -> getFiletypesConfPath("filetypes");
} else {
# 3.9 +
$config{filetypes_conf}=

0 comments on commit 448a4bf

Please sign in to comment.
You can’t perform that action at this time.