From 947f5b6723c31c797189c59e0a18e17d4b3552ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mikko=20V=C3=A4rri?= Date: Sat, 25 Jan 2014 18:43:19 +0100 Subject: libraries/Jinja2: Updated for version 2.7.2. Signed-off-by: Matteo Bernardini --- libraries/Jinja2/Jinja2.SlackBuild | 6 ++++-- libraries/Jinja2/Jinja2.info | 8 ++++---- libraries/Jinja2/fix_doc_build.patch | 11 +++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 libraries/Jinja2/fix_doc_build.patch diff --git a/libraries/Jinja2/Jinja2.SlackBuild b/libraries/Jinja2/Jinja2.SlackBuild index 2efdf23e4c..89fc984408 100644 --- a/libraries/Jinja2/Jinja2.SlackBuild +++ b/libraries/Jinja2/Jinja2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Jinja2 -# Copyright 2011 Mikko Värri, Finland +# Copyright 2014 Mikko Värri, Finland # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=Jinja2 -VERSION=${VERSION:-2.6} +VERSION=${VERSION:-2.7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,6 +60,8 @@ find -L . \ python setup.py install --root=$PKG if [ "$DOCS" = "yes" ]; then + # Patch from: https://github.com/mitsuhiko/jinja2/pull/259 + patch -p0 <$CWD/fix_doc_build.patch make -C docs html fi diff --git a/libraries/Jinja2/Jinja2.info b/libraries/Jinja2/Jinja2.info index fc1fe8466d..e2591f8a34 100644 --- a/libraries/Jinja2/Jinja2.info +++ b/libraries/Jinja2/Jinja2.info @@ -1,10 +1,10 @@ PRGNAM="Jinja2" -VERSION="2.6" +VERSION="2.7.2" HOMEPAGE="http://pypi.python.org/pypi/Jinja2" -DOWNLOAD="http://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.6.tar.gz" -MD5SUM="1c49a8825c993bfdcf55bb36897d28a2" +DOWNLOAD="https://pypi.python.org/packages/source/J/Jinja2/Jinja2-2.7.2.tar.gz" +MD5SUM="df1581455564e97010e38bc792012aa5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pysetuptools" +REQUIRES="MarkupSafe" MAINTAINER="Mikko Värri" EMAIL="vmj@linuxbox.fi" diff --git a/libraries/Jinja2/fix_doc_build.patch b/libraries/Jinja2/fix_doc_build.patch new file mode 100644 index 0000000000..4caa78adeb --- /dev/null +++ b/libraries/Jinja2/fix_doc_build.patch @@ -0,0 +1,11 @@ +--- docs/jinjaext.py 2014-01-10 12:14:43.000000000 +0200 ++++ docs/jinjaext.py.patched 2014-01-24 23:31:50.511110780 +0200 +@@ -23,7 +23,7 @@ + from pygments.token import Keyword, Name, Comment, String, Error, \ + Number, Operator, Generic + from jinja2 import Environment, FileSystemLoader +-from jinja2.utils import next ++from jinja2._compat import next + + + def parse_rst(state, content_offset, doc): -- cgit v1.2.3