diff options
| author | schmonz <schmonz@pkgsrc.org> | 2019-05-27 03:53:31 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2019-05-27 03:53:31 +0000 |
| commit | 270f3418583ab505e987e9f9d41d0e2b0d03d327 (patch) | |
| tree | 3fc7927302c30214c62da6821bdc63b1a729145a /www/ikiwiki/patches | |
| parent | 17e8df3d371d0aa803a10cad013333614ff519a7 (diff) | |
| download | pkgsrc-270f3418583ab505e987e9f9d41d0e2b0d03d327.tar.gz | |
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.
Diffstat (limited to 'www/ikiwiki/patches')
| -rw-r--r-- | www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm b/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm new file mode 100644 index 00000000000..429583f31c5 --- /dev/null +++ b/www/ikiwiki/patches/patch-IkiWiki_Plugin_highlight.pm @@ -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}= |