summaryrefslogtreecommitdiffstats
path: root/development/cgit/cgit.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'development/cgit/cgit.SlackBuild')
-rw-r--r--development/cgit/cgit.SlackBuild26
1 files changed, 9 insertions, 17 deletions
diff --git a/development/cgit/cgit.SlackBuild b/development/cgit/cgit.SlackBuild
index b55f3a5739..f3e5b77e20 100644
--- a/development/cgit/cgit.SlackBuild
+++ b/development/cgit/cgit.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/sh
# Slackware build script for cgit
-# Copyright 2013-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2018 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=cgit
-VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.2}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
DOCROOT=${DOCROOT:-/var/www}
@@ -55,8 +55,8 @@ else
LIBDIRSUFFIX=""
fi
-CGIT_VERSION=${CGIT_VERSION:-v1.1}
-GIT_VERSION=${GIT_VERSION:-2.10.4}
+CGIT_VERSION=${CGIT_VERSION:-v1.2}
+GIT_VERSION=${GIT_VERSION:-2.18.0}
DOCS="cgitrc.5.txt COPYING README $CWD/config/cgitrc.sample \
$CWD/config/cgit-lighttpd.conf $CWD/config/cgit-httpd.conf \
@@ -78,23 +78,15 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# apply some upstream patches
-patch -p1 < $CWD/patches/0004-syntax-highlighting-replace-invalid-unicode-with.patch
-patch -p1 < $CWD/patches/0005-ui-patch-fix-crash-when-using-path-limit.patch
-patch -p1 < $CWD/patches/0006-ui-repolist-properly-sort-by-age.patch
-patch -p1 < $CWD/patches/0007-Remove-unused-variable-from-sort_section.patch
-patch -p1 < $CWD/patches/0011-ui-atom-properly-escape-delimiter-in-page-link.patch
-patch -p1 < $CWD/patches/0012-ui-shared-don-t-print-path-crumbs-without-a-repo.patch
-patch -p1 < $CWD/patches/0013-parsing-clear-query-path-before-starting.patch
-patch -p1 < $CWD/patches/0014-cgit-don-t-set-vpath-unless-repo-is-set.patch
-patch -p1 < $CWD/patches/0015-ui-plain-print-symlink-content.patch
+# apply patches from upstream
+patch -p1 < $CWD/patches/0001-record.repo.snapshot-prefix.in.the.per-repo.config.patch
# prepare sources
sed -i Makefile \
-e "s|-g -Wall -Igit|-Wall ${SLKCFLAGS} -Igit|" \
-e "s|\/lib$|/lib${LIBDIRSUFFIX}|" \
-e "s|(libdir)|(prefix)/share|" \
- -e "s|/usr/local|/usr|"
+ -e "s|/usr/local|/usr|" || exit 1
sed -e "s|@DOCROOT@|$DOCROOT|g" $CWD/config/cgit.conf > cgit.conf
echo "CGIT_VERSION = $CGIT_VERSION" >> cgit.conf
@@ -109,7 +101,7 @@ make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-# Install additionals lua scripts
+# install additionals lua scripts
install -m 0644 -D $CWD/config/email-libravatar-korg.lua \
$PKG/usr/share/cgit/filters/email-libravatar-korg.lua
install -m 0644 -D $CWD/config/email-gravatar-sbo.lua \