Received: by mail.netbsd.org (Postfix, from userid 605) id 7D5C884DB6; Thu, 13 May 2021 14:06:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B7A1384DA6 for ; Thu, 13 May 2021 14:06:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id nErszJHwJQgC for ; Thu, 13 May 2021 14:06:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 51C2D84CD8 for ; Thu, 13 May 2021 14:06:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4AA3DFA95; Thu, 13 May 2021 14:06:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1620914770259960" MIME-Version: 1.0 Date: Thu, 13 May 2021 14:06:10 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/textproc/libhighlight To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20210513140610.4AA3DFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1620914770259960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Thu May 13 14:06:10 UTC 2021 Modified Files: pkgsrc/textproc/libhighlight: Makefile.common PLIST distinfo pkgsrc/textproc/libhighlight/patches: patch-makefile patch-src_gui-qt_mainwindow.cpp Log Message: Update to 4.1. From the changelog: - improved handling of Custom theme attributes (#182) - fixed wrong color code in edit-kwrite.theme - added rng file mapping (#129) - improved Lisp highlighting - GUI: fixed highlighting options tab title (thanks to Craig) - renamed `std` style name to `def` - version and README updates - removed `extras/web_plugins` - added user-select default property to HTML line number style - revised color themes - added two more keyword styles for default themes - added Custom theme attributes for Plain TeX, LaTeX, SVG and Pango - enabled syntax message output with `--ls-syntax-error` - GUI: enabled syntax error checkbox - added Custom theme attribute - enabled inline stylesheets with `--ls-hover` - added Error and Hover theme properties - enabled syntax error highlighting with `ls-semantic` - improved LSP message handling - added delay LSP parameter - added LSP semantic token styles to base16 themes - renamed `str` style name to `sng` - CLI: enabled `--ls-semantic` option - GUI: enabled semantic checkbox and a server capability test - added support for the language server protocol - added new configuration file lsp.conf - CLI: added `ls-profile`, `--ls-workspace`,`--ls-hover` - CLI: deprecated `--start-nested`, `--reformat=user`, `--reformat-option`, `--base16`, `--delim-cr`, `--plug-in-read` - GUI: added LSP configuration tab - added `--syntax-supported` option To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/libhighlight/Makefile.common cvs rdiff -u -r1.16 -r1.17 pkgsrc/textproc/libhighlight/PLIST cvs rdiff -u -r1.20 -r1.21 pkgsrc/textproc/libhighlight/distinfo cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/libhighlight/patches/patch-makefile cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1620914770259960 Content-Disposition: inline Content-Length: 12631 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/libhighlight/Makefile.common diff -u pkgsrc/textproc/libhighlight/Makefile.common:1.18 pkgsrc/textproc/libhighlight/Makefile.common:1.19 --- pkgsrc/textproc/libhighlight/Makefile.common:1.18 Fri Jan 1 19:41:37 2021 +++ pkgsrc/textproc/libhighlight/Makefile.common Thu May 13 14:06:09 2021 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.18 2021/01/01 19:41:37 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.19 2021/05/13 14:06:09 schmonz Exp $ # used by textproc/highlight/Makefile # used by textproc/libhighlight/Makefile # used by textproc/p5-highlight/Makefile DISTNAME= highlight-${VERSION} -VERSION= 3.60 +VERSION= 4.1 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/textproc/libhighlight/PLIST diff -u pkgsrc/textproc/libhighlight/PLIST:1.16 pkgsrc/textproc/libhighlight/PLIST:1.17 --- pkgsrc/textproc/libhighlight/PLIST:1.16 Fri Jan 1 19:41:37 2021 +++ pkgsrc/textproc/libhighlight/PLIST Thu May 13 14:06:09 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2021/01/01 19:41:37 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.17 2021/05/13 14:06:09 schmonz Exp $ lib/libhighlight.la share/doc/highlight/AUTHORS share/doc/highlight/COPYING @@ -7,10 +7,12 @@ share/doc/highlight/INSTALL share/doc/highlight/README.adoc share/doc/highlight/README_DE.adoc share/doc/highlight/README_LANGLIST.adoc +share/doc/highlight/README_LSP_CLIENT.adoc share/doc/highlight/README_PLUGINS.adoc share/doc/highlight/README_REGEX.adoc share/doc/highlight/README_RELEASE.adoc share/doc/highlight/README_TESTCASES.adoc +share/doc/highlight/README_V4_MIGRATION.adoc share/doc/highlight/extras/highlight_pipe.php share/doc/highlight/extras/highlight_pipe.pm share/doc/highlight/extras/highlight_pipe.py @@ -55,13 +57,9 @@ share/doc/highlight/extras/themes-resour share/doc/highlight/extras/themes-resources/css-themes/example.html share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.css share/doc/highlight/extras/themes-resources/css-themes/hl-theme-boilerplate.scss -share/doc/highlight/extras/web_plugins/dokuwiki/syntax.php -share/doc/highlight/extras/web_plugins/movabletype/README -share/doc/highlight/extras/web_plugins/movabletype/highlight.pl -share/doc/highlight/extras/web_plugins/wordpress/README -share/doc/highlight/extras/web_plugins/wordpress/highlight.php share/examples/highlight/filetypes.conf -share/highlight/langDefs/abap4.lang +share/examples/highlight/lsp.conf +share/highlight/langDefs/abap.lang share/highlight/langDefs/abc.lang share/highlight/langDefs/abnf.lang share/highlight/langDefs/actionscript.lang @@ -108,7 +106,7 @@ share/highlight/langDefs/clojure.lang share/highlight/langDefs/clp.lang share/highlight/langDefs/cmake.lang share/highlight/langDefs/cobol.lang -share/highlight/langDefs/coffee.lang +share/highlight/langDefs/coffeescript.lang share/highlight/langDefs/coldfusion.lang share/highlight/langDefs/conf.lang share/highlight/langDefs/crk.lang @@ -120,7 +118,7 @@ share/highlight/langDefs/d.lang share/highlight/langDefs/dart.lang share/highlight/langDefs/delphi.lang share/highlight/langDefs/diff.lang -share/highlight/langDefs/docker.lang +share/highlight/langDefs/dockerfile.lang share/highlight/langDefs/dts.lang share/highlight/langDefs/dylan.lang share/highlight/langDefs/ebnf.lang @@ -167,7 +165,7 @@ share/highlight/langDefs/interlis.lang share/highlight/langDefs/io.lang share/highlight/langDefs/jasmin.lang share/highlight/langDefs/java.lang -share/highlight/langDefs/js.lang +share/highlight/langDefs/javascript.lang share/highlight/langDefs/js_regex.lang share/highlight/langDefs/json.lang share/highlight/langDefs/jsp.lang @@ -186,7 +184,7 @@ share/highlight/langDefs/lotos.lang share/highlight/langDefs/lotus.lang share/highlight/langDefs/lua.lang share/highlight/langDefs/luban.lang -share/highlight/langDefs/make.lang +share/highlight/langDefs/makefile.lang share/highlight/langDefs/maple.lang share/highlight/langDefs/markdown.lang share/highlight/langDefs/matlab.lang @@ -234,10 +232,10 @@ share/highlight/langDefs/po.lang share/highlight/langDefs/polygen.lang share/highlight/langDefs/pony.lang share/highlight/langDefs/pov.lang +share/highlight/langDefs/powershell.lang share/highlight/langDefs/pro.lang share/highlight/langDefs/progress.lang share/highlight/langDefs/ps.lang -share/highlight/langDefs/ps1.lang share/highlight/langDefs/psl.lang share/highlight/langDefs/pure.lang share/highlight/langDefs/purebasic.lang @@ -254,9 +252,9 @@ share/highlight/langDefs/rexx.lang share/highlight/langDefs/rnc.lang share/highlight/langDefs/rpg.lang share/highlight/langDefs/rpl.lang -share/highlight/langDefs/rs.lang share/highlight/langDefs/rst.lang share/highlight/langDefs/ruby.lang +share/highlight/langDefs/rust.lang share/highlight/langDefs/s.lang share/highlight/langDefs/sam.lang share/highlight/langDefs/sas.lang @@ -264,7 +262,7 @@ share/highlight/langDefs/scad.lang share/highlight/langDefs/scala.lang share/highlight/langDefs/scilab.lang share/highlight/langDefs/scss.lang -share/highlight/langDefs/sh.lang +share/highlight/langDefs/shellscript.lang share/highlight/langDefs/slim.lang share/highlight/langDefs/small.lang share/highlight/langDefs/smalltalk.lang @@ -285,11 +283,11 @@ share/highlight/langDefs/tcsh.lang share/highlight/langDefs/terraform.lang share/highlight/langDefs/tex.lang share/highlight/langDefs/toml.lang -share/highlight/langDefs/ts.lang share/highlight/langDefs/tsql.lang share/highlight/langDefs/tsx.lang share/highlight/langDefs/ttcn3.lang share/highlight/langDefs/txt.lang +share/highlight/langDefs/typescript.lang share/highlight/langDefs/upc.lang share/highlight/langDefs/vala.lang share/highlight/langDefs/vb.lang @@ -337,7 +335,6 @@ share/highlight/plugins/outhtml_curly_br 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 @@ -443,7 +440,6 @@ share/highlight/themes/base16/porple.the share/highlight/themes/base16/railscasts.theme share/highlight/themes/base16/rebecca.theme share/highlight/themes/base16/seti.theme -share/highlight/themes/base16/shapeshifter.theme share/highlight/themes/base16/snazzy.theme share/highlight/themes/base16/solarflare.theme share/highlight/themes/base16/solarized-dark.theme @@ -460,7 +456,6 @@ share/highlight/themes/base16/unikitty-l share/highlight/themes/base16/unikitty-reversible.theme share/highlight/themes/base16/woodland.theme share/highlight/themes/base16/xcode-dusk.theme -share/highlight/themes/base16/zenburn.theme share/highlight/themes/baycomb.theme share/highlight/themes/bclear.theme share/highlight/themes/biogoo.theme @@ -506,7 +501,7 @@ share/highlight/themes/edit-vim-dark.the share/highlight/themes/edit-vim.theme share/highlight/themes/edit-xcode.theme share/highlight/themes/ekvoli.theme -share/highlight/themes/fine_blue.theme +share/highlight/themes/fineblue.theme share/highlight/themes/freya.theme share/highlight/themes/fruit.theme share/highlight/themes/github.theme Index: pkgsrc/textproc/libhighlight/distinfo diff -u pkgsrc/textproc/libhighlight/distinfo:1.20 pkgsrc/textproc/libhighlight/distinfo:1.21 --- pkgsrc/textproc/libhighlight/distinfo:1.20 Fri Jan 1 19:41:37 2021 +++ pkgsrc/textproc/libhighlight/distinfo Thu May 13 14:06:09 2021 @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.20 2021/01/01 19:41:37 schmonz Exp $ +$NetBSD: distinfo,v 1.21 2021/05/13 14:06:09 schmonz Exp $ -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 (highlight-4.1.tar.bz2) = 0cd81c22b368b192b523f197a51ac59579cb1a73 +RMD160 (highlight-4.1.tar.bz2) = caaf0be6515db2e4d98f1cf7648f219875c97a8e +SHA512 (highlight-4.1.tar.bz2) = 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731 +Size (highlight-4.1.tar.bz2) = 1469115 bytes SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e -SHA1 (patch-makefile) = 5a5ca6f18ee7d597191729ad2fc6ad5c23980250 +SHA1 (patch-makefile) = 916b0ff8cebb34039ea869681f78a2bfd46bb837 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_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8 SHA1 (patch-src_makefile) = 9d5d4db4c6bf7d1e13544011c569486e68d8de24 Index: pkgsrc/textproc/libhighlight/patches/patch-makefile diff -u pkgsrc/textproc/libhighlight/patches/patch-makefile:1.5 pkgsrc/textproc/libhighlight/patches/patch-makefile:1.6 --- pkgsrc/textproc/libhighlight/patches/patch-makefile:1.5 Fri Jan 1 19:41:37 2021 +++ pkgsrc/textproc/libhighlight/patches/patch-makefile Thu May 13 14:06:10 2021 @@ -1,8 +1,8 @@ -$NetBSD: patch-makefile,v 1.5 2021/01/01 19:41:37 schmonz Exp $ +$NetBSD: patch-makefile,v 1.6 2021/05/13 14:06:10 schmonz Exp $ Use pkgsrc-provided paths and tools. ---- makefile.orig 2020-12-21 10:56:19.000000000 +0000 +--- makefile.orig 2021-05-10 17:47:34.000000000 +0000 +++ makefile @@ -7,7 +7,7 @@ DESTDIR = @@ -48,7 +48,7 @@ Use pkgsrc-provided paths and tools. all cli: ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} -@@ -86,19 +86,12 @@ install: +@@ -82,19 +82,12 @@ install: ${DESTDIR}${data_dir}themes/base16 \ ${DESTDIR}${data_dir}langDefs \ ${DESTDIR}${data_dir}plugins @@ -68,7 +68,7 @@ Use pkgsrc-provided paths and tools. ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir} ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir} -@@ -118,15 +111,27 @@ install: +@@ -111,15 +104,27 @@ install: ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir} ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir} @@ -77,7 +77,7 @@ Use pkgsrc-provided paths and tools. @echo @echo "Done." - @echo "Type highlight --help or man highlight for instructions." - @echo "Take a look at ${DESTDIR}${examples_dir} for web plugins, SWIG and TCL bindings." + @echo "Take a look at ${DESTDIR}${examples_dir} for scripts, SWIG and TCL bindings." + @echo "Execute 'make install-cli' to install the highlight CLI ('make cli')." @echo "Execute 'make install-gui' to install the highlight GUI ('make gui')." @echo "Do not hesitate to report problems. Unknown bugs are hard to fix." @@ -98,7 +98,7 @@ Use pkgsrc-provided paths and tools. install-gui: @echo "Installing files for the GUI..." ${MKDIR} ${DESTDIR}${data_dir} \ -@@ -148,8 +153,8 @@ uninstall: +@@ -141,8 +146,8 @@ uninstall: ${RMDIR} ${DESTDIR}${doc_dir} ${RMDIR} ${DESTDIR}${conf_dir} ${RMDIR} ${DESTDIR}${examples_dir} Index: pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp diff -u pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp:1.3 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp:1.4 --- pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp:1.3 Tue May 21 21:56:57 2019 +++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp Thu May 13 14:06:10 2021 @@ -1,15 +1,14 @@ -$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.3 2019/05/21 21:56:57 schmonz Exp $ +$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.4 2021/05/13 14:06:10 schmonz Exp $ Use X11 on Darwin, like everywhere else. ---- src/gui-qt/mainwindow.cpp.orig 2019-05-17 19:04:13.000000000 +0000 +--- src/gui-qt/mainwindow.cpp.orig 2021-05-10 17:47:34.000000000 +0000 +++ src/gui-qt/mainwindow.cpp -@@ -36,6 +36,8 @@ along with Highlight. If not, see - #endif --_----------=_1620914770259960--