commit: 3bb49938280e9614c94605fb0d4cbe5b6309cd6e Author: Zoltan Puskas <zoltan <AT> sinustrom <DOT> info> AuthorDate: Wed Aug 27 10:19:28 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Mon Dec 1 10:45:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bb49938
www-apps/cgit: Fix app-text/highlight compatibility cgit's highlighter script supports newer highlight versions, but the code had to be patched to enable that instead of the legacy version, that does not ship with Gentoo any more. Signed-off-by: Zoltan Puskas <zoltan <AT> sinustrom.info> Closes: https://bugs.gentoo.org/962035 Part-of: https://github.com/gentoo/gentoo/pull/43582 Closes: https://github.com/gentoo/gentoo/pull/43582 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> ...20240802-r1.ebuild => cgit-1.2.3_p20240802-r2.ebuild} | 2 ++ www-apps/cgit/cgit-9999-r1.ebuild | 2 ++ www-apps/cgit/cgit-9999.ebuild | 2 ++ www-apps/cgit/files/cgit-highlight.patch | 16 ++++++++++++++++ 4 files changed, 22 insertions(+) diff --git a/www-apps/cgit/cgit-1.2.3_p20240802-r1.ebuild b/www-apps/cgit/cgit-1.2.3_p20240802-r2.ebuild similarity index 98% rename from www-apps/cgit/cgit-1.2.3_p20240802-r1.ebuild rename to www-apps/cgit/cgit-1.2.3_p20240802-r2.ebuild index 61771360c86c..8e2b9cf6a89a 100644 --- a/www-apps/cgit/cgit-1.2.3_p20240802-r1.ebuild +++ b/www-apps/cgit/cgit-1.2.3_p20240802-r2.ebuild @@ -58,6 +58,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/${PN}-highlight.patch ) + pkg_setup() { python_setup webapp_pkg_setup diff --git a/www-apps/cgit/cgit-9999-r1.ebuild b/www-apps/cgit/cgit-9999-r1.ebuild index 55d6a0ffb4b2..bb7ceed18ce1 100644 --- a/www-apps/cgit/cgit-9999-r1.ebuild +++ b/www-apps/cgit/cgit-9999-r1.ebuild @@ -61,6 +61,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/${PN}-highlight.patch ) + pkg_setup() { python_setup webapp_pkg_setup diff --git a/www-apps/cgit/cgit-9999.ebuild b/www-apps/cgit/cgit-9999.ebuild index 9b256c764f81..8ddebf68c9c2 100644 --- a/www-apps/cgit/cgit-9999.ebuild +++ b/www-apps/cgit/cgit-9999.ebuild @@ -58,6 +58,8 @@ BDEPEND=" ) " +PATCHES=( "${FILESDIR}"/${PN}-highlight.patch ) + pkg_setup() { python_setup webapp_pkg_setup diff --git a/www-apps/cgit/files/cgit-highlight.patch b/www-apps/cgit/files/cgit-highlight.patch new file mode 100644 index 000000000000..9d03f2b0df70 --- /dev/null +++ b/www-apps/cgit/files/cgit-highlight.patch @@ -0,0 +1,16 @@ +cgit's highlighter script supports newer highlight versions, but the config has +to be patched to enable that instead of the legacy version, which does not ship +with Gentoo any more. See: https://bugs.gentoo.org/962035 + +--- a/filters/syntax-highlighting.sh ++++ b/filters/syntax-highlighting.sh +@@ -115,7 +115,7 @@ + # found (for example) on EPEL 6. + # + # This is for version 2 +-exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null ++#exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null + + # This is for version 3 +-#exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null ++exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null
