[arch-commits] Commit in zim/repos/community-any (5 files)
Florian Pritz
bluewind at archlinux.org
Thu Sep 25 10:48:42 UTC 2014
Date: Thursday, September 25, 2014 @ 12:48:42
Author: bluewind
Revision: 119568
archrelease: copy trunk to community-any
Added:
zim/repos/community-any/PKGBUILD
(from rev 119567, zim/trunk/PKGBUILD)
zim/repos/community-any/diff_704.patch
(from rev 119567, zim/trunk/diff_704.patch)
zim/repos/community-any/zim.install
(from rev 119567, zim/trunk/zim.install)
Deleted:
zim/repos/community-any/PKGBUILD
zim/repos/community-any/zim.install
----------------+
PKGBUILD | 98 +++++++++++++++++++++++++++++--------------------------
diff_704.patch | 15 ++++++++
zim.install | 42 +++++++++++------------
3 files changed, 89 insertions(+), 66 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-25 10:48:38 UTC (rev 119567)
+++ PKGBUILD 2014-09-25 10:48:42 UTC (rev 119568)
@@ -1,45 +0,0 @@
-# $Id$
-# Maintainer: Florian Pritz <bluewind at xinu.at>
-# Contributor: Kevin Piche <kevin at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=zim
-pkgver=0.61
-pkgrel=1
-pkgdesc="A WYSIWYG text editor that aims at bringing the concept of a wiki to the desktop."
-arch=(any)
-license=('GPL' 'PerlArtistic')
-url="http://zim-wiki.org/"
-depends=('pygtk' 'ttf-dejavu')
-optdepends=('bzr: Version Control plugin'
- 'git: Version Control plugin'
- 'mercurial: Version Control plugin'
- 'gnuplot: Insert Gnuplot plugin'
- 'ditaa: Insert Ditaa plugin'
- 'graphviz: Insert Diagram & Link Map plugins'
- 'python2-gtkspell: Spell Checker plugin'
- 'r: Insert GNU R Plot plugin'
- 'scrot: Insert Screenshot plugin'
- 'libzeitgeist: Log events with Zeitgeist plugin'
- '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')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # python2 fixes
- for file in zim/inc/xdot.py zim/_version.py; do
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- done
-
- sed -i 's|\t\tinstall_class.run(self)|&\n\t\treturn None|' setup.py
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- python2 setup.py install --root=${pkgdir} --optimize=1
-}
Copied: zim/repos/community-any/PKGBUILD (from rev 119567, zim/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2014-09-25 10:48:42 UTC (rev 119568)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Florian Pritz <bluewind at xinu.at>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=zim
+pkgver=0.61
+pkgrel=2
+pkgdesc="A WYSIWYG text editor that aims at bringing the concept of a wiki to the desktop."
+arch=(any)
+license=('GPL' 'PerlArtistic')
+url="http://zim-wiki.org/"
+depends=('pygtk' 'ttf-dejavu')
+optdepends=('bzr: Version Control plugin'
+ 'git: Version Control plugin'
+ 'mercurial: Version Control plugin'
+ 'gnuplot: Insert Gnuplot plugin'
+ 'ditaa: Insert Ditaa plugin'
+ 'graphviz: Insert Diagram & Link Map plugins'
+ 'python2-gtkspell: Spell Checker plugin'
+ 'r: Insert GNU R Plot plugin'
+ 'scrot: Insert Screenshot plugin'
+ 'libzeitgeist: Log events with Zeitgeist plugin'
+ 'lilypond: Insert Score plugin'
+ 'texlive-bin: Insert Equation plugin')
+install=zim.install
+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}
+
+ # python2 fixes
+ for file in zim/inc/xdot.py zim/_version.py; do
+ sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+ done
+
+ sed -i 's|\t\tinstall_class.run(self)|&\n\t\treturn None|' setup.py
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ python2 setup.py install --root=${pkgdir} --optimize=1
+}
Copied: zim/repos/community-any/diff_704.patch (from rev 119567, zim/trunk/diff_704.patch)
===================================================================
--- diff_704.patch (rev 0)
+++ diff_704.patch 2014-09-25 10:48:42 UTC (rev 119568)
@@ -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)
+
Deleted: zim.install
===================================================================
--- zim.install 2014-09-25 10:48:38 UTC (rev 119567)
+++ zim.install 2014-09-25 10:48:42 UTC (rev 119568)
@@ -1,21 +0,0 @@
-updatedesktopdtb() {
- [ -x /usr/bin/update-desktop-database ] \
- && update-desktop-database -q
- [ -x /usr/bin/update-mime-database ] \
- && update-mime-database usr/share/mime > /dev/null 2>&1
-}
-
-post_install() {
- updatedesktopdtb
- echo
- echo " >>> zim package need a browser to work properly"
- echo " >>> you can choose a browser like firefox, chromium, konqueror, ..."
-}
-
-post_upgrade() {
- updatedesktopdtb
-}
-
-post_remove() {
- updatedesktopdtb
-}
Copied: zim/repos/community-any/zim.install (from rev 119567, zim/trunk/zim.install)
===================================================================
--- zim.install (rev 0)
+++ zim.install 2014-09-25 10:48:42 UTC (rev 119568)
@@ -0,0 +1,21 @@
+updatedesktopdtb() {
+ [ -x /usr/bin/update-desktop-database ] \
+ && update-desktop-database -q
+ [ -x /usr/bin/update-mime-database ] \
+ && update-mime-database usr/share/mime > /dev/null 2>&1
+}
+
+post_install() {
+ updatedesktopdtb
+ echo
+ echo " >>> zim package need a browser to work properly"
+ echo " >>> you can choose a browser like firefox, chromium, konqueror, ..."
+}
+
+post_upgrade() {
+ updatedesktopdtb
+}
+
+post_remove() {
+ updatedesktopdtb
+}
More information about the arch-commits
mailing list