Skip to content

Commit f50a7c6

Browse files
schmonzschmonz
committed
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
1 parent b1c9e94 commit f50a7c6

File tree

5 files changed

+21
-26
lines changed

5 files changed

+21
-26
lines changed

‎textproc/libhighlight/Makefile.common

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# $NetBSD: Makefile.common,v 1.3 2018/10/08 13:51:28 schmonz Exp $
1+
# $NetBSD: Makefile.common,v 1.4 2018/10/14 12:17:50 schmonz Exp $
22
# used by textproc/highlight/Makefile
33
# used by textproc/libhighlight/Makefile
44
# used by textproc/p5-highlight/Makefile
55

66
DISTNAME= highlight-${VERSION}
7-
VERSION= 3.46
7+
VERSION= 3.47
88
CATEGORIES= textproc
99
MASTER_SITES= http://www.andre-simon.de/zip/
1010
EXTRACT_SUFX= .tar.bz2

‎textproc/libhighlight/PLIST

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@comment $NetBSD: PLIST,v 1.4 2018/10/08 13:51:28 schmonz Exp $
1+
@comment $NetBSD: PLIST,v 1.5 2018/10/14 12:17:50 schmonz Exp $
22
lib/libhighlight.la
33
share/doc/highlight/AUTHORS
44
share/doc/highlight/COPYING
5-
share/doc/highlight/ChangeLog
5+
share/doc/highlight/ChangeLog.adoc
66
share/doc/highlight/INSTALL
77
share/doc/highlight/README.adoc
88
share/doc/highlight/README_DE.adoc
@@ -451,6 +451,7 @@ share/highlight/themes/dante.theme
451451
share/highlight/themes/darkblue.theme
452452
share/highlight/themes/darkbone.theme
453453
share/highlight/themes/darkness.theme
454+
share/highlight/themes/darkplus.theme
454455
share/highlight/themes/darkslategray.theme
455456
share/highlight/themes/darkspectrum.theme
456457
share/highlight/themes/denim.theme

‎textproc/libhighlight/distinfo

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
$NetBSD: distinfo,v 1.5 2018/10/08 13:51:28 schmonz Exp $
1+
$NetBSD: distinfo,v 1.6 2018/10/14 12:17:50 schmonz Exp $
22

3-
SHA1 (highlight-3.46.tar.bz2) = db29dc697641cb154c97cee9c448ea3168a135d2
4-
RMD160 (highlight-3.46.tar.bz2) = 7f334d85ec0897ae44f471d36496d48f003412ed
5-
SHA512 (highlight-3.46.tar.bz2) = 1359a428fcd624ae85e939a5a8a991c2f10114c106ddac359e68e7eefadcacad92fbc98866f37ec9654268852a4cfcf595a0ae7f99acd5d75902b5dea235936a
6-
Size (highlight-3.46.tar.bz2) = 1341849 bytes
3+
SHA1 (highlight-3.47.tar.bz2) = 8a420055155740e52f3f67e86185d188e8d87ca1
4+
RMD160 (highlight-3.47.tar.bz2) = e485291fbc0039d3d1046dcfecab21cc2c9b6fff
5+
SHA512 (highlight-3.47.tar.bz2) = 286dcc0db33c8b250852f7b607eb313afbd83da7ead6bde8a35ed5b7f59438b0345725a31dd5969347af10aba0c981f6bf2ce5683b801c45ee27b2b3c6ed21ed
6+
Size (highlight-3.47.tar.bz2) = 1360358 bytes
77
SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
88
SHA1 (patch-makefile) = e2a251415fffd38c2ebf73f1e7b57698a6f3f11e
9-
SHA1 (patch-src_core_platform__fs.cpp) = 65b7f4b665b820eec4b835474bd308e49080526e
9+
SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
1010
SHA1 (patch-src_gui-qt_mainwindow.cpp) = d073a80a1d853f9cc2bbedf7a402125ec7a994d2
1111
SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
12-
SHA1 (patch-src_makefile) = 41fd190b19a02b019e50eb8e1e49d90188cff0f1
12+
SHA1 (patch-src_makefile) = 9aea185beddf4fce63100892d63053f8bd98a26e

‎textproc/libhighlight/patches/patch-src_core_platform__fs.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
$NetBSD: patch-src_core_platform__fs.cpp,v 1.1 2018/05/03 13:13:51 schmonz Exp $
1+
$NetBSD: patch-src_core_platform__fs.cpp,v 1.2 2018/10/14 12:17:50 schmonz Exp $
22

33
Fix build on (at least) SmartOS.
44

5-
--- src/core/platform_fs.cpp.orig 2018-01-20 20:42:17.000000000 +0000
5+
--- src/core/platform_fs.cpp.orig 2018-10-13 19:26:45.000000000 +0000
66
+++ src/core/platform_fs.cpp
7-
@@ -72,13 +72,13 @@ std::string getHomePath()
8-
#include <pwd.h>
7+
@@ -79,13 +79,13 @@ int isColorEscCapable() {
8+
99
const char pathSeparator = '/';
1010

1111
-std::string getAppPath()

‎textproc/libhighlight/patches/patch-src_makefile

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$NetBSD: patch-src_makefile,v 1.3 2018/10/08 13:51:28 schmonz Exp $
1+
$NetBSD: patch-src_makefile,v 1.4 2018/10/14 12:17:50 schmonz Exp $
22

33
Use pkgsrc-specified compiler and flags.
44

5-
--- src/makefile.orig 2018-10-07 09:31:45.000000000 +0000
5+
--- src/makefile.orig 2018-10-13 19:26:45.000000000 +0000
66
+++ src/makefile
7-
@@ -13,19 +13,20 @@
7+
@@ -13,13 +13,13 @@
88
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
99

1010
#CXX=clang++
@@ -20,14 +20,7 @@ Use pkgsrc-specified compiler and flags.
2020
#CFLAGS:=-ggdb ${CFLAGS} -std=c++11
2121

2222
CFLAGS_DILU=-fno-strict-aliasing
23-
24-
SO_VERSION=3.45
25-
26-
+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
27-
28-
# Source paths
29-
CORE_DIR=./core/
30-
@@ -66,14 +67,16 @@ ifdef PIC
23+
@@ -66,14 +66,17 @@ ifdef PIC
3124
CFLAGS+=-fPIC
3225
endif
3326

@@ -40,6 +33,7 @@ Use pkgsrc-specified compiler and flags.
4033
#LDFLAGS= -Wl,--as-needed
4134

4235
-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
36+
+LSO_VERSION=$(shell echo ${SO_VERSION} | awk -F. '{ printf "%d:%d:0\n", $$1 - 1, $$2 }')
4337
+LIBTOOL=libtool --tag=CXX
4438
+
4539
+CXX_COMPILE=${LIBTOOL} --mode=compile ${CXX} ${CFLAGS} ${CXX_DIR} -I ${INCLUDE_DIR} ${LUA_CFLAGS} -c

0 commit comments

Comments
 (0)