[arch-commits] Commit in zim/trunk (PKGBUILD diff_704.patch)

[Florian Pritz]

    Date: Thursday, September 25, 2014 @ 12:48:38
  Author: bluewind
Revision: 119567

upgpkg: zim 0.61-2

fix FS#41752

Added:
  zim/trunk/diff_704.patch
Modified:
  zim/trunk/PKGBUILD

----------------+
 PKGBUILD       |   14 +++++++++++---
 diff_704.patch |   15 +++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-25 10:24:47 UTC (rev 119566)
+++ PKGBUILD	2014-09-25 10:48:38 UTC (rev 119567)
@@ -5,7 +5,7 @@
 
 pkgname=zim
 pkgver=0.61
-pkgrel=1
+pkgrel=2
 pkgdesc="A WYSIWYG text editor that aims at bringing the concept of a wiki to the desktop."
 arch=(any)
 license=('GPL' 'PerlArtistic')
@@ -24,9 +24,17 @@
             'lilypond: Insert Score plugin'
             'texlive-bin: Insert Equation plugin')
 install=zim.install
-source=(http://www.zim-wiki.org/downloads/${pkgname}-${pkgver}.tar.gz)
-md5sums=('7318568b9e0ef69d0fb2ff77754b72ac')
+source=(http://www.zim-wiki.org/downloads/${pkgname}-${pkgver}.tar.gz
+        diff_704.patch)
+md5sums=('7318568b9e0ef69d0fb2ff77754b72ac'
+         '76a5ee4536e4fcd22bedfc2633f5c726')
 
+prepare() {
+	cd ${srcdir}/${pkgname}-${pkgver}
+
+	patch -p0 -i "$srcdir/diff_704.patch"
+}
+
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 

Added: diff_704.patch
===================================================================
--- diff_704.patch	                        (rev 0)
+++ diff_704.patch	2014-09-25 10:48:38 UTC (rev 119567)
@@ -0,0 +1,15 @@
+=== modified file 'zim/www.py'
+--- zim/www.py	2014-07-21 20:03:15 +0000
++++ zim/www.py	2014-08-21 09:06:34 +0000
+@@ -119,6 +119,10 @@
+ 		self.config = config or ConfigManager(profile=notebook.profile)
+ 
+ 		self.output = None
++
++		if template is None:
++			template = 'Default'
++
+ 		if isinstance(template, basestring):
+ 			from zim.templates import get_template
+ 			self.template = get_template('html', template)
+