CVS commit: pkgsrc/textproc/libhighlight

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/textproc/libhighlight
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Wed, 13 Jul 2022 00:52:31 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jul 13 00:52:31 UTC 2022

Modified Files:
        pkgsrc/textproc/libhighlight: Makefile.common PLIST buildlink3.mk
            distinfo
        pkgsrc/textproc/libhighlight/patches: patch-makefile
            patch-src_gui-qt_highlight.pro

Log Message:
Update to 4.2. From the changelog:

- added support for Critic markup
  (https://gitlab.com/saalen/highlight/-/issues/197)
- added support for jam/ham
  (https://gitlab.com/saalen/highlight/-/issues/196)
- added support for PureScript
  (https://gitlab.com/saalen/highlight/-/merge_requests/132/)
- added support for Nix
  (https://gitlab.com/saalen/highlight/-/issues/200)
- added ino file mapping / Arduino C
  (https://gitlab.com/saalen/highlight/-/issues/201)
- fixed RTF page color attributes
  (https://gitlab.com/saalen/highlight/-/issues/195)
- fixed identifier parsing in yaml.lang
  (https://gitlab.com/saalen/highlight/-/issues/190)
- fixed symbol parsing in lisp.lang
  https://gitlab.com/saalen/highlight/-/issues/198
- fixed string parsing in csharp.lang
  (https://gitlab.com/saalen/highlight/-/issues/199)
- fixed string parsing in conf.lang
  (https://gitlab.com/saalen/highlight/-/issues/203)
- added make target `install-lib-shared` to install shared lib
  (https://gitlab.com/saalen/highlight/-/issues/202)
- CLI W32: prevented automatic file pattern expansion
  (https://gitlab.com/saalen/highlight/-/issues/186)
- GUI: added Japanese translation (thanks to FunFun)
- GUI: disabled floating panel (state restore fails)


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/textproc/libhighlight/Makefile.common
cvs rdiff -u -r1.17 -r1.18 pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/libhighlight/buildlink3.mk
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/textproc/libhighlight/patches/patch-makefile
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro

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.19 pkgsrc/textproc/libhighlight/Makefile.common:1.20
--- pkgsrc/textproc/libhighlight/Makefile.common:1.19   Thu May 13 14:06:09 2021
+++ pkgsrc/textproc/libhighlight/Makefile.common        Wed Jul 13 00:52:30 2022
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.19 2021/05/13 14:06:09 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.20 2022/07/13 00:52:30 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               4.1
+VERSION=               4.2
 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.17 pkgsrc/textproc/libhighlight/PLIST:1.18
--- pkgsrc/textproc/libhighlight/PLIST:1.17     Thu May 13 14:06:09 2021
+++ pkgsrc/textproc/libhighlight/PLIST  Wed Jul 13 00:52:30 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2021/05/13 14:06:09 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.18 2022/07/13 00:52:30 schmonz Exp $
 lib/libhighlight.la
 share/doc/highlight/AUTHORS
 share/doc/highlight/COPYING
@@ -109,6 +109,7 @@ share/highlight/langDefs/cobol.lang
 share/highlight/langDefs/coffeescript.lang
 share/highlight/langDefs/coldfusion.lang
 share/highlight/langDefs/conf.lang
+share/highlight/langDefs/critic.lang
 share/highlight/langDefs/crk.lang
 share/highlight/langDefs/crystal.lang
 share/highlight/langDefs/cs_block_regex.lang
@@ -163,6 +164,7 @@ share/highlight/langDefs/ini.lang
 share/highlight/langDefs/innosetup.lang
 share/highlight/langDefs/interlis.lang
 share/highlight/langDefs/io.lang
+share/highlight/langDefs/jam.lang
 share/highlight/langDefs/jasmin.lang
 share/highlight/langDefs/java.lang
 share/highlight/langDefs/javascript.lang
@@ -208,6 +210,7 @@ share/highlight/langDefs/netrexx.lang
 share/highlight/langDefs/nginx.lang
 share/highlight/langDefs/nice.lang
 share/highlight/langDefs/nim.lang
+share/highlight/langDefs/nix.lang
 share/highlight/langDefs/nsis.lang
 share/highlight/langDefs/nxc.lang
 share/highlight/langDefs/oberon.lang
@@ -239,6 +242,7 @@ share/highlight/langDefs/ps.lang
 share/highlight/langDefs/psl.lang
 share/highlight/langDefs/pure.lang
 share/highlight/langDefs/purebasic.lang
+share/highlight/langDefs/purescript.lang
 share/highlight/langDefs/pyrex.lang
 share/highlight/langDefs/python.lang
 share/highlight/langDefs/q.lang

Index: pkgsrc/textproc/libhighlight/buildlink3.mk
diff -u pkgsrc/textproc/libhighlight/buildlink3.mk:1.4 pkgsrc/textproc/libhighlight/buildlink3.mk:1.5
--- pkgsrc/textproc/libhighlight/buildlink3.mk:1.4      Mon Nov  1 20:39:18 2021
+++ pkgsrc/textproc/libhighlight/buildlink3.mk  Wed Jul 13 00:52:30 2022
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.4 2021/11/01 20:39:18 schmonz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/07/13 00:52:30 schmonz Exp $
 
 BUILDLINK_TREE+=       libhighlight
 
 .if !defined(LIBHIGHLIGHT_BUILDLINK3_MK)
 LIBHIGHLIGHT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libhighlight+=   libhighlight>=4.1
+BUILDLINK_API_DEPENDS.libhighlight+=   libhighlight>=4.2
 BUILDLINK_PKGSRCDIR.libhighlight?=     ../../textproc/libhighlight
 .endif # LIBHIGHLIGHT_BUILDLINK3_MK
 

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.23 pkgsrc/textproc/libhighlight/distinfo:1.24
--- pkgsrc/textproc/libhighlight/distinfo:1.23  Tue Oct 26 11:22:15 2021
+++ pkgsrc/textproc/libhighlight/distinfo       Wed Jul 13 00:52:30 2022
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.23 2021/10/26 11:22:15 nia Exp $
+$NetBSD: distinfo,v 1.24 2022/07/13 00:52:30 schmonz Exp $
 
-BLAKE2s (highlight-4.1.tar.bz2) = ab465a3b46e72e956e414f3a67b5dd3b52e9bae66bf60a4804722520d7d96ce7
-SHA512 (highlight-4.1.tar.bz2) = 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
-Size (highlight-4.1.tar.bz2) = 1469115 bytes
+BLAKE2s (highlight-4.2.tar.bz2) = d1cdd84c7a1cd3c6bf10103cccc12e05dbff650357f6161feacc0870fe4c8ae5
+SHA512 (highlight-4.2.tar.bz2) = 6b9a193975c108bca4228188b8f3ddb395eb1cedd689b44fb18bfa7d4cb878cf6148b2275ef2881973fbd7e08b9038e866aad7c406e975fa3d1a59470b6a3867
+Size (highlight-4.2.tar.bz2) = 1479166 bytes
 SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
-SHA1 (patch-makefile) = 916b0ff8cebb34039ea869681f78a2bfd46bb837
+SHA1 (patch-makefile) = c1b34c7b16900a16a2c218e6b440036f9b48d53b
 SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
-SHA1 (patch-src_gui-qt_highlight.pro) = 3706eeb89207dd7c444ad5cf7db0b02a939dcb2f
+SHA1 (patch-src_gui-qt_highlight.pro) = 3976f5eba8c3e818c45453377644e003dc3d0744
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
 SHA1 (patch-src_makefile) = 9d5d4db4c6bf7d1e13544011c569486e68d8de24

Index: pkgsrc/textproc/libhighlight/patches/patch-makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-makefile:1.6 pkgsrc/textproc/libhighlight/patches/patch-makefile:1.7
--- pkgsrc/textproc/libhighlight/patches/patch-makefile:1.6     Thu May 13 14:06:10 2021
+++ pkgsrc/textproc/libhighlight/patches/patch-makefile Wed Jul 13 00:52:31 2022
@@ -1,8 +1,8 @@
-$NetBSD: patch-makefile,v 1.6 2021/05/13 14:06:10 schmonz Exp $
+$NetBSD: patch-makefile,v 1.7 2022/07/13 00:52:31 schmonz Exp $
 
 Use pkgsrc-provided paths and tools.
 
---- makefile.orig      2021-05-10 17:47:34.000000000 +0000
+--- makefile.orig      2022-03-22 20:58:01.000000000 +0000
 +++ makefile
 @@ -7,7 +7,7 @@
  DESTDIR =
@@ -13,8 +13,8 @@ Use pkgsrc-provided paths and tools.
  
  # Location of the highlight data files:
  data_dir = ${PREFIX}/share/highlight/
-@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
- bin_dir = ${PREFIX}/bin/
+@@ -19,7 +19,7 @@ bin_dir = ${PREFIX}/bin/
+ lib_dir = ${PREFIX}/lib/
  
  # Location of the highlight man pages:
 -man_dir = ${PREFIX}/share/man/
@@ -22,7 +22,7 @@ Use pkgsrc-provided paths and tools.
  
  # Location of the highlight documentation:
  doc_dir = ${PREFIX}/share/doc/highlight/
-@@ -25,8 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
+@@ -28,8 +28,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
  examples_dir = ${doc_dir}extras/
  
  # Location of the highlight config files:
@@ -33,7 +33,7 @@ Use pkgsrc-provided paths and tools.
  
  # Location of additional gui files
  desktop_apps = ${PREFIX}/share/applications/
-@@ -34,10 +34,10 @@ desktop_icons = ${PREFIX}/share/icons/hi
+@@ -37,10 +37,10 @@ desktop_icons = ${PREFIX}/share/icons/hi
  
  # Commands:
  GZIP=gzip -9f
@@ -48,7 +48,7 @@ Use pkgsrc-provided paths and tools.
  
  all cli:
        ${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -82,19 +82,12 @@ install:
+@@ -85,19 +85,12 @@ install:
                ${DESTDIR}${data_dir}themes/base16 \
                ${DESTDIR}${data_dir}langDefs \
                ${DESTDIR}${data_dir}plugins
@@ -68,7 +68,7 @@ Use pkgsrc-provided paths and tools.
  
        ${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
        ${INSTALL_DATA} ./README* ${DESTDIR}${doc_dir}
-@@ -111,15 +104,27 @@ install:
+@@ -114,15 +107,27 @@ install:
        ${INSTALL_DATA} ./extras/themes-resources/css-themes/* ${DESTDIR}${examples_dir}themes-resources/css-themes
        ${INSTALL_DATA} ./extras/highlight_pipe.* ${DESTDIR}${examples_dir}
        ${INSTALL_DATA} ./extras/*.py ${DESTDIR}${examples_dir}
@@ -98,7 +98,7 @@ Use pkgsrc-provided paths and tools.
  install-gui:
        @echo "Installing files for the GUI..."
        ${MKDIR} ${DESTDIR}${data_dir} \
-@@ -141,8 +146,8 @@ uninstall:
+@@ -147,8 +152,8 @@ uninstall:
        ${RMDIR} ${DESTDIR}${doc_dir}
        ${RMDIR} ${DESTDIR}${conf_dir}
        ${RMDIR} ${DESTDIR}${examples_dir}

Index: pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro:1.1 pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro:1.2
--- pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro:1.1     Fri Jan  1 19:41:37 2021
+++ pkgsrc/textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro Wed Jul 13 00:52:31 2022
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_gui-qt_highlight.pro,v 1.1 2021/01/01 19:41:37 schmonz Exp $
+$NetBSD: patch-src_gui-qt_highlight.pro,v 1.2 2022/07/13 00:52:31 schmonz Exp $
 
 Restore non-.app macOS build settings from 3.59.
 
---- src/gui-qt/highlight.pro.orig      2020-12-21 10:56:19.000000000 +0000
+--- src/gui-qt/highlight.pro.orig      2022-03-22 20:58:01.000000000 +0000
 +++ src/gui-qt/highlight.pro
 @@ -80,8 +80,11 @@ macx-clang {
      INCLUDEPATH += ../../include
-     INCLUDEPATH+=/usr/local/Cellar/boost/1.73.0/include
+     INCLUDEPATH+=/usr/local/Cellar/boost/1.76.0/include
  
 -    QMAKE_MACOSX_DEPLOYMENT_TARGET=10.13
 -    CONFIG += app_bundle

Prev by Date: Re: CVS commit: pkgsrc/mail/roundcube-plugin-carddav
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index