Skip to content

Commit df80cf2

Browse files
committed
Update to 3.51. From the changelog:
- SVG output: added `white-space: pre` in styles - HTML output: replaced ' by ' (https://bugs.debian.org/927410) - HTML output: fixed index file format (missing close tags) - CLI: moved syntax recognition functions to DataDir class - CLI: added regular expressions and default false values to --verbose output - CLI: fixed `--list-cat` without `--list-scripts` (https://gitlab.com/saalen/highlight/issues/107) - CLI: added optional argument to `--base16` (https://gitlab.com/saalen/highlight/issues/113) - CLI: added default base16 themes (https://gitlab.com/saalen/highlight/issues/113) - CLI: added `--isolate` option (https://gitlab.com/saalen/highlight/issues/118) - GUI: improved UTF16 input path handling on Windows
1 parent 2f72b17 commit df80cf2

File tree

7 files changed

+21
-20
lines changed

7 files changed

+21
-20
lines changed

textproc/highlight/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# $NetBSD: Makefile,v 1.19 2019/04/03 00:33:09 ryoon Exp $
1+
# $NetBSD: Makefile,v 1.20 2019/05/21 21:56:57 schmonz Exp $
22

3-
PKGREVISION= 1
43
.include "../../textproc/libhighlight/Makefile.common"
54

65
MANCOMPRESSED= yes

textproc/libhighlight/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
# $NetBSD: Makefile,v 1.2 2018/05/03 13:13:51 schmonz Exp $
1+
# $NetBSD: Makefile,v 1.3 2019/05/21 21:56:57 schmonz Exp $
22

33
.include "../../textproc/libhighlight/Makefile.common"
44

55
PKGNAME= libhighlight-${VERSION}
66
COMMENT+= (shared library)
77

8-
USE_LIBTOOL= yes
9-
108
BUILD_TARGET= lib-shared
119

1210
EGDIR= ${PREFIX}/share/examples/highlight

textproc/libhighlight/Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# $NetBSD: Makefile.common,v 1.8 2019/04/26 12:44:43 roy Exp $
1+
# $NetBSD: Makefile.common,v 1.9 2019/05/21 21:56:57 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.50
7+
VERSION= 3.51
88
CATEGORIES= textproc
99
MASTER_SITES= http://www.andre-simon.de/zip/
1010
EXTRACT_SUFX= .tar.bz2

textproc/libhighlight/PLIST

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.7 2019/04/04 14:14:28 schmonz Exp $
1+
@comment $NetBSD: PLIST,v 1.8 2019/05/21 21:56:57 schmonz Exp $
22
lib/libhighlight.la
33
share/doc/highlight/AUTHORS
44
share/doc/highlight/COPYING
@@ -76,6 +76,7 @@ share/highlight/langDefs/arc.lang
7676
share/highlight/langDefs/arm.lang
7777
share/highlight/langDefs/as400cl.lang
7878
share/highlight/langDefs/ascend.lang
79+
share/highlight/langDefs/asciidoc.lang
7980
share/highlight/langDefs/asp.lang
8081
share/highlight/langDefs/aspect.lang
8182
share/highlight/langDefs/assembler.lang
@@ -129,6 +130,7 @@ share/highlight/langDefs/email.lang
129130
share/highlight/langDefs/erb.lang
130131
share/highlight/langDefs/erlang.lang
131132
share/highlight/langDefs/euphoria.lang
133+
share/highlight/langDefs/exapunks.lang
132134
share/highlight/langDefs/excel.lang
133135
share/highlight/langDefs/express.lang
134136
share/highlight/langDefs/fame.lang

textproc/libhighlight/distinfo

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
$NetBSD: distinfo,v 1.9 2019/04/04 14:14:28 schmonz Exp $
1+
$NetBSD: distinfo,v 1.10 2019/05/21 21:56:57 schmonz Exp $
22

3-
SHA1 (highlight-3.50.tar.bz2) = 8499963717f9d1e639b2689f6775ffd5f0aacbb4
4-
RMD160 (highlight-3.50.tar.bz2) = 8c273ee95c1778fcdb51e17472bc4fbb0d0ff188
5-
SHA512 (highlight-3.50.tar.bz2) = 1911a29fea6a157ff237276673acf0ae2b5a931ad7beeacf26a67970fc5ec66abf6dc64ff1694bf0cf68414c29f597625700943da772823a025f7a139d606c3d
6-
Size (highlight-3.50.tar.bz2) = 1386968 bytes
3+
SHA1 (highlight-3.51.tar.bz2) = dd0026bd404f46eeb3c17636e139a8ef09598039
4+
RMD160 (highlight-3.51.tar.bz2) = 2b1f6ae13a4ed4e3e76799f4c9fbfa3d8340053e
5+
SHA512 (highlight-3.51.tar.bz2) = 899f8bb735c061c3561250d2747df3e7a5776a8fd54dfb073a48b4f709732a92c906b0f2b95cb717bfc2fe71fc99d4b5b3e6e9e4983048e1a23409895fa8b87d
6+
Size (highlight-3.51.tar.bz2) = 1396851 bytes
77
SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f
88
SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063
99
SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0
10-
SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8688f68e4dd64ccab2df577262baa2579040505a
10+
SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62
1111
SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
1212
SHA1 (patch-src_makefile) = d07c197a731f5a6197b55f4c8f12bd01ad11d544
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.2 2019/02/12 19:46:12 schmonz Exp $
1+
$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.3 2019/05/21 21:56:57 schmonz Exp $
22

33
Use X11 on Darwin, like everywhere else.
44

5-
--- src/gui-qt/mainwindow.cpp.orig 2019-02-06 20:21:57.000000000 +0000
5+
--- src/gui-qt/mainwindow.cpp.orig 2019-05-17 19:04:13.000000000 +0000
66
+++ src/gui-qt/mainwindow.cpp
77
@@ -36,6 +36,8 @@ along with Highlight. If not, see <http
88
#include "io_report.h"
99
#include "syntax_chooser.h"
1010

1111
+#undef Q_OS_OSX
1212
+
13-
//#include <QDebug>
14-
15-
MainWindow::MainWindow(QWidget *parent)
13+
#ifdef Q_OS_WIN
14+
#include <windows.h>
15+
#endif

textproc/py-libxslt/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: Makefile,v 1.54 2019/03/19 17:25:40 prlw1 Exp $
1+
# $NetBSD: Makefile,v 1.55 2019/05/21 21:56:57 schmonz Exp $
22

33
.include "../../textproc/libxslt/Makefile.common"
44

@@ -30,6 +30,8 @@ SUBST_SED.setup+= -e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g"
3030
SUBST_SED.setup+= -e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g"
3131
SUBST_SED.setup+= -e "s,@PYSHLIBDIR@,${PYSITEDIR},g"
3232

33+
# BUILDLINK_TRANSFORM.Darwin+= opt:-bundle:-dynamiclib
34+
3335
post-extract: setuppy
3436
.PHONY: setuppy
3537
setuppy:

0 commit comments

Comments
 (0)