summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Grapentin <andreas@grapentin.org>2018-01-29 19:51:12 +0100
committerAndreas Grapentin <andreas@grapentin.org>2018-01-29 19:51:34 +0100
commitae993879b0a2f1433de032a8009aa1b86af7fa12 (patch)
tree8dd53338d34f263db937b9b532ceb950ed08ecc6
parent0ac3fa66d849f7f3e35b369411189729c7c500c8 (diff)
downloadabslibre-ae993879b0a2f1433de032a8009aa1b86af7fa12.tar.gz
abslibre-ae993879b0a2f1433de032a8009aa1b86af7fa12.tar.bz2
abslibre-ae993879b0a2f1433de032a8009aa1b86af7fa12.zip
nonprism/webkit2gtk: updated to 2.18.6
-rw-r--r--nonprism/webkit2gtk/PKGBUILD14
-rw-r--r--nonprism/webkit2gtk/enchant-2.diff21
2 files changed, 31 insertions, 4 deletions
diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD
index 222c7690d..545c5ee84 100644
--- a/nonprism/webkit2gtk/PKGBUILD
+++ b/nonprism/webkit2gtk/PKGBUILD
@@ -9,7 +9,7 @@
# - remove geoclue2 support
pkgname=webkit2gtk
-pkgver=2.18.5
+pkgver=2.18.6
pkgrel=1.nonprism1
pkgdesc="GTK+ Web content engine library, without geoclue2 support"
arch=(x86_64 i686 armv7h)
@@ -22,14 +22,20 @@ optdepends=('gtk2: Netscape plugin support'
'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})
-sha256sums=('0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8'
- 'SKIP')
+source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
+ enchant-2.diff)
+sha256sums=('93912cc2f40f12e452be1ca4babdbdaac0ec4f828d441257a6b06c2963bbac3c'
+ '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
rm -r Source/ThirdParty/gtest/
}
diff --git a/nonprism/webkit2gtk/enchant-2.diff b/nonprism/webkit2gtk/enchant-2.diff
new file mode 100644
index 000000000..93c988281
--- /dev/null
+++ b/nonprism/webkit2gtk/enchant-2.diff
@@ -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}
+ )