summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Dewender2015-06-15 19:08:44 +0200
committerJohannes Dewender2015-06-15 19:08:44 +0200
commit1d3c0453f60c8356b2b3784ad1638618e2479372 (patch)
tree50fafe18814d89c969bd2d90422e0277cb161178
parent68a091f2d8c2aeda49ac94284967d453ec8bc450 (diff)
downloadaur-1d3c0453f60c8356b2b3784ad1638618e2479372.tar.gz
bzr-gtk-bzr: + no_credits.patch to fix build
This is only a workaround. Reported upstream: https://bugs.launchpad.net/bzr-gtk/+bug/1465339
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
-rw-r--r--no_credits.patch27
3 files changed, 37 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 05cd5ac4b41f..b433db93a3db 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bzr-gtk-bzr
pkgdesc = Plugin for Bazaar that aims to provide GTK+ interfaces to most Bazaar operations. It downloads source from launchpad bazaar repository, using the last commit.
pkgver = 20110404
- pkgrel = 1
+ pkgrel = 2
url = http://bazaar-vcs.org/bzr-gtk
arch = i686
arch = x86_64
@@ -13,6 +13,8 @@ pkgbase = bzr-gtk-bzr
depends = bzr-stats
provides = bzr-gtk
conflicts = bzr-gtk
+ source = no_credits.patch
+ sha256sums = de6273817a433d3c2e64ed0f8339c7a3cdc60fec60772a6d57b4c14f94cb2cdf
pkgname = bzr-gtk-bzr
diff --git a/PKGBUILD b/PKGBUILD
index 17db1debb1e9..775d89df0a14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
-# Submitter: Carlos Eduardo Moreira dos Santos (cemsbr) <cems at domain cemshost.com.br>
+# Contributor: Johannes Dewender arch at JonnyJD dot net
+# Contributor: iosonofabio Fabio Zanini <fabio.zanini@fastmail.fm>
# Contributor: Javier ‘Phrodo_00‘ Aravena <phrodo.00@gmail.com>
-# Mantainer: iosonofabio Fabio Zanini <fabio.zanini@fastmail.fm>
+# Submitter: Carlos Eduardo Moreira dos Santos (cemsbr) <cems at domain cemshost.com.br>
pkgname=bzr-gtk-bzr
pkgver=20110404
-pkgrel=1
+pkgrel=2
pkgdesc="Plugin for Bazaar that aims to provide GTK+ interfaces to most Bazaar operations. It downloads source from launchpad bazaar repository, using the last commit."
arch=('i686' 'x86_64')
url="http://bazaar-vcs.org/bzr-gtk"
@@ -12,6 +13,8 @@ license=('GPL')
depends=('pygtk' 'bzr' 'pycairo' 'libglade' 'bzr-stats')
provides=('bzr-gtk')
conflicts=('bzr-gtk')
+source=('no_credits.patch')
+sha256sums=('de6273817a433d3c2e64ed0f8339c7a3cdc60fec60772a6d57b4c14f94cb2cdf')
_bzrname="bzr-gtk"
@@ -35,6 +38,7 @@ build() {
sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
done
+ patch -p0 < ../no_credits.patch
msg "Ready to install..."
diff --git a/no_credits.patch b/no_credits.patch
new file mode 100644
index 000000000000..b95c9bb9e71a
--- /dev/null
+++ b/no_credits.patch
@@ -0,0 +1,27 @@
+=== modified file 'setup.py'
+--- setup.py 2012-07-09 15:23:26 +0000
++++ setup.py 2015-06-15 16:57:40 +0000
+@@ -104,12 +104,10 @@
+
+ class BuildData(build):
+ sub_commands = build.sub_commands[:]
+- sub_commands.append(('build_credits', is_versioned))
+
+
+ class SourceDist(sdist):
+ sub_commands = sdist.sub_commands[:]
+- sub_commands.append(('build_credits', is_versioned))
+
+
+ class InstallData(install_data):
+@@ -166,8 +164,7 @@
+ "bzrlib.plugins.gtk.branchview",
+ "bzrlib.plugins.gtk.preferences",
+ ],
+- data_files=[('share/bzr-gtk', ['credits.pickle']),
+- ('share/bzr-gtk/icons', ['icons/commit.png',
++ data_files=[('share/bzr-gtk/icons', ['icons/commit.png',
+ 'icons/commit16.png',
+ 'icons/diff.png',
+ 'icons/diff16.png',
+