Package: cgit
Version: 0.10.2.git2.0.1-3
Hi,
thanks for packaging.
I have some old patches from my own packaging efforts
(https://build.opensuse.org/package/show/home:stbuehler/cgit):
* 0001-assume-highlight-version-3-in-filter-script.patch
this one is important and should be straight forward
* 0002-configure-cgit-make-options.patch
just for your information; I didn't look how you build it, but
perhaps it is useful to you.
* 0004-add-highlighting-rules-to-cgit.css.patch
perhaps this could be checked if it still matches the current
highlight output
* 0005-Force-man2html-groff-to-use-UTF-8-as-input-encoding.patch
UTF-8 is my own "preference", not absolutely necessary
* 0006-Use-debian-binary-name-rst2html.patch
somehow obvious :)
0003 got fixed upstream, that is why I left it out :)
regards,
Stefan
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbueh...@web.de>
Date: Fri, 10 May 2013 09:53:00 +0200
Subject: assume highlight version 3 in filter script
---
filters/syntax-highlighting.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/filters/syntax-highlighting.sh b/filters/syntax-highlighting.sh
index 24f6bb4..2ff2032 100755
--- a/filters/syntax-highlighting.sh
+++ b/filters/syntax-highlighting.sh
@@ -53,7 +53,7 @@ EXTENSION="${BASENAME##*.}"
# 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
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbueh...@web.de>
Date: Fri, 10 May 2013 10:55:14 +0200
Subject: configure cgit make options
---
cgit.conf | 9 +++++++++
1 file changed, 9 insertions(+)
create mode 100644 cgit.conf
diff --git a/cgit.conf b/cgit.conf
new file mode 100644
index 0000000..cf9463c
--- /dev/null
+++ b/cgit.conf
@@ -0,0 +1,9 @@
+CGIT_SCRIPT_PATH=/usr/lib/cgi-bin
+CGIT_DATA_PATH=/usr/share/cgit
+V=1
+NO_OPENSSL=1
+SHA1_HEADER=<block-sha1/sha1.h>
+
+export V
+export NO_OPENSSL
+export SHA1_HEADER
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbueh...@web.de>
Date: Wed, 29 May 2013 11:23:53 +0200
Subject: add highlighting rules to cgit.css
---
cgit.css | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/cgit.css b/cgit.css
index d467c66..d3e48c7 100644
--- a/cgit.css
+++ b/cgit.css
@@ -800,3 +800,20 @@ div#cgit table.ssdiff td.space {
div#cgit table.ssdiff td.space div {
min-height: 3em;
}
+
+/* Style definition file generated by highlight 3.9, http://www.andre-simon.de/ */
+/* Highlighting theme: Kwrite Editor */
+/* adapted for cgit */
+div#cgit table.blob .num { color:#b07e00; }
+div#cgit table.blob .esc { color:#ff00ff; }
+div#cgit table.blob .str { color:#bf0303; }
+div#cgit table.blob .pps { color:#818100; }
+div#cgit table.blob .slc { color:#838183; font-style:italic; }
+div#cgit table.blob .com { color:#838183; font-style:italic; }
+div#cgit table.blob .ppc { color:#008200; }
+div#cgit table.blob .opt { color:#000000; }
+div#cgit table.blob .lin { color:#555555; }
+div#cgit table.blob .kwa { color:#000000; font-weight:bold; }
+div#cgit table.blob .kwb { color:#0057ae; }
+div#cgit table.blob .kwc { color:#000000; font-weight:bold; }
+div#cgit table.blob .kwd { color:#010181; }
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbueh...@web.de>
Date: Wed, 29 May 2013 14:33:50 +0200
Subject: Force man2html/groff to use UTF-8 as input encoding
---
filters/html-converters/man2html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/filters/html-converters/man2html b/filters/html-converters/man2html
index 1b28437..4975da4 100755
--- a/filters/html-converters/man2html
+++ b/filters/html-converters/man2html
@@ -1,5 +1,5 @@
#!/bin/sh
echo "<div style=\"font-family: monospace\">"
-groff -mandoc -T html -P -r -P -l | egrep -v '(<html>|<head>|<meta|<title>|</title>|</head>|<body>|</body>|</html>|<!DOCTYPE|"http://www.w3.org)'
+groff -mandoc -T html -K UTF-8 -P -r -P -l | egrep -v '(<html>|<head>|<meta|<title>|</title>|</head>|<body>|</body>|</html>|<!DOCTYPE|"http://www.w3.org)'
echo "</div>"
From: =?UTF-8?q?Stefan=20B=C3=BChler?= <stbueh...@web.de>
Date: Wed, 29 May 2013 14:34:15 +0200
Subject: Use debian binary name rst2html
---
filters/html-converters/rst2html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/filters/html-converters/rst2html b/filters/html-converters/rst2html
index c51f5be..a1ba574 100755
--- a/filters/html-converters/rst2html
+++ b/filters/html-converters/rst2html
@@ -1,2 +1,2 @@
#!/bin/sh
-rst2html.py --template="$(dirname $0)/resources/rst-template.txt"
+rst2html --template="$(dirname $0)/resources/rst-template.txt"
