diff options
author | schmonz <schmonz@pkgsrc.org> | 2019-05-21 21:56:57 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2019-05-21 21:56:57 +0000 |
commit | b44d6f456a4107413332fafdc9e2044b7bbd0593 (patch) | |
tree | 480fc23047896925e052c3097472f5caec4caf3d | |
parent | ba32b134cf497b4764cd5e37f33a3d87d713ab2f (diff) | |
download | pkgsrc-b44d6f456a4107413332fafdc9e2044b7bbd0593.tar.gz |
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
-rw-r--r-- | textproc/highlight/Makefile | 3 | ||||
-rw-r--r-- | textproc/libhighlight/Makefile | 4 | ||||
-rw-r--r-- | textproc/libhighlight/Makefile.common | 4 | ||||
-rw-r--r-- | textproc/libhighlight/PLIST | 4 | ||||
-rw-r--r-- | textproc/libhighlight/distinfo | 12 | ||||
-rw-r--r-- | textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp | 10 | ||||
-rw-r--r-- | textproc/py-libxslt/Makefile | 4 |
7 files changed, 21 insertions, 20 deletions
diff --git a/textproc/highlight/Makefile b/textproc/highlight/Makefile index 08ba2167680..c66124ddaa2 100644 --- a/textproc/highlight/Makefile +++ b/textproc/highlight/Makefile @@ -1,6 +1,5 @@ -# $NetBSD: Makefile,v 1.19 2019/04/03 00:33:09 ryoon Exp $ +# $NetBSD: Makefile,v 1.20 2019/05/21 21:56:57 schmonz Exp $ -PKGREVISION= 1 .include "../../textproc/libhighlight/Makefile.common" MANCOMPRESSED= yes diff --git a/textproc/libhighlight/Makefile b/textproc/libhighlight/Makefile index 10412aeb258..87b28845305 100644 --- a/textproc/libhighlight/Makefile +++ b/textproc/libhighlight/Makefile @@ -1,12 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2018/05/03 13:13:51 schmonz Exp $ +# $NetBSD: Makefile,v 1.3 2019/05/21 21:56:57 schmonz Exp $ .include "../../textproc/libhighlight/Makefile.common" PKGNAME= libhighlight-${VERSION} COMMENT+= (shared library) -USE_LIBTOOL= yes - BUILD_TARGET= lib-shared EGDIR= ${PREFIX}/share/examples/highlight diff --git a/textproc/libhighlight/Makefile.common b/textproc/libhighlight/Makefile.common index aa750f69fc2..82044843b07 100644 --- a/textproc/libhighlight/Makefile.common +++ b/textproc/libhighlight/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.8 2019/04/26 12:44:43 roy Exp $ +# $NetBSD: Makefile.common,v 1.9 2019/05/21 21:56:57 schmonz Exp $ # used by textproc/highlight/Makefile # used by textproc/libhighlight/Makefile # used by textproc/p5-highlight/Makefile DISTNAME= highlight-${VERSION} -VERSION= 3.50 +VERSION= 3.51 CATEGORIES= textproc MASTER_SITES= http://www.andre-simon.de/zip/ EXTRACT_SUFX= .tar.bz2 diff --git a/textproc/libhighlight/PLIST b/textproc/libhighlight/PLIST index fe9e5970b59..c311ebc3e5b 100644 --- a/textproc/libhighlight/PLIST +++ b/textproc/libhighlight/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.7 2019/04/04 14:14:28 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.8 2019/05/21 21:56:57 schmonz Exp $ lib/libhighlight.la share/doc/highlight/AUTHORS share/doc/highlight/COPYING @@ -76,6 +76,7 @@ share/highlight/langDefs/arc.lang share/highlight/langDefs/arm.lang share/highlight/langDefs/as400cl.lang share/highlight/langDefs/ascend.lang +share/highlight/langDefs/asciidoc.lang share/highlight/langDefs/asp.lang share/highlight/langDefs/aspect.lang share/highlight/langDefs/assembler.lang @@ -129,6 +130,7 @@ share/highlight/langDefs/email.lang share/highlight/langDefs/erb.lang share/highlight/langDefs/erlang.lang share/highlight/langDefs/euphoria.lang +share/highlight/langDefs/exapunks.lang share/highlight/langDefs/excel.lang share/highlight/langDefs/express.lang share/highlight/langDefs/fame.lang diff --git a/textproc/libhighlight/distinfo b/textproc/libhighlight/distinfo index 2700b848ea5..26e3bbd205c 100644 --- a/textproc/libhighlight/distinfo +++ b/textproc/libhighlight/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.9 2019/04/04 14:14:28 schmonz Exp $ +$NetBSD: distinfo,v 1.10 2019/05/21 21:56:57 schmonz Exp $ -SHA1 (highlight-3.50.tar.bz2) = 8499963717f9d1e639b2689f6775ffd5f0aacbb4 -RMD160 (highlight-3.50.tar.bz2) = 8c273ee95c1778fcdb51e17472bc4fbb0d0ff188 -SHA512 (highlight-3.50.tar.bz2) = 1911a29fea6a157ff237276673acf0ae2b5a931ad7beeacf26a67970fc5ec66abf6dc64ff1694bf0cf68414c29f597625700943da772823a025f7a139d606c3d -Size (highlight-3.50.tar.bz2) = 1386968 bytes +SHA1 (highlight-3.51.tar.bz2) = dd0026bd404f46eeb3c17636e139a8ef09598039 +RMD160 (highlight-3.51.tar.bz2) = 2b1f6ae13a4ed4e3e76799f4c9fbfa3d8340053e +SHA512 (highlight-3.51.tar.bz2) = 899f8bb735c061c3561250d2747df3e7a5776a8fd54dfb073a48b4f709732a92c906b0f2b95cb717bfc2fe71fc99d4b5b3e6e9e4983048e1a23409895fa8b87d +Size (highlight-3.51.tar.bz2) = 1396851 bytes SHA1 (patch-extras_swig_makefile) = 2bb62f7519cd5baed60b1af5f606ce22444c346f SHA1 (patch-makefile) = c9c15d82c826b8d0b99b59dedf0fb43b4eb9c063 SHA1 (patch-src_core_platform__fs.cpp) = 2f95652e616026b435ff369e59fbc2fc67a613a0 -SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8688f68e4dd64ccab2df577262baa2579040505a +SHA1 (patch-src_gui-qt_mainwindow.cpp) = 977c34f85929bcd2a008d91dac812e44e63afb62 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8 SHA1 (patch-src_makefile) = d07c197a731f5a6197b55f4c8f12bd01ad11d544 diff --git a/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp b/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp index ec8779b4c74..bfa4b9cad56 100644 --- a/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp +++ b/textproc/libhighlight/patches/patch-src_gui-qt_mainwindow.cpp @@ -1,8 +1,8 @@ -$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.2 2019/02/12 19:46:12 schmonz Exp $ +$NetBSD: patch-src_gui-qt_mainwindow.cpp,v 1.3 2019/05/21 21:56:57 schmonz Exp $ Use X11 on Darwin, like everywhere else. ---- src/gui-qt/mainwindow.cpp.orig 2019-02-06 20:21:57.000000000 +0000 +--- src/gui-qt/mainwindow.cpp.orig 2019-05-17 19:04:13.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) + #ifdef Q_OS_WIN + #include <windows.h> + #endif diff --git a/textproc/py-libxslt/Makefile b/textproc/py-libxslt/Makefile index da8b83243a9..37f6a2e55bf 100644 --- a/textproc/py-libxslt/Makefile +++ b/textproc/py-libxslt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2019/03/19 17:25:40 prlw1 Exp $ +# $NetBSD: Makefile,v 1.55 2019/05/21 21:56:57 schmonz Exp $ .include "../../textproc/libxslt/Makefile.common" @@ -30,6 +30,8 @@ SUBST_SED.setup+= -e "s,@LIBXML2DIR@,${BUILDLINK_PREFIX.libxml2},g" SUBST_SED.setup+= -e "s,@LIBXSLTDIR@,${BUILDLINK_PREFIX.libxslt},g" SUBST_SED.setup+= -e "s,@PYSHLIBDIR@,${PYSITEDIR},g" +# BUILDLINK_TRANSFORM.Darwin+= opt:-bundle:-dynamiclib + post-extract: setuppy .PHONY: setuppy setuppy: |