summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter2012-11-03 05:28:00 +0000
committerJohannes Dewender2012-11-03 05:28:00 +0000
commit61c7d483f1c0b4605c805f1e279688433095265c (patch)
treef320536c9445e9f4c5dc061c98d354e5ace0dabb
parent52b3ec1e7b2760919e818ed0f48cff6686d7b862 (diff)
downloadaur-61c7d483f1c0b4605c805f1e279688433095265c.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 641913297ef0..15bd097a49fc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,7 +14,11 @@ pkgbase = bzr-gtk
optdepends = pygtksourceview2: Syntax-highlighted diffs
optdepends = python2-nautilus: Nautilus integration
source = https://launchpad.net/bzr-gtk/gtk3/0.104.0/+download/bzr-gtk-0.104.0.tar.gz
+ source = bzr_handle_patch_open_display.patch
+ source = bzr_notify_open_display.patch
md5sums = 5e6694b57662c338d5eb2d85d4cd2357
+ md5sums = 384f7ad2131b581342566fa78d041c85
+ md5sums = 3aaf3786033d97f488425aa718d7d314
pkgname = bzr-gtk
diff --git a/PKGBUILD b/PKGBUILD
index 9bc2c209c184..9cc3956d8903 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,6 +18,12 @@ makedepends=('bzr-stats')
source=("https://launchpad.net/bzr-gtk/gtk3/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
md5sums=('5e6694b57662c338d5eb2d85d4cd2357')
+source+=(bzr_handle_patch_open_display.patch bzr_notify_open_display.patch)
+md5sums+=(
+ '384f7ad2131b581342566fa78d041c85'
+ '3aaf3786033d97f488425aa718d7d314'
+)
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -31,4 +37,3 @@ build() {
python2 setup.py build_credits
python2 setup.py install --prefix'=/usr' --root="${startdir}/pkg"
}
-
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()