CVS commit: pkgsrc/textproc/libhighlight

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Oct 14 12:17:50 UTC 2018

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

Log Message:
Update to 3.47. From the changelog:

- fixed xterm256 and truecolor whitespace output #2
  (https://gitlab.com/saalen/highlight/issues/90)
- fixed LaTeX, TeX, SVG and ODT whitespace output (regression of 3.45)
- added darkplus theme (https://gitlab.com/saalen/highlight/merge_requests/84)
- converted ChangeLog to AsciiDoc
- allowed state test indicators to match both whitespace (ws) and the
  enclosing state (others)
- CLI: default output changed to xterm256 or truecolor if run in a
  terminal with color support and only a single file is outputted
- GUI: added checkbox in the clipboard tab to output selected lines only


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/libhighlight/Makefile.common
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/textproc/libhighlight/patches/patch-src_makefile

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.3 pkgsrc/textproc/libhighlight/Makefile.common:1.4
--- pkgsrc/textproc/libhighlight/Makefile.common:1.3    Mon Oct  8 13:51:28 2018
+++ pkgsrc/textproc/libhighlight/Makefile.common        Sun Oct 14 12:17:50 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.3 2018/10/08 13:51:28 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.4 2018/10/14 12:17:50 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               3.46
+VERSION=               3.47
 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.4 pkgsrc/textproc/libhighlight/PLIST:1.5
--- pkgsrc/textproc/libhighlight/PLIST:1.4      Mon Oct  8 13:51:28 2018
+++ pkgsrc/textproc/libhighlight/PLIST  Sun Oct 14 12:17:50 2018
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2018/10/08 13:51:28 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/10/14 12:17:50 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
-share/doc/highlight/ChangeLog
+share/doc/highlight/ChangeLog.adoc
 share/doc/highlight/INSTALL
 share/doc/highlight/README.adoc
 share/doc/highlight/README_DE.adoc
@@ -451,6 +451,7 @@ share/highlight/themes/dante.theme
 share/highlight/themes/darkblue.theme
 share/highlight/themes/darkbone.theme
 share/highlight/themes/darkness.theme
+share/highlight/themes/darkplus.theme
 share/highlight/themes/darkslategray.theme
 share/highlight/themes/darkspectrum.theme
 share/highlight/themes/denim.theme

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.5 pkgsrc/textproc/libhighlight/distinfo:1.6
--- pkgsrc/textproc/libhighlight/distinfo:1.5   Mon Oct  8 13:51:28 2018
+++ pkgsrc/textproc/libhighlight/distinfo       Sun Oct 14 12:17:50 2018
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2018/10/08 13:51:28 schmonz Exp $
+$NetBSD: distinfo,v 1.6 2018/10/14 12:17:50 schmonz Exp $
 
-SHA1 (highlight-3.46.tar.bz2) = db29dc697641cb154c97cee9c448ea3168a135d2
-RMD160 (highlight-3.46.tar.bz2) = 7f334d85ec0897ae44f471d36496d48f003412ed
-SHA512 (highlight-3.46.tar.bz2) = 1359a428fcd624ae85e939a5a8a991c2f10114c106ddac359e68e7eefadcacad92fbc98866f37ec9654268852a4cfcf595a0ae7f99acd5d75902b5dea235936a
-Size (highlight-3.46.tar.bz2) = 1341849 bytes
+SHA1 (highlight-3.47.tar.bz2) = 8a420055155740e52f3f67e86185d188e8d87ca1
+RMD160 (highlight-3.47.tar.bz2) = e485291fbc0039d3d1046dcfecab21cc2c9b6fff
+SHA512 (highlight-3.47.tar.bz2) = 286dcc0db33c8b250852f7b607eb313afbd83da7ead6bde8a35ed5b7f59438b0345725a31dd5969347af10aba0c981f6bf2ce5683b801c45ee27b2b3c6ed21ed
+Size (highlight-3.47.tar.bz2) = 1360358 bytes
 SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
 SHA1 (patch-makefile) = e2a251415fffd38c2ebf73f1e7b57698a6f3f11e
-SHA1 (patch-src_core_platform__fs.cpp) = 65b7f4b665b820eec4b835474bd308e49080526e
+SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = d073a80a1d853f9cc2bbedf7a402125ec7a994d2
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = 41fd190b19a02b019e50eb8e1e49d90188cff0f1
+SHA1 (patch-src_makefile) = 9aea185beddf4fce63100892d63053f8bd98a26e

Index: pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.1 pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.2
--- pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.1    Thu May  3 13:13:51 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp        Sun Oct 14 12:17:50 2018
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_core_platform__fs.cpp,v 1.1 2018/05/03 13:13:51 schmonz Exp $
+$NetBSD: patch-src_core_platform__fs.cpp,v 1.2 2018/10/14 12:17:50 schmonz Exp $
 
 Fix build on (at least) SmartOS.
 
---- src/core/platform_fs.cpp.orig      2018-01-20 20:42:17.000000000 +0000
+--- src/core/platform_fs.cpp.orig      2018-10-13 19:26:45.000000000 +0000
 +++ src/core/platform_fs.cpp
-@@ -72,13 +72,13 @@ std::string getHomePath()
- #include <pwd.h>
+@@ -79,13 +79,13 @@ int isColorEscCapable() {
+ 
  const char pathSeparator = '/';
  
 -std::string getAppPath()

Index: pkgsrc/textproc/libhighlight/patches/patch-src_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.3 pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.4
--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.3 Mon Oct  8 13:51:28 2018
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile     Sun Oct 14 12:17:50 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_makefile,v 1.3 2018/10/08 13:51:28 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.4 2018/10/14 12:17:50 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig  2018-10-07 09:31:45.000000000 +0000
+--- src/makefile.orig  2018-10-13 19:26:45.000000000 +0000
 +++ src/makefile
-@@ -13,19 +13,20 @@
+@@ -13,13 +13,13 @@
  # See src/gui-qt/highlight.pro for the Qt GUI compilation options
  
  #CXX=clang++
@@ -20,14 +20,7 @@ Use pkgsrc-specified compiler and flags.
  #CFLAGS:=-ggdb ${CFLAGS} -std=c++11
  
  CFLAGS_DILU=-fno-strict-aliasing
- 
- SO_VERSION=3.45
- 
-+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
- 
- # Source paths
- CORE_DIR=./core/
-@@ -66,14 +67,16 @@ ifdef PIC
+@@ -66,14 +66,17 @@ ifdef PIC
        CFLAGS+=-fPIC
  endif
  
@@ -40,6 +33,7 @@ Use pkgsrc-specified compiler and flags.
  #LDFLAGS= -Wl,--as-needed
  
 -CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
++LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
 +LIBTOOL=libtool --tag=CXX
 +
 +CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c