From 4ef418cc1817c75cbcbe21a157175ffd7b469d96 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Wed, 24 Dec 2025 20:52:49 +0530 Subject: [PATCH 1/9] Upgrade highlight to version 4.18 --- .../highlight/highlight.signatures.json | 2 +- SPECS-EXTENDED/highlight/highlight.spec | 48 +++++++++++++++---- cgmanifest.json | 4 +- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/SPECS-EXTENDED/highlight/highlight.signatures.json b/SPECS-EXTENDED/highlight/highlight.signatures.json index 8359783c974..d45613dfd56 100644 --- a/SPECS-EXTENDED/highlight/highlight.signatures.json +++ b/SPECS-EXTENDED/highlight/highlight.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "highlight-3.54.tar.bz2": "8a50a85e94061b53085c6ad8cf110039217dbdd411ab846f9ff934bec7ecd6d0" + "highlight-4.18.tar.bz2": "f52c211dcd5626526af45ab8e558253caa713d060709bbac22c23ceae35eb502" } } diff --git a/SPECS-EXTENDED/highlight/highlight.spec b/SPECS-EXTENDED/highlight/highlight.spec index d7a0e2c5d48..376d0721b3f 100644 --- a/SPECS-EXTENDED/highlight/highlight.spec +++ b/SPECS-EXTENDED/highlight/highlight.spec @@ -2,15 +2,21 @@ Vendor: Microsoft Corporation Distribution: Azure Linux Name: highlight Summary: Universal source code to formatted text converter -Version: 3.54 -Release: 3%{?dist} -License: GPLv3 +Version: 4.18 +Release: 1%{?dist} +License: GPL-3.0-only URL: http://www.andre-simon.de/ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2 + +%bcond qt 0 + BuildRequires: gcc-c++ +%if %{with qt} BuildRequires: qt5-qtbase-devel +%endif BuildRequires: lua-devel, boost-devel BuildRequires: desktop-file-utils +BuildRequires: make %{?filter_setup: %filter_from_provides /^perl(/d; @@ -27,12 +33,14 @@ Language descriptions are configurable and support regular expressions. The utility offers indentation and reformatting capabilities. It is easily possible to create new language definitions and colour themes. +%if %{with qt} %package gui -Summary: GUI for the hihghlight source code formatter +Summary: GUI for the highlight source code formatter Requires: %{name} = %{version}-%{release} %description gui A Qt-based GUI for the highlight source code formatter source. +%endif %prep %autosetup @@ -44,21 +52,32 @@ LDFLAGS="$LDFLAGS %{?__global_ldflags}"; export LDFLAGS # disabled paralell builds to fix FTBFS on rawhide & highlight 3.52+ #make_build all gui CFLAGS="${CFLAGS}" \ - make all gui CFLAGS="${CFLAGS}" \ + %{__make} all CFLAGS="${CFLAGS}" \ + CXXFLAGS="${CXXFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + LFLAGS="-Wl,-O1 ${LDFLAGS}" \ + PREFIX="%{_prefix}" \ + conf_dir="%{_sysconfdir}/" + +%if %{with qt} + %{__make} gui CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" \ LFLAGS="-Wl,-O1 ${LDFLAGS}" \ PREFIX="%{_prefix}" \ - conf_dir="%{_sysconfdir}/highlight/" \ + conf_dir="%{_sysconfdir}/" \ QMAKE="%{_qt5_qmake}" \ QMAKE_STRIP= +%endif %install -%make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/" +%make_install PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/" mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/highlight/" +%if %{with qt} +make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/" +%endif rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ @@ -71,18 +90,29 @@ desktop-file-install \ %{_datadir}/highlight/ %{_mandir}/man1/highlight.1* %{_mandir}/man5/filetypes.conf.5* +%{_datadir}/bash-completion/completions/highlight +%{_datadir}/fish/vendor_completions.d/highlight.fish +%{_datadir}/zsh/site-functions/_highlight %config(noreplace) %{_sysconfdir}/highlight/ %doc ChangeLog* AUTHORS README* extras/ %license COPYING + %if %{with qt} %files gui %{_bindir}/highlight-gui %{_datadir}/applications/highlight.desktop -%{_datadir}/pixmaps/highlight.xpm +%{_datadir}/icons/hicolor/256x256/apps/highlight.png +%else +%exclude %{_datadir}/applications/highlight.desktop +%endif %changelog +* Wed Dec 24 2025 Sumit Jena - 4.18-1 +- Update to version 4.18 +- License Verified + * Fri Oct 15 2021 Pawel Winogrodzki - 3.54-3 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index 71396fb989f..bb247096769 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5320,8 +5320,8 @@ "type": "other", "other": { "name": "highlight", - "version": "3.54", - "downloadUrl": "http://www.andre-simon.de/zip/highlight-3.54.tar.bz2" + "version": "4.18", + "downloadUrl": "http://www.andre-simon.de/zip/highlight-4.18.tar.bz2" } } }, From 0ffc41b36e868f70859a1f0b8d03efbb7de6e5e3 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Fri, 26 Dec 2025 12:11:57 +0530 Subject: [PATCH 2/9] Update changelog for version 4.18 --- SPECS-EXTENDED/highlight/highlight.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS-EXTENDED/highlight/highlight.spec b/SPECS-EXTENDED/highlight/highlight.spec index 376d0721b3f..d58269e314b 100644 --- a/SPECS-EXTENDED/highlight/highlight.spec +++ b/SPECS-EXTENDED/highlight/highlight.spec @@ -111,6 +111,7 @@ desktop-file-install \ %changelog * Wed Dec 24 2025 Sumit Jena - 4.18-1 - Update to version 4.18 +- Disabling GUI based subpackages. - License Verified * Fri Oct 15 2021 Pawel Winogrodzki - 3.54-3 From bd3040e8ad197e9bbbb112a91097832a1287a266 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Fri, 26 Dec 2025 12:55:52 +0530 Subject: [PATCH 3/9] Update Source0 URL for highlight package --- SPECS-EXTENDED/highlight/highlight.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS-EXTENDED/highlight/highlight.spec b/SPECS-EXTENDED/highlight/highlight.spec index d58269e314b..e7b6c9cc243 100644 --- a/SPECS-EXTENDED/highlight/highlight.spec +++ b/SPECS-EXTENDED/highlight/highlight.spec @@ -6,7 +6,7 @@ Version: 4.18 Release: 1%{?dist} License: GPL-3.0-only URL: http://www.andre-simon.de/ -Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2 +Source0: https://gitlab.com/saalen/highlight/-/archive/v4.18/highlight-v4.18.tar.bz2#/%{name}-%{version}.tar.bz2 %bcond qt 0 @@ -43,7 +43,7 @@ A Qt-based GUI for the highlight source code formatter source. %endif %prep -%autosetup +%autosetup -n %{name}-%{version} %build CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS From f0bbe478f6d70a4b09623600877fe013254cf48b Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Fri, 26 Dec 2025 12:56:42 +0530 Subject: [PATCH 4/9] Update download URL for highlight version 4.18 --- cgmanifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgmanifest.json b/cgmanifest.json index bb247096769..b03135deb4d 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -5321,7 +5321,7 @@ "other": { "name": "highlight", "version": "4.18", - "downloadUrl": "http://www.andre-simon.de/zip/highlight-4.18.tar.bz2" + "downloadUrl": "https://gitlab.com/saalen/highlight/-/archive/v4.18/highlight-v4.18.tar.bz2" } } }, From 2f93f15fc0621f06cac0060a43ece4ba646c75c7 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Fri, 26 Dec 2025 12:57:18 +0530 Subject: [PATCH 5/9] Update signature hash for highlight-4.18.tar.bz2 --- SPECS-EXTENDED/highlight/highlight.signatures.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS-EXTENDED/highlight/highlight.signatures.json b/SPECS-EXTENDED/highlight/highlight.signatures.json index d45613dfd56..fbd474ad12a 100644 --- a/SPECS-EXTENDED/highlight/highlight.signatures.json +++ b/SPECS-EXTENDED/highlight/highlight.signatures.json @@ -1,5 +1,5 @@ { "Signatures": { - "highlight-4.18.tar.bz2": "f52c211dcd5626526af45ab8e558253caa713d060709bbac22c23ceae35eb502" + "highlight-4.18.tar.bz2": "1cd3e273e1e4fdc5c0d23c0a9055dd0efe196ab04b43ef5da39ba0df516a8498" } } From c3ad676cb6809a169dacd5b3228a4b409a5fe86f Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Fri, 26 Dec 2025 14:46:36 +0530 Subject: [PATCH 6/9] Update highlight.spec --- SPECS-EXTENDED/highlight/highlight.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SPECS-EXTENDED/highlight/highlight.spec b/SPECS-EXTENDED/highlight/highlight.spec index e7b6c9cc243..c4458e66b56 100644 --- a/SPECS-EXTENDED/highlight/highlight.spec +++ b/SPECS-EXTENDED/highlight/highlight.spec @@ -95,7 +95,8 @@ desktop-file-install \ %{_datadir}/zsh/site-functions/_highlight %config(noreplace) %{_sysconfdir}/highlight/ -%doc ChangeLog* AUTHORS README* extras/ +%doc ChangeLog* AUTHORS README* +%exclude /usr/share/doc/highlight/extras %license COPYING %if %{with qt} From ba28a82c145c4c7444244d8213d4cd8c4322fe77 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Fri, 26 Dec 2025 14:58:17 +0530 Subject: [PATCH 7/9] Update prep section --- SPECS-EXTENDED/highlight/highlight.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS-EXTENDED/highlight/highlight.spec b/SPECS-EXTENDED/highlight/highlight.spec index c4458e66b56..2a917d085d6 100644 --- a/SPECS-EXTENDED/highlight/highlight.spec +++ b/SPECS-EXTENDED/highlight/highlight.spec @@ -43,7 +43,7 @@ A Qt-based GUI for the highlight source code formatter source. %endif %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-v%{version} %build CFLAGS="$CFLAGS -fPIC %{optflags}"; export CFLAGS From 242e2494e348b834abc44bd4241b84ea4711d377 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Mon, 5 Jan 2026 16:00:32 +0530 Subject: [PATCH 8/9] Remove exclusion of extras from highlight package Remove exclusion of extras directory from package. --- SPECS-EXTENDED/highlight/highlight.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/SPECS-EXTENDED/highlight/highlight.spec b/SPECS-EXTENDED/highlight/highlight.spec index 2a917d085d6..624b5f385b3 100644 --- a/SPECS-EXTENDED/highlight/highlight.spec +++ b/SPECS-EXTENDED/highlight/highlight.spec @@ -96,7 +96,6 @@ desktop-file-install \ %config(noreplace) %{_sysconfdir}/highlight/ %doc ChangeLog* AUTHORS README* -%exclude /usr/share/doc/highlight/extras %license COPYING %if %{with qt} From 254129abb93947ae39e2c183127a7f4834c678f7 Mon Sep 17 00:00:00 2001 From: SumitJenaHCL Date: Tue, 6 Jan 2026 16:56:59 +0530 Subject: [PATCH 9/9] Added additional license files along with extra documentations --- SPECS-EXTENDED/highlight/highlight.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/SPECS-EXTENDED/highlight/highlight.spec b/SPECS-EXTENDED/highlight/highlight.spec index 624b5f385b3..253c4b48383 100644 --- a/SPECS-EXTENDED/highlight/highlight.spec +++ b/SPECS-EXTENDED/highlight/highlight.spec @@ -79,6 +79,11 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps make install-gui DESTDIR=$RPM_BUILD_ROOT PREFIX="%{_prefix}" conf_dir="%{_sysconfdir}/" %endif +mv extras/langDefs-resources/UNLICENCE . +mv extras/pandoc/LICENSE . +rm extras/themes-resources/base16/LICENSE +rm extras/themes-resources/css-themes/UNLICENCE + rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/ desktop-file-install \ @@ -95,8 +100,8 @@ desktop-file-install \ %{_datadir}/zsh/site-functions/_highlight %config(noreplace) %{_sysconfdir}/highlight/ -%doc ChangeLog* AUTHORS README* -%license COPYING +%doc ChangeLog* AUTHORS README* extras/ +%license COPYING LICENSE UNLICENCE %if %{with qt} %files gui