diff options
author | Luca Weiss | 2017-11-06 22:10:20 +0100 |
---|---|---|
committer | Luca Weiss | 2017-11-06 22:10:59 +0100 |
commit | 309d9f0ab6bd43cc1758ffb66e55b8da8dd1bf67 (patch) | |
tree | 4b5a38c9edbe2c0b16f54589a90765d5885563e8 | |
parent | b7d95135a6a1dea088db08735c8ab1ed44f71f77 (diff) | |
download | aur-309d9f0ab6bd43cc1758ffb66e55b8da8dd1bf67.tar.gz |
Revert "Try to work around a python unicode error, caused by gtk-doc"
This reverts commit b7d95135a6a1dea088db08735c8ab1ed44f71f77.
Also bump pkgrel again
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 17 | ||||
-rw-r--r-- | gtk-doc.patch | 11 |
3 files changed, 7 insertions, 25 deletions
@@ -1,7 +1,7 @@ pkgbase = dee pkgdesc = Model to synchronize multiple instances over DBus. pkgver = 1.2.7 - pkgrel = 10 + pkgrel = 11 url = https://launchpad.net/dee arch = i686 arch = x86_64 @@ -13,10 +13,8 @@ pkgbase = dee depends = icu source = https://launchpad.net/dee/1.0/1.2.7/+download/dee-1.2.7.tar.gz source = https://launchpadlibrarian.net/258481465/fix-misleading-indentation.patch - source = gtk-doc.patch sha256sums = 1bf0336ce684aa0f48d6eae2469628c1a9b43695a77443bc31a5790aa673bf8a sha256sums = 3bf75bd632d6be88632c0f6113aac5ac5d65e1a01b408c27ea1fd7bb718d6ebd - sha256sums = 38f9fbccce0b618595a992785a4a6a8650031bd0974b15f7c88e91046cb014a0 pkgname = dee @@ -4,7 +4,7 @@ pkgname=dee pkgver=1.2.7 -pkgrel=10 +pkgrel=11 pkgdesc="Model to synchronize multiple instances over DBus." arch=("i686" "x86_64") url="https://launchpad.net/dee" @@ -12,23 +12,18 @@ license=("LGPL") depends=("glib2" "icu") makedepends=("gobject-introspection" "python2" "vala") source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz" - "https://launchpadlibrarian.net/258481465/fix-misleading-indentation.patch" - "gtk-doc.patch") + "https://launchpadlibrarian.net/258481465/fix-misleading-indentation.patch") sha256sums=('1bf0336ce684aa0f48d6eae2469628c1a9b43695a77443bc31a5790aa673bf8a' - '3bf75bd632d6be88632c0f6113aac5ac5d65e1a01b408c27ea1fd7bb718d6ebd' - '38f9fbccce0b618595a992785a4a6a8650031bd0974b15f7c88e91046cb014a0') + '3bf75bd632d6be88632c0f6113aac5ac5d65e1a01b408c27ea1fd7bb718d6ebd') prepare() { - cd $pkgname-$pkgver - patch -Np2 < "$srcdir"/fix-misleading-indentation.patch - patch -Np1 < "$srcdir"/gtk-doc.patch + cd $srcdir + patch -p1 -i $srcdir/fix-misleading-indentation.patch } build() { - cd $pkgname-$pkgver + cd ${pkgname}-${pkgver} export PYTHON="/usr/bin/python2" - aclocal - automake ./configure --prefix="/usr" --sysconfdir="/etc" --localstatedir="/var" --disable-{static,tests} make } diff --git a/gtk-doc.patch b/gtk-doc.patch deleted file mode 100644 index 1ee725578cc5..000000000000 --- a/gtk-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtk-doc.make 2017-11-03 09:39:07.403680715 +0100 -+++ b/gtk-doc.make 2017-11-03 09:39:40.387188057 +0100 -@@ -266,7 +266,7 @@ - mv -f $${installdir}/$(DOC_MODULE).devhelp2 \ - $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp2; \ - fi; \ -- $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ -+ env LANG=en_US.UTF-8 $(GTKDOC_REBASE) --verbose --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ - fi - - uninstall-local: |