CVS commit: pkgsrc/textproc/libhighlight

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Aug 16 15:28:00 UTC 2024

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

Log Message:
libhighlight: update to 4.13. Changes:

- updated astyle lib to version 3.6
- added Gleam and V definitions
- added Meson and CMake build files
- improved LSP compatibility with bash-language-server and
  haskell-language-server
- applied several clang-tidy modernize fixes
- GUI: refactored settings retore code


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/libhighlight/Makefile.common
cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/libhighlight/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/textproc/libhighlight/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/libhighlight/patches/patch-src_core_syntaxreader.cpp \
    pkgsrc/textproc/libhighlight/patches/patch-src_include_syntaxreader.h
cvs rdiff -u -r1.13 -r1.14 \
    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.31 pkgsrc/textproc/libhighlight/Makefile.common:1.32
--- pkgsrc/textproc/libhighlight/Makefile.common:1.31   Sat May 25 14:26:41 2024
+++ pkgsrc/textproc/libhighlight/Makefile.common        Fri Aug 16 15:27:59 2024
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.31 2024/05/25 14:26:41 schmonz Exp $
+# $NetBSD: Makefile.common,v 1.32 2024/08/16 15:27:59 schmonz Exp $
 # used by textproc/highlight/Makefile
 # used by textproc/libhighlight/Makefile
 # used by textproc/p5-highlight/Makefile
 
 DISTNAME=              highlight-${VERSION}
-VERSION=               4.12
+VERSION=               4.13
 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.26 pkgsrc/textproc/libhighlight/PLIST:1.27
--- pkgsrc/textproc/libhighlight/PLIST:1.26     Sat May 25 14:26:41 2024
+++ pkgsrc/textproc/libhighlight/PLIST  Fri Aug 16 15:27:59 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2024/05/25 14:26:41 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.27 2024/08/16 15:27:59 schmonz Exp $
 lib/libhighlight.la
 share/bash-completion/completions/highlight
 share/doc/highlight/AUTHORS
@@ -153,6 +153,7 @@ share/highlight/langDefs/fx.lang
 share/highlight/langDefs/gambas.lang
 share/highlight/langDefs/gdb.lang
 share/highlight/langDefs/gdscript.lang
+share/highlight/langDefs/gleam.lang
 share/highlight/langDefs/go.lang
 share/highlight/langDefs/graphviz.lang
 share/highlight/langDefs/haml.lang
@@ -302,6 +303,7 @@ share/highlight/langDefs/ttcn3.lang
 share/highlight/langDefs/txt.lang
 share/highlight/langDefs/typescript.lang
 share/highlight/langDefs/upc.lang
+share/highlight/langDefs/v.lang
 share/highlight/langDefs/vala.lang
 share/highlight/langDefs/vb.lang
 share/highlight/langDefs/verilog.lang
@@ -491,6 +493,7 @@ share/highlight/themes/darkplus.theme
 share/highlight/themes/darkslategray.theme
 share/highlight/themes/darkspectrum.theme
 share/highlight/themes/denim.theme
+share/highlight/themes/diff.theme
 share/highlight/themes/duotone-dark-earth.theme
 share/highlight/themes/duotone-dark-forest.theme
 share/highlight/themes/duotone-dark-sea.theme

Index: pkgsrc/textproc/libhighlight/distinfo
diff -u pkgsrc/textproc/libhighlight/distinfo:1.34 pkgsrc/textproc/libhighlight/distinfo:1.35
--- pkgsrc/textproc/libhighlight/distinfo:1.34  Sat May 25 14:26:41 2024
+++ pkgsrc/textproc/libhighlight/distinfo       Fri Aug 16 15:27:59 2024
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.34 2024/05/25 14:26:41 schmonz Exp $
+$NetBSD: distinfo,v 1.35 2024/08/16 15:27:59 schmonz Exp $
 
-BLAKE2s (highlight-4.12.tar.bz2) = eab1b45c078f06417ca97bc713ad5dcae6ce79b8ead337cf4fa371cb79a94695
-SHA512 (highlight-4.12.tar.bz2) = 6174f00adb28182b2eddf087458c04e0914f74d515615f36f11181225ab4d964bc7c9d08145f58f285fbd3c30759248f99df1274f80cfda8c53a1f3f0016cb0f
-Size (highlight-4.12.tar.bz2) = 1501961 bytes
+BLAKE2s (highlight-4.13.tar.bz2) = f04a1f86f1f23a827b3ec07623d2684d37f96cb3e99fd97079a953100fde7d0c
+SHA512 (highlight-4.13.tar.bz2) = 45f36ce3256567d45806d8cd31d595fb38c3d59933e9d99aeb980c9115a304c3b81597ac906c4439dd919e4983de8a9559fd52efa280bdb86c607efc4959c5ae
+Size (highlight-4.13.tar.bz2) = 1508433 bytes
 SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
 SHA1 (patch-makefile) = 92f6514c39f6aa437f9beaafc10a1f6275e241b3
-SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
+SHA1 (patch-src_core_platform__fs.cpp) = be41ce38ac7365234fe68257dbee3b881f8e2b52
+SHA1 (patch-src_core_syntaxreader.cpp) = bcdecf28ea77c219f24ed882b8455055f222a844
 SHA1 (patch-src_gui-qt_highlight.pro) = c3aa498e49ddaffd98149e67b34490480d0e4a7c
 SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f
 SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
-SHA1 (patch-src_makefile) = 4052e2e44ae1681bede016929ad11d2095fbf89f
+SHA1 (patch-src_include_syntaxreader.h) = 3f8a202cadfabce59f475f9f9ab4948e2154e73c
+SHA1 (patch-src_makefile) = d65034a2beb30251458edaf5ef678546453cb68b

Index: pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.4 pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.5
--- pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp:1.4    Fri Dec 18 18:45:08 2020
+++ pkgsrc/textproc/libhighlight/patches/patch-src_core_platform__fs.cpp        Fri Aug 16 15:27:59 2024
@@ -1,25 +1,28 @@
-$NetBSD: patch-src_core_platform__fs.cpp,v 1.4 2020/12/18 18:45:08 schmonz Exp $
+$NetBSD: patch-src_core_platform__fs.cpp,v 1.5 2024/08/16 15:27:59 schmonz Exp $
 
 Fix build on (at least) SmartOS.
 
---- src/core/platform_fs.cpp.orig      2020-11-13 20:00:38.000000000 +0000
+--- src/core/platform_fs.cpp.orig      2024-08-11 13:05:37.000000000 +0000
 +++ src/core/platform_fs.cpp
-@@ -95,12 +95,12 @@ std::string getTempFilePath(){
- 
- const char pathSeparator = '/';
+@@ -65,7 +65,7 @@ namespace Platform
+ const char pathSeparator = '\\';
  
+ #ifndef QT
 -std::string getAppPath()
 +::std::string getAppPath()
  {
-     return "";
+     char pathAndName[MAX_PATH], path[MAX_PATH], drive[3];
+     GetModuleFileName(NULL, pathAndName, MAX_PATH);
+@@ -74,7 +74,7 @@ std::string getAppPath()
  }
+ #endif
  
 -std::string getHomePath()
 +::std::string getHomePath()
  {
-     struct passwd *pw = getpwuid(getuid());
-     return pw != NULL ? string(pw->pw_dir) : "";
-@@ -140,8 +140,8 @@ int isDarkTerminal() {
+     return "";
+ }
+@@ -149,8 +149,8 @@ int isDarkTerminal() {
      return 1;
  }
  

Index: pkgsrc/textproc/libhighlight/patches/patch-src_makefile
diff -u pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.13 pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.14
--- pkgsrc/textproc/libhighlight/patches/patch-src_makefile:1.13        Mon Mar 18 18:56:40 2024
+++ pkgsrc/textproc/libhighlight/patches/patch-src_makefile     Fri Aug 16 15:28:00 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_makefile,v 1.13 2024/03/18 18:56:40 schmonz Exp $
+$NetBSD: patch-src_makefile,v 1.14 2024/08/16 15:28:00 schmonz Exp $
 
 Use pkgsrc-specified compiler and flags.
 
---- src/makefile.orig  2024-03-15 14:46:32.000000000 +0000
+--- src/makefile.orig  2024-08-11 13:05:37.000000000 +0000
 +++ src/makefile
 @@ -13,11 +13,11 @@
  # See src/gui-qt/highlight.pro for the Qt GUI compilation options
@@ -64,7 +64,7 @@ Use pkgsrc-specified compiler and flags.
 -highlight-gui: libhighlight.a ${GUI_OBJECTS}
 +highlight-gui: ${GUI_OBJECTS}
        cd gui-qt && \
-       ${QMAKE} 'DEFINES+=DATA_DIR=\\\"${HL_DATA_DIR}\\\" CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
+       ${QMAKE} 'DEFINES+=HL_DATA_DIR=\\\"${HL_DATA_DIR}\\\" HL_CONFIG_DIR=\\\"${HL_CONFIG_DIR}\\\" HL_DOC_DIR=\\\"${HL_DOC_DIR}\\\" ' && \
        $(MAKE)
 @@ -125,7 +129,7 @@ $(OBJECTFILES) : makefile
  

Added files:

Index: pkgsrc/textproc/libhighlight/patches/patch-src_core_syntaxreader.cpp
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-src_core_syntaxreader.cpp:1.1
--- /dev/null   Fri Aug 16 15:28:00 2024
+++ pkgsrc/textproc/libhighlight/patches/patch-src_core_syntaxreader.cpp        Fri Aug 16 15:27:59 2024
@@ -0,0 +1,30 @@
+$NetBSD: patch-src_core_syntaxreader.cpp,v 1.1 2024/08/16 15:27:59 schmonz Exp $
+
+Apply upstream commit edf6511e to fix #247.
+
+--- src/core/syntaxreader.cpp.orig     2024-08-11 13:05:37.000000000 +0000
++++ src/core/syntaxreader.cpp
+@@ -65,8 +65,21 @@ set<string> SyntaxReader::persistentSynt
+ int RegexElement::instanceCnt=0;
+ 
+ 
+-SyntaxReader::SyntaxReader() 
+-    
++SyntaxReader::SyntaxReader() :
++  ignoreCase ( false ),
++  disableHighlighting ( false ),
++  allowNestedComments ( true ),
++  reformatCode ( false ),
++  assertEqualLength(false),
++  paramsNeedUpdate(false),
++  rawStringPrefix(0),
++  continuationChar(0),
++  keywordCount(0),
++  validateStateChangeFct(nullptr),
++  decorateFct(nullptr),
++  decorateLineBeginFct(nullptr),
++  decorateLineEndFct(nullptr),
++  luaState(nullptr)
+ {
+ 
+ }
Index: pkgsrc/textproc/libhighlight/patches/patch-src_include_syntaxreader.h
diff -u /dev/null pkgsrc/textproc/libhighlight/patches/patch-src_include_syntaxreader.h:1.1
--- /dev/null   Fri Aug 16 15:28:00 2024
+++ pkgsrc/textproc/libhighlight/patches/patch-src_include_syntaxreader.h       Fri Aug 16 15:27:59 2024
@@ -0,0 +1,62 @@
+$NetBSD: patch-src_include_syntaxreader.h,v 1.1 2024/08/16 15:27:59 schmonz Exp $
+
+Apply upstream commit edf6511e to fix #247.
+
+--- src/include/syntaxreader.h.orig    2024-08-11 13:05:37.000000000 +0000
++++ src/include/syntaxreader.h
+@@ -423,30 +423,32 @@ private:
+ 
+     std::map <int, int> matchingDelimiters;
+ 
++    // Caution: SWIG does not support member default initializers
++
+     // keywords are not case sensitive if set
+-    bool ignoreCase{ false },
++    bool ignoreCase,
+ 
+          // highlighting is disabled
+-         disableHighlighting{ false },
++         disableHighlighting,
+ 
+          // allow nested multi line comment blocks
+-         allowNestedComments{ true },
++         allowNestedComments,
+ 
+          // code formatting is enabled if set
+-         reformatCode{ false },
++         reformatCode,
+ 
+          // string open and close delimiters must have the same length
+-         assertEqualLength{false},
++         assertEqualLength,
+ 
+-         paramsNeedUpdate{false};
++         paramsNeedUpdate;
+ 
+     // character which is prefix of raw string (c#)
+-    unsigned char rawStringPrefix{0};
++    unsigned char rawStringPrefix;
+ 
+     //character which continues current style on next line
+-    unsigned char continuationChar{0};
++    unsigned char continuationChar;
+ 
+-    int keywordCount{0};
++    int keywordCount;
+ 
+     bool readFlag(const Diluculum::LuaVariable& var) ;
+ 
+@@ -470,10 +472,10 @@ private:
+ 
+ 
+     // Functions accessible in Lua State
+-    Diluculum::LuaFunction* validateStateChangeFct{nullptr};
+-    Diluculum::LuaFunction* decorateFct{nullptr}, *decorateLineBeginFct{nullptr}, *decorateLineEndFct{nullptr};
++    Diluculum::LuaFunction* validateStateChangeFct;
++    Diluculum::LuaFunction* decorateFct, *decorateLineBeginFct, *decorateLineEndFct;
+ 
+-    Diluculum::LuaState* luaState{nullptr}; // make member to allow interaction with codeparser instance
++    Diluculum::LuaState* luaState; // make member to allow interaction with codeparser instance
+ 
+     static std::vector<Diluculum::LuaFunction*> pluginChunks;
+ };