summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter2012-11-03 05:28:00 +0000
committerJohannes Dewender2012-11-03 05:28:00 +0000
commit8293c7261a9cb550ee785293f1f7aef4e240710b (patch)
tree8c94316c1a30f78fc4e753cb11f0a18646c10b69
parentb9ec6bf3bf405c866febc9eb231deb8ac3644e6c (diff)
downloadaur-8293c7261a9cb550ee785293f1f7aef4e240710b.tar.gz
Restore missing patch files and add to $source list
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
-rw-r--r--bzr_handle_patch_open_display.patch12
-rw-r--r--bzr_notify_open_display.patch13
4 files changed, 35 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 08835a0b081c..8f8559edb7f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,11 @@ pkgbase = bzr-gtk
depends = pycairo
depends = libglade
source = https://launchpad.net/bzr-gtk/gtk2/0.100.0/+download/bzr-gtk-0.100.0.tar.gz
+ source = bzr_handle_patch_open_display.patch
+ source = bzr_notify_open_display.patch
md5sums = a7c2f27072bcacdcf8983ca6a2426dbd
+ md5sums = 384f7ad2131b581342566fa78d041c85
+ md5sums = 3aaf3786033d97f488425aa718d7d314
pkgname = bzr-gtk
diff --git a/PKGBUILD b/PKGBUILD
index e41bd7e41187..09ceed5051dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,6 +11,12 @@ depends=('pygtk' 'bzr' 'pycairo' 'libglade')
source=("https://launchpad.net/bzr-gtk/gtk2/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
md5sums=('a7c2f27072bcacdcf8983ca6a2426dbd')
+source+=(bzr_handle_patch_open_display.patch bzr_notify_open_display.patch)
+md5sums+=(
+ '384f7ad2131b581342566fa78d041c85'
+ '3aaf3786033d97f488425aa718d7d314'
+)
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -28,4 +34,3 @@ build() {
cd "${startdir}/src/${pkgname}-${pkgver}/"
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()