Update to 3.60. From the changelog:

- improved PHP 8 syntax support
- added Emacs Org-Mode support (#174)
- fixed single argument and truecolor output of mark_lines.lua
  plug-in (#164)
- added lineno and column parameters to Decorate hook
- LIB: moved CodeGenerator::readUserStyleDef and getStyleDefinition to
  public (#173)
This commit is contained in:
schmonz 2021-01-01 19:41:37 +00:00
parent d6e0e06212
commit b8d4ae8a2c
5 changed files with 37 additions and 14 deletions

View file

@ -1,10 +1,10 @@
# $NetBSD: Makefile.common,v 1.17 2020/12/18 18:45:08 schmonz Exp $
# $NetBSD: Makefile.common,v 1.18 2021/01/01 19:41:37 schmonz Exp $
# used by textproc/highlight/Makefile
# used by textproc/libhighlight/Makefile
# used by textproc/p5-highlight/Makefile
DISTNAME= highlight-${VERSION}
VERSION= 3.59
VERSION= 3.60
CATEGORIES= textproc
MASTER_SITES= http://www.andre-simon.de/zip/
EXTRACT_SUFX= .tar.bz2

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.15 2020/12/18 18:45:08 schmonz Exp $
@comment $NetBSD: PLIST,v 1.16 2021/01/01 19:41:37 schmonz Exp $
lib/libhighlight.la
share/doc/highlight/AUTHORS
share/doc/highlight/COPYING
@ -217,6 +217,7 @@ share/highlight/langDefs/objc.lang
share/highlight/langDefs/ocaml.lang
share/highlight/langDefs/octave.lang
share/highlight/langDefs/oorexx.lang
share/highlight/langDefs/org.lang
share/highlight/langDefs/os.lang
share/highlight/langDefs/oz.lang
share/highlight/langDefs/paradox.lang
@ -336,6 +337,7 @@ share/highlight/plugins/outhtml_curly_brackets_matcher.lua
share/highlight/plugins/outhtml_ie7_webctrl.lua
share/highlight/plugins/outhtml_keyword_matcher.lua
share/highlight/plugins/outhtml_ligature_fonts.lua
share/highlight/plugins/outhtml_lsp_clangd.lua
share/highlight/plugins/outhtml_modern_fonts.lua
share/highlight/plugins/outhtml_parantheses_matcher.lua
share/highlight/plugins/outhtml_tooltips.lua

View file

@ -1,12 +1,13 @@
$NetBSD: distinfo,v 1.19 2020/12/18 18:45:08 schmonz Exp $
$NetBSD: distinfo,v 1.20 2021/01/01 19:41:37 schmonz Exp $
SHA1 (highlight-3.59.tar.bz2) = 7c7ad14eedd72d9f0595a7cfa425c9bfe069324c
RMD160 (highlight-3.59.tar.bz2) = 0a49f2b44df98d775d3d05467c12d7e6c3c5bd2a
SHA512 (highlight-3.59.tar.bz2) = 3711a18b286e2164b2bc860a02f7ee40857a5842f8ae73d75e71ce9fe4f97d3d6e2489f8c5af7431d73de635fe35b61460e750401007761c5fabfb464baffef7
Size (highlight-3.59.tar.bz2) = 1411312 bytes
SHA1 (highlight-3.60.tar.bz2) = 67504ef25afd1981de877c6e27c052f636588383
RMD160 (highlight-3.60.tar.bz2) = b74a5e64d57c6b6a64771b6957929c9320f47aea
SHA512 (highlight-3.60.tar.bz2) = e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
Size (highlight-3.60.tar.bz2) = 1412486 bytes
SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
SHA1 (patch-makefile) = 5a5ca6f18ee7d597191729ad2fc6ad5c23980250
SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
SHA1 (patch-src_gui-qt_highlight.pro) = 3706eeb89207dd7c444ad5cf7db0b02a939dcb2f
SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62
SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
SHA1 (patch-src_makefile) = 9d5d4db4c6bf7d1e13544011c569486e68d8de24

View file

@ -1,8 +1,8 @@
$NetBSD: patch-makefile,v 1.4 2019/04/04 14:14:28 schmonz Exp $
$NetBSD: patch-makefile,v 1.5 2021/01/01 19:41:37 schmonz Exp $
Use pkgsrc-provided paths and tools.
--- makefile.orig 2019-03-26 19:58:45.000000000 +0000
--- makefile.orig 2020-12-21 10:56:19.000000000 +0000
+++ makefile
@@ -7,7 +7,7 @@
DESTDIR =
@ -33,7 +33,7 @@ Use pkgsrc-provided paths and tools.
# Location of additional gui files
desktop_apps = ${PREFIX}/share/applications/
@@ -34,10 +34,10 @@ desktop_pixmaps = ${PREFIX}/share/pixmap
@@ -34,10 +34,10 @@ desktop_icons = ${PREFIX}/share/icons/hi
# Commands:
GZIP=gzip -9f
@ -62,9 +62,9 @@ Use pkgsrc-provided paths and tools.
${INSTALL_DATA} ./themes/base16/*.theme ${DESTDIR}${data_dir}themes/base16/
${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/
- ${INSTALL_DATA} ./man/highlight.1 ${DESTDIR}${man_dir}man1/
- -${GZIP} ${DESTDIR}${man_dir}man1/highlight.1
- ${GZIP} ${DESTDIR}${man_dir}man1/highlight.1
- ${INSTALL_DATA} ./man/filetypes.conf.5 ${DESTDIR}${man_dir}man5/
- -${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5
- ${GZIP} ${DESTDIR}${man_dir}man5/filetypes.conf.5
${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir}

View file

@ -0,0 +1,20 @@
$NetBSD: patch-src_gui-qt_highlight.pro,v 1.1 2021/01/01 19:41:37 schmonz Exp $
Restore non-.app macOS build settings from 3.59.
--- src/gui-qt/highlight.pro.orig 2020-12-21 10:56:19.000000000 +0000
+++ src/gui-qt/highlight.pro
@@ -80,8 +80,11 @@ macx-clang {
INCLUDEPATH += ../../include
INCLUDEPATH+=/usr/local/Cellar/boost/1.73.0/include
- QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13
- CONFIG += app_bundle
+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13
+ ###CONFIG += app_bundle
+ QT_CONFIG -= no-pkg-config
+ CONFIG += link_pkgconfig
+ PKGCONFIG += lua
LIBS += -L.. -lhighlight
LIBS += -L/Users/andresimon/MyProjects/lua-5.4.1/src -llua