summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Zanini2011-04-02 10:30:49 +0000
committerJohannes Dewender2011-04-02 10:30:49 +0000
commitd00b9f83f0ccfe0973cbff7492b723a112c11136 (patch)
tree061f2916d313493c02fb8445e9aa231a2668f7d1
parentb10600264ccd0dacb16cbc0a8c74933419d4caba (diff)
downloadaur-d00b9f83f0ccfe0973cbff7492b723a112c11136.tar.gz
new mantainer, updated to version 0.100, including two patches to be implemented
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD20
-rw-r--r--bzr_handle_patch_open_display.patch12
-rw-r--r--bzr_notify_open_display.patch13
4 files changed, 45 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0ffa4b14265a..43b422cb3e20 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = bzr-gtk
pkgdesc = Plugin for Bazaar that aims to provide GTK+ interfaces to most Bazaar operations.
- pkgver = 0.98.0
+ pkgver = 0.100.0
pkgrel = 1
url = http://bazaar-vcs.org/bzr-gtk
arch = i686
@@ -10,8 +10,8 @@ pkgbase = bzr-gtk
depends = bzr
depends = pycairo
depends = libglade
- source = http://edge.launchpad.net/bzr-gtk/trunk/0.98.0/+download/bzr-gtk-0.98.0.tar.gz
- md5sums = a14ac163a88beb38106f6610a6441529
+ source = http://edge.launchpad.net/bzr-gtk/trunk/0.100.0/+download/bzr-gtk-0.100.0.tar.gz
+ md5sums = a7c2f27072bcacdcf8983ca6a2426dbd
pkgname = bzr-gtk
diff --git a/PKGBUILD b/PKGBUILD
index 5be15c9aa292..d1c853244eb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
# Contributor: Javier ‘Phrodo_00‘ Aravena <phrodo.00@gmail.com>
+# Mantainer: iosonofabio Fabio Zanini <fabio.zanini@fastmail.fm>
pkgname=bzr-gtk
-pkgver=0.98.0
+pkgver=0.100.0
pkgrel=1
pkgdesc="Plugin for Bazaar that aims to provide GTK+ interfaces to most Bazaar operations."
arch=('i686' 'x86_64')
@@ -8,10 +9,23 @@ url="http://bazaar-vcs.org/bzr-gtk"
license=('GPL')
depends=('pygtk' 'bzr' 'pycairo' 'libglade')
source=("http://edge.launchpad.net/bzr-gtk/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a14ac163a88beb38106f6610a6441529')
+md5sums=('a7c2f27072bcacdcf8983ca6a2426dbd')
build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ # Replace python with python2
+ for file in $(find ./ -name '*.py' -print); do
+ sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
+ sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
+ done
+
+ # Correct open_display bug
+ patch <"${startdir}/bzr_notify_open_display.patch"
+ patch <"${startdir}/bzr_handle_patch_open_display.patch"
+
+
cd "${startdir}/src/${pkgname}-${pkgver}/"
- python setup.py install --prefix'=/usr' --root="${startdir}/pkg" || return 1
+ python2 setup.py install --prefix'=/usr' --root="${startdir}/pkg" || return 1
}
diff --git a/bzr_handle_patch_open_display.patch b/bzr_handle_patch_open_display.patch
new file mode 100644
index 000000000000..eaa1fca273fa
--- /dev/null
+++ b/bzr_handle_patch_open_display.patch
@@ -0,0 +1,12 @@
+--- src/bzr-gtk-0.100.0/bzr-handle-patch 2011-03-02 15:47:00.000000000 +0100
++++ src/bzr-gtk-0.100.0/bzr-handle-patchNew 2011-04-02 11:32:51.000000000 +0200
+@@ -2,7 +2,8 @@
+
+ from bzrlib import errors, merge_directive
+ from bzrlib.plugin import load_plugins
+-from bzrlib.plugins.gtk import open_display
++from bzrlib.plugins.gtk.commands import open_display
++
+ load_plugins()
+
+ import sys
diff --git a/bzr_notify_open_display.patch b/bzr_notify_open_display.patch
new file mode 100644
index 000000000000..9bfe42b25b18
--- /dev/null
+++ b/bzr_notify_open_display.patch
@@ -0,0 +1,13 @@
+--- src/bzr-gtk-0.100.0/bzr-notify 2011-04-02 11:24:00.000000000 +0200
++++ src/bzr-gtk-0.100.0/bzr-notifyNew 2011-04-02 11:27:56.000000000 +0200
+@@ -9,7 +9,9 @@ screen when a commit occurs.
+ from bzrlib.plugin import load_plugins
+ load_plugins()
+
+-from bzrlib.plugins.gtk import open_display, icon_path
++from bzrlib.plugins.gtk.commands import open_display
++from bzrlib.plugins.gtk import icon_path
++
+
+ from bzrlib.plugins.gtk.notify import NotifyPopupMenu
+ gtk = open_display()