Skip to content

Commit 8b64b23

Browse files
committed
libhighlight: update to 4.11. Changes:
- updated astyle lib to version 3.4.13 - updated java definition - updated solidity definition - fix backslash symbol in man page - src/makefile: added -std=c++17 to enable modern C++ features
1 parent e7e7d49 commit 8b64b23

File tree

5 files changed

+22
-19
lines changed

5 files changed

+22
-19
lines changed

textproc/libhighlight/Makefile.common

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# $NetBSD: Makefile.common,v 1.29 2023/11/08 11:11:35 schmonz Exp $
1+
# $NetBSD: Makefile.common,v 1.30 2024/03/18 18:56:40 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= 4.10
7+
VERSION= 4.11
88
CATEGORIES= textproc
99
MASTER_SITES= http://www.andre-simon.de/zip/
1010
EXTRACT_SUFX= .tar.bz2
@@ -15,7 +15,9 @@ COMMENT= Converts source code to formatted text with syntax highlighting
1515
LICENSE= gnu-gpl-v3
1616

1717
USE_TOOLS+= gmake pkg-config
18-
USE_LANGUAGES= c c++11
18+
USE_LANGUAGES= c c++
19+
FORCE_CXX_STD= c++17
20+
USE_CXX_FEATURES= c++17
1921
USE_LIBTOOL= yes
2022
MAKE_FILE= makefile
2123

textproc/libhighlight/PLIST

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.24 2023/10/20 15:58:49 schmonz Exp $
1+
@comment $NetBSD: PLIST,v 1.25 2024/03/18 18:56:40 schmonz Exp $
22
lib/libhighlight.la
33
share/bash-completion/completions/highlight
44
share/doc/highlight/AUTHORS
@@ -205,6 +205,7 @@ share/highlight/langDefs/miranda.lang
205205
share/highlight/langDefs/mod2.lang
206206
share/highlight/langDefs/mod3.lang
207207
share/highlight/langDefs/modelica.lang
208+
share/highlight/langDefs/mojo.lang
208209
share/highlight/langDefs/moon.lang
209210
share/highlight/langDefs/ms.lang
210211
share/highlight/langDefs/msl.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.32 2023/11/08 11:11:35 schmonz Exp $
1+
$NetBSD: distinfo,v 1.33 2024/03/18 18:56:40 schmonz Exp $
22

3-
BLAKE2s (highlight-4.10.tar.bz2) = 9e703a8553ebee5a6202e196d192dab16fe30c57d6ac5b4fbf4d4373d926673d
4-
SHA512 (highlight-4.10.tar.bz2) = 30e3590ea8673e9a6b6c8fc3c2b03fce6a708fa44dfb265a0495002ef4c0f87ccd22d107e64301644e3abfd023c5f695d3d524501eb6b3a0f99225a8b23f315f
5-
Size (highlight-4.10.tar.bz2) = 1498745 bytes
3+
BLAKE2s (highlight-4.11.tar.bz2) = 83a554aac0cc3afafe956fa330f31e8926529c6629eda1551aa3aedc4f35f4dd
4+
SHA512 (highlight-4.11.tar.bz2) = eb0c92e5dc3ecf280bf6e5a4e68ffb0289a09b3b92fb37756495a5c4e1936800b74385ea0eec2650cae2c690715cc37fd7eeff13e36615410af4c2edd9f2c868
5+
Size (highlight-4.11.tar.bz2) = 1502154 bytes
66
SHA1 (patch-extras_swig_makefile) = 071290b9eb92124eb5605173b77575c5747a4b5e
77
SHA1 (patch-makefile) = 92f6514c39f6aa437f9beaafc10a1f6275e241b3
88
SHA1 (patch-src_core_platform__fs.cpp) = dfc7addeca0faf4ff4996c1efcf5114ea78aebe3
9-
SHA1 (patch-src_gui-qt_highlight.pro) = 48200cbff5c0004ecae5ed013de6eef65ab260fa
9+
SHA1 (patch-src_gui-qt_highlight.pro) = 34c41b702899ef916caa7fdb94c00103e0152959
1010
SHA1 (patch-src_gui-qt_mainwindow.cpp) = 8589c68e032385801bc969abe805f1be3dc2630f
1111
SHA1 (patch-src_gui-qt_showtextfile.cpp) = 9bd974f40aa9a5bf7c8178e079d4ee1818a4d7b8
12-
SHA1 (patch-src_makefile) = a66c61de0ed3eff5fa9ac2da9d434fcd6c553b51
12+
SHA1 (patch-src_makefile) = 4052e2e44ae1681bede016929ad11d2095fbf89f

textproc/libhighlight/patches/patch-src_gui-qt_highlight.pro

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
$NetBSD: patch-src_gui-qt_highlight.pro,v 1.6 2023/09/06 18:06:23 schmonz Exp $
1+
$NetBSD: patch-src_gui-qt_highlight.pro,v 1.7 2024/03/18 18:56:40 schmonz Exp $
22

33
Restore non-.app macOS build settings from 3.59.
44

5-
--- src/gui-qt/highlight.pro.orig 2023-08-28 20:06:54.000000000 +0000
5+
--- src/gui-qt/highlight.pro.orig 2024-03-15 14:46:32.000000000 +0000
66
+++ src/gui-qt/highlight.pro
77
@@ -89,8 +89,11 @@ macx-clang|macx-clang-arm64 {
88
INCLUDEPATH += ../../include
9-
INCLUDEPATH+=/usr/local/Cellar/boost/1.82.0_1/include
9+
INCLUDEPATH+=/usr/local/Cellar/boost/1.84.0_1/include
1010

11-
- QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0
11+
- QMAKE_MACOSX_DEPLOYMENT_TARGET=14.0
1212
- CONFIG += app_bundle
13-
+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=13.0
13+
+ ###QMAKE_MACOSX_DEPLOYMENT_TARGET=14.0
1414
+ ###CONFIG += app_bundle
1515
+ QT_CONFIG -= no-pkg-config
1616
+ CONFIG += link_pkgconfig

textproc/libhighlight/patches/patch-src_makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$NetBSD: patch-src_makefile,v 1.12 2022/10/03 18:09:12 schmonz Exp $
1+
$NetBSD: patch-src_makefile,v 1.13 2024/03/18 18:56:40 schmonz Exp $
22

33
Use pkgsrc-specified compiler and flags.
44

5-
--- src/makefile.orig 2022-09-28 17:52:30.000000000 +0000
5+
--- src/makefile.orig 2024-03-15 14:46:32.000000000 +0000
66
+++ src/makefile
77
@@ -13,11 +13,11 @@
88
# See src/gui-qt/highlight.pro for the Qt GUI compilation options
@@ -13,8 +13,8 @@ Use pkgsrc-specified compiler and flags.
1313

1414
QMAKE ?= qmake
1515

16-
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
17-
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -D_FILE_OFFSET_BITS=64
16+
-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
17+
+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++17 -D_FILE_OFFSET_BITS=64
1818

1919
#CFLAGS:= -fPIC -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fexceptions -fstack-protector-strong -grecord-gcc-switches -fasynchronous-unwind-tables -fstack-clash-protection
2020

0 commit comments

Comments
 (0)