[arch-commits] Commit in webkit2gtk/trunk (PKGBUILD enchant-2.diff)

[Jan Steffens]

    Date: Thursday, January 18, 2018 @ 10:24:35
  Author: heftig
Revision: 315068

2.18.5-2: enchant 2.2

Added:
  webkit2gtk/trunk/enchant-2.diff
Modified:
  webkit2gtk/trunk/PKGBUILD

----------------+
 PKGBUILD       |   12 +++++++++---
 enchant-2.diff |   21 +++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-18 09:43:40 UTC (rev 315067)
+++ PKGBUILD	2018-01-18 10:24:35 UTC (rev 315068)
@@ -3,7 +3,7 @@
 
 pkgname=webkit2gtk
 pkgver=2.18.5
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ Web content engine library"
 arch=(x86_64)
 url="https://webkitgtk.org/"
@@ -15,14 +15,20 @@
             'gst-plugins-base: free media decoding'
             'gst-plugins-good: media decoding'
             'gst-libav: nonfree media decoding')
-source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc})
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
+        enchant-2.diff)
 sha256sums=('0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8'
-            'SKIP')
+            'SKIP'
+            'ed8e5fe614ed800da3caccb8162bdd2d8dbd5a69ab90d426b34e124dee5cf1b6')
 validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
 
 prepare() {
   mkdir build
   cd webkitgtk-$pkgver
+
+  # enchant 2.2
+  patch -Np1 -i ../enchant-2.diff
+
   sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
 }
 

Added: enchant-2.diff
===================================================================
--- enchant-2.diff	                        (rev 0)
+++ enchant-2.diff	2018-01-18 10:24:35 UTC (rev 315068)
@@ -0,0 +1,21 @@
+diff -u -r webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake
+--- webkitgtk-2.18.5/Source/cmake/FindEnchant.cmake	2017-08-09 11:13:53.000000000 +0200
++++ webkitgtk-2.18.5-enchant2/Source/cmake/FindEnchant.cmake	2018-01-18 10:06:07.127310881 +0100
+@@ -28,7 +28,7 @@
+ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(PC_ENCHANT enchant)
++pkg_check_modules(PC_ENCHANT enchant-2)
+ 
+ find_path(ENCHANT_INCLUDE_DIRS
+     NAMES enchant.h
+@@ -37,7 +37,7 @@
+ )
+ 
+ find_library(ENCHANT_LIBRARIES
+-    NAMES enchant
++    NAMES enchant-2
+     PATHS ${PC_ENCHANT_LIBDIR}
+           ${PC_ENCHANT_LIBRARY_DIRS}
+ )