Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
Showing
3 changed files
with
25 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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}= |