CVS commit: pkgsrc/textproc/libhighlight

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Feb 12 19:46:12 UTC 2019

Modified Files:
        pkgsrc/textproc/libhighlight: Makefile.common PLIST distinfo
        pkgsrc/textproc/libhighlight/patches: patch-src_gui-qt_mainwindow.cpp

Log Message:
Update to 3.49. From the changelog:

 - fixed more problems with syntax test indicators reporting wrong states
   (https://gitlab.com/saalen/highlight/issues/102)
 - added support for Meson, Solidity, TOML and Terraform
 - improved Perl and Yaml highlighting
 - added Categories field to all config files
 - CLI: added category info in --list-scripts output
 - CLI: added --list-cat option (https://gitlab.com/saalen/highlight/issues/99)
 - CLI: added optional topic parameter to --help
 - GUI: added theme category selection
 - GUI: display categories of selected syntax or theme


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/libhighlight/Makefile.common \
    pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.

Modified files:

Index: pkgsrc/textproc/libhighlight/Makefile.common
diff -u pkgsrc/textproc/libhighlight/Makefile.common:1.5 pkgsrc/textproc/libhighlight/Makefile.common:1.6
--- pkgsrc/textproc/libhighlight/Makefile.common:1.5    Sun Dec 16 07:04:32 2018
+++ pkgsrc/textproc/libhighlight/Makefile.common        Tue Feb 12 19:46:12 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.5 2018/12/16 07:04:32 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.6 2019/02/12 19:46:12 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               3.48
+VERSION=               3.49
 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.5 pkgsrc/textproc/libhighlight/PLIST:1.6
--- pkgsrc/textproc/libhighlight/PLIST:1.5      Sun Oct 14 12:17:50 2018
+++ pkgsrc/textproc/libhighlight/PLIST  Tue Feb 12 19:46:12 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2018/10/14 12:17:50 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/02/12 19:46:12 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -115,6 +115,7 @@ share/highlight/langDefs/csharp.lang
 share/highlight/langDefs/css.lang
 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/dts.lang
@@ -124,6 +125,7 @@ share/highlight/langDefs/ebnf2.lang
 share/highlight/langDefs/eiffel.lang
 share/highlight/langDefs/elixir.lang
 share/highlight/langDefs/email.lang
+share/highlight/langDefs/erb.lang
 share/highlight/langDefs/erlang.lang
 share/highlight/langDefs/euphoria.lang
 share/highlight/langDefs/excel.lang
@@ -183,6 +185,7 @@ share/highlight/langDefs/matlab.lang
 share/highlight/langDefs/maya.lang
 share/highlight/langDefs/md.lang
 share/highlight/langDefs/mercury.lang
+share/highlight/langDefs/meson.lang
 share/highlight/langDefs/miranda.lang
 share/highlight/langDefs/mod2.lang
 share/highlight/langDefs/mod3.lang
@@ -255,6 +258,7 @@ share/highlight/langDefs/smalltalk.lang
 share/highlight/langDefs/sml.lang
 share/highlight/langDefs/snmp.lang
 share/highlight/langDefs/snobol.lang
+share/highlight/langDefs/solidity.lang
 share/highlight/langDefs/spec.lang
 share/highlight/langDefs/spn.lang
 share/highlight/langDefs/sql.lang
@@ -265,7 +269,9 @@ share/highlight/langDefs/swift.lang
 share/highlight/langDefs/sybase.lang
 share/highlight/langDefs/tcl.lang
 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

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.7 pkgsrc/textproc/libhighlight/distinfo:1.8
--- pkgsrc/textproc/libhighlight/distinfo:1.7   Sun Dec 16 07:04:32 2018
+++ pkgsrc/textproc/libhighlight/distinfo       Tue Feb 12 19:46:12 2019
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.7 2018/12/16 07:04:32 schmonz Exp $
+$NetBSD: distinfo,v 1.8 2019/02/12 19:46:12 schmonz Exp $
 
-SHA1 (highlight-3.48.tar.bz2) = b04dc11c7ec2ed3bcb93cb4fe01a26930d984b4e
-RMD160 (highlight-3.48.tar.bz2) = b36dbf2deb4e86f52b7a970912c50a1d0a10845d
-SHA512 (highlight-3.48.tar.bz2) = b6508c3f0ed108126d07690b3ea878ac68814ae15ae3986096b2325f90d997bf467f2b3eeaa89da4feb2b8b39393a44e2ee0b89dc4584a7a7d4ca57475397451
-Size (highlight-3.48.tar.bz2) = 1360467 bytes
+SHA1 (highlight-3.49.tar.bz2) = de80b3aa0421ae0d6a5e00a2a81ce08f0dcdcb5a
+RMD160 (highlight-3.49.tar.bz2) = 515716e9d1155fe9df28e445985329dfbf277a05
+SHA512 (highlight-3.49.tar.bz2) = 81223c11b7b518b5b289622afadb0f2660898f74342b96f3e03f8bd3ac88d2f9b816efe0dffcc58323417d8a47b112053c16bd5f83475e6908ab228ee3cf81b0
+Size (highlight-3.49.tar.bz2) = 1364886 bytes
 SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
 SHA1 (patch-makefile) = e2a251415fffd38c2ebf73f1e7b57698a6f3f11e
 SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
-SHA1 (patch-src_gui-qt_mainwindow.cpp) = d073a80a1d853f9cc2bbedf7a402125ec7a994d2
+SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8688f68e4dd64ccab2df577262baa2579040505a
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
 SHA1 (patch-src_makefile) = 9aea185beddf4fce63100892d63053f8bd98a26e

Index: pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp:1.1 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp:1.2
--- pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp:1.1    Fri Jul 27 07:39:12 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp        Tue Feb 12 19:46:12 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.1 2018/07/27 07:39:12 schmonz Exp $
+$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.2 2019/02/12 19:46:12 schmonz Exp $
 
 Use X11 on Darwin, like everywhere else.
 
---- src/gui-qt/mainwindow.cpp.orig     2018-07-19 17:57:22.000000000 +0000
+--- src/gui-qt/mainwindow.cpp.orig     2019-02-06 20:21:57.000000000 +0000
 +++ src/gui-qt/mainwindow.cpp
 @@ -36,6 +36,8 @@ along with Highlight.  If not, see <http
  #include "io_report.h"
@@ -10,6 +10,6 @@ Use X11 on Darwin, like everywhere else.
  
 +#undef Q_OS_OSX
 +
+ //#include <QDebug>
+ 
  MainWindow::MainWindow(QWidget *parent)
-     : QMainWindow(parent), ui(new Ui::MainWindowClass), themesClassicIdx(0), themesBase16Idx(0), getDataFromCP(false)
- {