Date: Friday, June 5, 2015 @ 18:14:49 Author: spupykin Revision: 134843
Added: clearsilver/trunk/c99.patch Modified: clearsilver/trunk/PKGBUILD -----------+ PKGBUILD | 20 +++++++++++++++----- c99.patch | 23 +++++++++++++++++++++++ 2 files changed, 38 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-06-05 15:53:14 UTC (rev 134842) +++ PKGBUILD 2015-06-05 16:14:49 UTC (rev 134843) @@ -5,17 +5,20 @@ pkgname=clearsilver pkgver=0.10.5 -pkgrel=17 +pkgrel=18 pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system" arch=('i686' 'x86_64') url='http://www.clearsilver.net' license=('custom') depends=('python2' 'perl' 'ruby' 'java-runtime') +makedepends=('java-environment') options=('!emptydirs' 'staticlibs') source=("http://www.clearsilver.net/downloads/$pkgname-$pkgver.tar.gz" - "clearsilver-ruby-1.9.patch") + "clearsilver-ruby-1.9.patch" + "c99.patch") md5sums=('b8c0c7fbe0ef5e06e0c935f134304d44' - 'd9db4e5985254e1b0d63e9ff042773f4') + 'd9db4e5985254e1b0d63e9ff042773f4' + '18b9bf6755786f202b25477b5e882792') prepare() { cd $srcdir/$pkgname-$pkgver @@ -22,6 +25,7 @@ sed -i "s@/usr/local/bin/python@/usr/bin/env python2@g" scripts/document.py sed -i "s...@install.rb inst...@install.rb install --prefix=$pkgdir@g" ruby/Makefile patch -p1 <$srcdir/clearsilver-ruby-1.9.patch + patch -p1 <$srcdir/c99.patch patch -p0 ruby/install.rb <<EOF 71,73c71,73 < siteruby = subprefix.call(c['sitedir']) @@ -59,11 +63,17 @@ make PREFIX=$pkgdir DESTDIR=$pkgdir install install -Dm644 CS_LICENSE $pkgdir/usr/share/licenses/clearsilver/license.txt - rm -rf $pkgdir/usr/lib/perl5/5.8.8/ - mv $pkgdir/usr/man/man3/* $pkgdir/usr/share/man/man3/ rm -rf $pkgdir/usr/man find $pkgdir -name '.packlist' -delete find $pkgdir -name '*.pod' -delete + +# template start; name=perl-binary-module-dependency; version=1; +if [[ $(find "$pkgdir/usr/lib/perl5/" -name "*.so") ]]; then + _perlver_min=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);') + _perlver_max=$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);') + depends+=("perl>=$_perlver_min" "perl<$_perlver_max") +fi +# template end; } Added: c99.patch =================================================================== --- c99.patch (rev 0) +++ c99.patch 2015-06-05 16:14:49 UTC (rev 134843) @@ -0,0 +1,23 @@ +diff -wbBur clearsilver-0.10.5/util/neo_err.h clearsilver-0.10.5.my/util/neo_err.h +--- clearsilver-0.10.5/util/neo_err.h 2007-07-12 07:09:09.000000000 +0400 ++++ clearsilver-0.10.5.my/util/neo_err.h 2015-06-05 19:06:34.961297962 +0300 +@@ -84,9 +84,6 @@ + * NEOERR fails + */ + #if defined(USE_C99_VARARG_MACROS) +-#define nerr_raise(e,f,...) \ +- nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) +-#elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise(e,f,a...) \ + nerr_raisef(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) + #endif +@@ -98,9 +95,6 @@ + + + #if defined(USE_C99_VARARG_MACROS) +-#define nerr_raise_errno(e,f,...) \ +- nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__) +-#elif defined(USE_GNUC_VARARG_MACROS) + #define nerr_raise_errno(e,f,a...) \ + nerr_raise_errnof(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,##a) + #endif