diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-05 16:55:33 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-05 16:55:33 +0200 |
| commit | 295a0c10b8148abf85cd84483ba2280285975b3b (patch) | |
| tree | efc182c3f93cee521835a53b6cacd6227c65b788 | |
| parent | 889e7389bc412de1da7ec9057d31e72457f098be (diff) | |
Add a patch based on an upstream commit to fix python-telepathy.
| -rw-r--r-- | extra/python-telepathy/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/python-telepathy/telepathy-python-generated-errors.patch | 18 |
2 files changed, 24 insertions, 2 deletions
diff --git a/extra/python-telepathy/PKGBUILD b/extra/python-telepathy/PKGBUILD index 9b1b9f5eb..e518e21ff 100644 --- a/extra/python-telepathy/PKGBUILD +++ b/extra/python-telepathy/PKGBUILD @@ -10,11 +10,15 @@ url="http://telepathy.freedesktop.org" license=('LGPL') depends=('dbus-python') makedepends=('libxslt') -source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz) -md5sums=('f7ca25ab3c88874015b7e9728f7f3017') +source=(http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-${pkgver}.tar.gz + telepathy-python-generated-errors.patch) +md5sums=('f7ca25ab3c88874015b7e9728f7f3017' + '2dfa69cd0548661dbbb5ae53b1c19e0f') build() { cd "${srcdir}/telepathy-python-${pkgver}" + patch -Np1 -i "$srcdir/telepathy-python-generated-errors.patch" + autoreconf ./configure --prefix=/usr make } diff --git a/extra/python-telepathy/telepathy-python-generated-errors.patch b/extra/python-telepathy/telepathy-python-generated-errors.patch new file mode 100644 index 000000000..d52861d89 --- /dev/null +++ b/extra/python-telepathy/telepathy-python-generated-errors.patch @@ -0,0 +1,18 @@ +diff --git a/src/Makefile.am b/src/Makefile.am +index 135f2f0..ede1fc3 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -13,10 +13,12 @@ telepathy_PYTHON = \ + spec_dir = $(top_srcdir)/spec + spec_files := $(patsubst $(spec_dir)%.xml,_generated%.py,$(wildcard $(spec_dir)/*.xml)) + ++# We leave _generated/errors.py out of here because there exists a ++# spec/errors.xml file, so that means there'll be a ++# _generated/errors.py in $(spec_files). See fd.o#32526 + BUILT_SOURCES = \ + _generated/interfaces.py \ + _generated/constants.py \ +- _generated/errors.py \ + _generated/__init__.py \ + $(spec_files) + |