From a9614b3671b0752711045826f9236ef3acec8ecd Mon Sep 17 00:00:00 2001
From: Freemor <freemor@freemor.ca>
Date: Mon, 5 Aug 2019 13:21:19 -0300
Subject: D'oh, put the packages for that update in the right place.

---
 enchant-2.patch              | 29 -----------------------------
 pcr/gtkhtml4/PKGBUILD        | 37 +++++++++++++++++++++++--------------
 pcr/gtkhtml4/enchant-2.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 43 deletions(-)
 delete mode 100644 enchant-2.patch
 create mode 100644 pcr/gtkhtml4/enchant-2.patch

diff --git a/enchant-2.patch b/enchant-2.patch
deleted file mode 100644
index 88a9d2c82..000000000
--- a/enchant-2.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Switch checks and functions for enchant-2
- Existing sources check for and expect enchant-1. This patch switched the
- pkg-config check to check for enchant-2, and updates one function to the
- enchant-2 version.
-Author: Jonathon Fernyhough <jonathon at_manjaro_dot org>
-
---- configure.ac	2018-02-24 10:33:32.311420000 +0000
-+++ configure.ac	2018-02-24 10:32:33.630608000 +0000
-@@ -140,7 +140,7 @@ AC_SUBST(GAIL_MODULES)
- dnl **********************************
- dnl GTKHTML modules
- dnl **********************************
--GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version"
-+GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant-2 >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version"
- PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
- AC_SUBST(GTKHTML_CFLAGS)
- AC_SUBST(GTKHTML_LIBS)
-
---- components/editor/gtkhtml-spell-checker.c	2018-02-24 10:36:50.592732000 +0000
-+++ components/editor/gtkhtml-spell-checker.c	2018-02-24 10:41:41.450950010 +0000
-@@ -375,7 +375,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlS
- 	if ((dict = spell_checker_request_dict (checker)) == NULL)
- 		return;
- 
--	enchant_dict_add_to_pwl (dict, word, length);
-+	enchant_dict_add (dict, word, length);
- 	g_signal_emit (G_OBJECT (checker), signals[ADDED], 0, word, length);
- }
- 
diff --git a/pcr/gtkhtml4/PKGBUILD b/pcr/gtkhtml4/PKGBUILD
index e6a28cb16..5c0dab54e 100644
--- a/pcr/gtkhtml4/PKGBUILD
+++ b/pcr/gtkhtml4/PKGBUILD
@@ -1,28 +1,37 @@
-# Maintainer: Luke R. <g4jc@openmailbox.org> GPG: rsa4096/3EAE8697
-# Previous Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
+# Maintainer (AUR): Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Freemor <freemor@freemor.ca
 
 pkgname=gtkhtml4
 _pkgbasename=gtkhtml
 pkgver=4.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight HTML renderer/editor widget for GTK3"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64' 'armv7h')
 license=('GPL')
-depends=('gtk3' 'enchant' 'iso-codes' 'libsoup')
+depends=('gtk3' 'enchant' 'iso-codes' 'python')
 makedepends=('intltool')
 url="http://www.gnome.org"
-source=(https://download.gnome.org/sources/$_pkgbasename/${pkgver:0:4}/$_pkgbasename-$pkgver.tar.xz)
-sha256sums=('ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3')
+source=(https://download.gnome.org/sources/$_pkgbasename/${pkgver:0:4}/$_pkgbasename-$pkgver.tar.xz enchant-2.patch)
+sha256sums=('ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3'
+            '2b78f071f7893e19618959443f3775bd435941a37ea9198b2fe72b596c205891')
+
+prepare() {
+  cd "$_pkgbasename-$pkgver"
+  patch -Np0 < ../enchant-2.patch
+}
 
 build() {
-    cd "$_pkgbasename-$pkgver"
-    ./configure --prefix=/usr --sysconfdir=/etc \
-        --libexecdir=/usr/lib/gtkhtml4 \
-        --localstatedir=/var --disable-static
-    make
+  cd "$_pkgbasename-$pkgver"
+  autoreconf -i
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/gtkhtml4 \
+              --localstatedir=/var --disable-static
+  make
 }
 
 package() {
-    cd "$_pkgbasename-$pkgver"
-    make DESTDIR="$pkgdir" install
+  cd "$_pkgbasename-$pkgver"
+  make DESTDIR="$pkgdir" install
 }
+
diff --git a/pcr/gtkhtml4/enchant-2.patch b/pcr/gtkhtml4/enchant-2.patch
new file mode 100644
index 000000000..88a9d2c82
--- /dev/null
+++ b/pcr/gtkhtml4/enchant-2.patch
@@ -0,0 +1,29 @@
+Description: Switch checks and functions for enchant-2
+ Existing sources check for and expect enchant-1. This patch switched the
+ pkg-config check to check for enchant-2, and updates one function to the
+ enchant-2 version.
+Author: Jonathon Fernyhough <jonathon at_manjaro_dot org>
+
+--- configure.ac	2018-02-24 10:33:32.311420000 +0000
++++ configure.ac	2018-02-24 10:32:33.630608000 +0000
+@@ -140,7 +140,7 @@ AC_SUBST(GAIL_MODULES)
+ dnl **********************************
+ dnl GTKHTML modules
+ dnl **********************************
+-GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version"
++GTKHTML_MODULES="gtk+-3.0 >= gtk_minimum_version enchant-2 >= enchant_minimum_version gsettings-desktop-schemas iso-codes cairo >= cairo_minimum_version"
+ PKG_CHECK_MODULES(GTKHTML, $GTKHTML_MODULES)
+ AC_SUBST(GTKHTML_CFLAGS)
+ AC_SUBST(GTKHTML_LIBS)
+
+--- components/editor/gtkhtml-spell-checker.c	2018-02-24 10:36:50.592732000 +0000
++++ components/editor/gtkhtml-spell-checker.c	2018-02-24 10:41:41.450950010 +0000
+@@ -375,7 +375,7 @@ gtkhtml_spell_checker_add_word (GtkhtmlS
+ 	if ((dict = spell_checker_request_dict (checker)) == NULL)
+ 		return;
+ 
+-	enchant_dict_add_to_pwl (dict, word, length);
++	enchant_dict_add (dict, word, length);
+ 	g_signal_emit (G_OBJECT (checker), signals[ADDED], 0, word, length);
+ }
+ 
-- 
cgit v1.2.2