enable parallel builds

Suggested in #15. Not tested yet.

3 files changed, 26 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2bf359ed6d7..a3a8edde7938 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = webkitgtk
 	pkgdesc = Legacy Web content engine
 	pkgver = 2.4.11
-	pkgrel = 7
+	pkgrel = 10
 	url = https://webkitgtk.org/
 	install = webkitgtk.install
 	arch = i686
@@ -18,7 +18,7 @@ pkgbase = webkitgtk
 	depends = libxslt
 	depends = sqlite
 	depends = libsoup
-	depends = enchant
+	depends = enchant>=2.2
 	depends = libgl
 	depends = geoclue2
 	depends = gst-plugins-base-libs
@@ -33,10 +33,12 @@ pkgbase = webkitgtk
 	source = webkitgtk-2.4.9-abs.patch
 	source = icu59.patch
 	source = enchant-2.x.patch
+	source = pkgconfig-enchant-2.patch
 	sha256sums = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
 	sha256sums = ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70
 	sha256sums = eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d
 	sha256sums = 81a4ad1c921bece16edb9a3cb187096fd8f336db8b89114356119a86f26e3d6d
+	sha256sums = df8284004f25d189184aab1009df696c915212e0e439a555dbd0dbec06111e2e
 
 pkgname = webkitgtk
 	pkgdesc = Legacy Web content engine for GTK+ 3
@@ -44,7 +46,7 @@ pkgname = webkitgtk
 	depends = libxslt
 	depends = sqlite
 	depends = libsoup
-	depends = enchant
+	depends = enchant>=2.2
 	depends = libgl
 	depends = geoclue2
 	depends = gst-plugins-base-libs
@@ -69,7 +71,7 @@ pkgname = webkitgtk2
 	depends = libxslt
 	depends = sqlite
 	depends = libsoup
-	depends = enchant
+	depends = enchant>=2.2
 	depends = libgl
 	depends = geoclue2
 	depends = gst-plugins-base-libs
diff --git a/PKGBUILD b/PKGBUILD
index 866bc36f9163..b7f925ef4aea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
 pkgbase=webkitgtk
 pkgname=(webkitgtk webkitgtk2)
 pkgver=2.4.11
-pkgrel=7
+pkgrel=10
 pkgdesc="Legacy Web content engine"
 arch=(i686 x86_64)
 url="https://webkitgtk.org/"
 license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue2 gst-plugins-base-libs
+depends=(libxt libxslt sqlite libsoup 'enchant>=2.2' libgl geoclue2 gst-plugins-base-libs
          libsecret libwebp harfbuzz-icu)
 makedepends=(gtk3 gtk2 gperf gobject-introspection python2 mesa ruby)
 optdepends=('gst-plugins-base: free media decoding'
@@ -20,11 +20,13 @@ install=webkitgtk.install
 source=(https://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
         webkitgtk-2.4.9-abs.patch
         icu59.patch
-        enchant-2.x.patch)
+        enchant-2.x.patch
+        pkgconfig-enchant-2.patch)
 sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
             'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70'
             'eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d'
-            '81a4ad1c921bece16edb9a3cb187096fd8f336db8b89114356119a86f26e3d6d')
+            '81a4ad1c921bece16edb9a3cb187096fd8f336db8b89114356119a86f26e3d6d'
+            'df8284004f25d189184aab1009df696c915212e0e439a555dbd0dbec06111e2e')
 
 prepare() {
   mkdir build-gtk{,2} path
@@ -34,6 +36,8 @@ prepare() {
   patch -Np1 -i ../webkitgtk-2.4.9-abs.patch
   patch -Np1 -i ../icu59.patch
   patch -Np1 -i ../enchant-2.x.patch
+  # https://www.archlinux.org/todo/enchant-221-rebuild/
+  patch -Np1 -i ../pkgconfig-enchant-2.patch
 }
 
 _build() (
@@ -58,7 +62,7 @@ _build() (
   # https://bugzilla.gnome.org/show_bug.cgi?id=655517
   sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
 
-  make all stamp-po
+  make -j$(nproc) all stamp-po
 )
 
 build() {
diff --git a/pkgconfig-enchant-2.patch b/pkgconfig-enchant-2.patch
new file mode 100644
index 000000000000..f315f661be35
--- /dev/null
+++ b/pkgconfig-enchant-2.patch
@@ -0,0 +1,11 @@
+--- webkitgtk-2.4.11/Source/autotools/FindDependencies.m4.orig	2018-01-19 23:47:23.866875328 +0800
++++ webkitgtk-2.4.11/Source/autotools/FindDependencies.m4	2018-01-19 23:47:34.543576202 +0800
+@@ -154,7 +154,7 @@
+ AC_SUBST(PANGO_LIBS)
+ 
+ if test "$enable_spellcheck" = "yes"; then
+-    PKG_CHECK_MODULES(ENCHANT, enchant >= enchant_required_version, [], [enable_spellcheck="no"])
++    PKG_CHECK_MODULES(ENCHANT, enchant-2 >= enchant_required_version, [], [enable_spellcheck="no"])
+     AC_SUBST(ENCHANT_CFLAGS)
+     AC_SUBST(ENCHANT_LIBS)
+ fi