Try to work around a python unicode error, caused by gtk-doc

3 files changed, 25 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 50461f103c67..f18baaa806dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Tue Jul 19 10:31:14 UTC 2016
 pkgbase = dee
 	pkgdesc = Model to synchronize multiple instances over DBus.
 	pkgver = 1.2.7
-	pkgrel = 9
+	pkgrel = 10
 	url = https://launchpad.net/dee
 	arch = i686
 	arch = x86_64
@@ -15,8 +13,10 @@ 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
 
diff --git a/PKGBUILD b/PKGBUILD
index 8073e977e950..a479fdc5dec9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=dee
 pkgver=1.2.7
-pkgrel=9
+pkgrel=10
 pkgdesc="Model to synchronize multiple instances over DBus."
 arch=("i686" "x86_64")
 url="https://launchpad.net/dee"
@@ -12,18 +12,23 @@ 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")
+        "https://launchpadlibrarian.net/258481465/fix-misleading-indentation.patch"
+        "gtk-doc.patch")
 sha256sums=('1bf0336ce684aa0f48d6eae2469628c1a9b43695a77443bc31a5790aa673bf8a'
-            '3bf75bd632d6be88632c0f6113aac5ac5d65e1a01b408c27ea1fd7bb718d6ebd')
+            '3bf75bd632d6be88632c0f6113aac5ac5d65e1a01b408c27ea1fd7bb718d6ebd'
+            '38f9fbccce0b618595a992785a4a6a8650031bd0974b15f7c88e91046cb014a0')
 
 prepare() {
-  cd $srcdir
-  patch -p1 -i $srcdir/fix-misleading-indentation.patch
+	cd $pkgname-$pkgver
+	patch -Np2 < "$srcdir"/fix-misleading-indentation.patch
+	patch -Np1 < "$srcdir"/gtk-doc.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
new file mode 100644
index 000000000000..1ee725578cc5
--- /dev/null
+++ b/gtk-doc.patch
@@ -0,0 +1,11 @@
+--- 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: