Style changes

.SRCINFO

@@ -3,19 +3,18 @@ pkgbase = highlight
 	pkgrel = 2
 	url = http://www.andre-simon.de/doku/highlight/highlight.html
 	arch = x86_64
-	license = GPL
+	license = GPL-3.0-or-later
 	makedepends = qt5-base
 	makedepends = lua
 	makedepends = boost
 	source = http://www.andre-simon.de/zip/highlight-4.15.tar.bz2
 	source = http://www.andre-simon.de/zip/highlight-4.15.tar.bz2.asc
+	source = use_gcc.patch
 	source = strip_gzip_timestamps.patch
 	validpgpkeys = B8C55574187F49180EDC763750FE0279D805A7C7
-	md5sums = fd16041ffc8945ef6c4c07dbf83c541c
-	md5sums = SKIP
-	md5sums = 1c816ade54c811d22531c6ce5699c769
 	sha256sums = 68b3f8178c5c9d4b0a03f6948635cef1c8d06244f6b438eebf3a190c588337e9
 	sha256sums = SKIP
+	sha256sums = 5aaacca96f1f4307bbe9cfb5b0f67a98edb0b5d653270990176e20840196ab50
 	sha256sums = 8ebc7cfb1a43417ec19c3346b69817b68ac6de9caf4fd46bdeef2b2831900caf
 
 pkgname = highlight

PKGBUILD

@@ -3,58 +3,56 @@
 # Contributor: Jan Fader <jan.fader@web.de>
 
 pkgbase=highlight
-pkgname=(highlight highlight-gui)
+pkgname=('highlight' 'highlight-gui')
 pkgver=4.15
 pkgrel=2
 url="http://www.andre-simon.de/doku/highlight/highlight.html"
 license=('GPL-3.0-or-later')
 arch=('x86_64')
-makedepends=(qt5-base lua boost)
-source=(http://www.andre-simon.de/zip/$pkgname-$pkgver.tar.bz2{,.asc}
-        strip_gzip_timestamps.patch)
-md5sums=('fd16041ffc8945ef6c4c07dbf83c541c'
-         'SKIP'
-         '1c816ade54c811d22531c6ce5699c769')
+makedepends=('qt5-base' 'lua' 'boost')
+source=("http://www.andre-simon.de/zip/${pkgname}-${pkgver}.tar.bz2"{,.asc}
+        'use_gcc.patch'
+        'strip_gzip_timestamps.patch')
 sha256sums=('68b3f8178c5c9d4b0a03f6948635cef1c8d06244f6b438eebf3a190c588337e9'
             'SKIP'
+            '5aaacca96f1f4307bbe9cfb5b0f67a98edb0b5d653270990176e20840196ab50'
             '8ebc7cfb1a43417ec19c3346b69817b68ac6de9caf4fd46bdeef2b2831900caf')
-validpgpkeys=(B8C55574187F49180EDC763750FE0279D805A7C7)
+validpgpkeys=('B8C55574187F49180EDC763750FE0279D805A7C7')
 
 prepare() {
-  cd "$srcdir/$pkgbase-$pkgver"
+	cd "${pkgbase}-${pkgver}"
 
-  sed -i 's/QMAKE=qmake/QMAKE=qmake-qt5/' src/makefile
-  sed -i 's/QMAKE_CC = clang/QMAKE_CC = gcc/' src/gui-qt/highlight.pro
-  sed -i 's/QMAKE_CXX = clang++/QMAKE_CXX = g++/' src/gui-qt/highlight.pro
-
-  # Patch to strip gzip timestamps for reproducible build
-  patch -Np1 -i "${srcdir}/strip_gzip_timestamps.patch"
+	# Use gcc instead of clang
+	patch -Np1 -i "${srcdir}/use_gcc.patch"
 
+	# Strip gzip timestamps for reproducible builds
+	# See https://gitlab.com/saalen/highlight/-/merge_requests/151
+	patch -Np1 -i "${srcdir}/strip_gzip_timestamps.patch"
 }
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+	cd "${pkgbase}-${pkgver}"
 
-  make QMAKE=qmake-qt5
-  make QMAKE=qmake-qt5 gui
+	make QMAKE=qmake-qt5
+	make QMAKE=qmake-qt5 gui
 }
 
 package_highlight() {
-  pkgdesc="Fast and flexible source code highlighter (CLI version)"
-  depends=('lua')
-  backup=(etc/highlight/filetypes.conf)
-  cd "$srcdir/$pkgbase-$pkgver"
+	pkgdesc="Fast and flexible source code highlighter (CLI version)"
+	depends=('lua')
+	backup=("etc/${pkgname}/filetypes.conf")
+
+	cd "${pkgbase}-${pkgver}"
 
-  make DESTDIR="$pkgdir" QMAKE=qmake-qt5 install
+	make DESTDIR="${pkgdir}" QMAKE=qmake-qt5 install
 }
 
 package_highlight-gui() {
-  pkgdesc="Fast and flexible source code highlighter (Qt version)"
-  depends=('qt5-base' 'highlight')
-  cd "$srcdir/$pkgbase-$pkgver"
+	pkgdesc="Fast and flexible source code highlighter (Qt version)"
+	depends=('qt5-base' 'highlight')
 
-  install -dm755 "$pkgdir/usr/bin"
-  make DESTDIR="$pkgdir" QMAKE=qmake-qt5 install-gui
-}
+	cd "${pkgbase}-${pkgver}"
 
-# vim:set ts=2 sw=2 et:
+	install -dm 755 "${pkgdir}/usr/bin"
+	make DESTDIR="${pkgdir}" QMAKE=qmake-qt5 install-gui
+}

use_gcc.patch

+diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro
+index c3c12de..8018939 100644
+--- a/src/gui-qt/highlight.pro
++++ b/src/gui-qt/highlight.pro
+@@ -83,8 +83,8 @@ win32 {
+ 
+ 
+ macx-clang|macx-clang-arm64  {
+-    QMAKE_CC = clang
+-    QMAKE_CXX = clang++
++    QMAKE_CC = gcc
++    QMAKE_CXX = g++
+     INCLUDEPATH+=/usr/local/Cellar/lua/5.4.4_1/include/
+     INCLUDEPATH += ../../include
+     INCLUDEPATH+=/usr/local/Cellar/boost/1.85.0/include