extra/webkit2gtk to 2.18.5-1

This commit is contained in:
Kevin Mihelich 2018-01-11 13:40:45 +00:00
parent cbeaca8623
commit 5d22c7d66a
2 changed files with 3 additions and 31 deletions

View file

@ -8,7 +8,7 @@
highmem=1
pkgname=webkit2gtk
pkgver=2.18.4
pkgver=2.18.5
pkgrel=1
pkgdesc="GTK+ Web content engine library"
arch=(x86_64)
@ -22,20 +22,16 @@ optdepends=('gtk2: Netscape plugin support'
'gst-plugins-good: media decoding'
'gst-libav: nonfree media decoding')
source=(https://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz{,.asc}
gtkdoc.patch
remove_atomics.patch)
sha256sums=('87b6bb9a6065b949ecbe6191313c43e57ad28efdf1f2b5e763405093520632b8'
sha256sums=('0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8'
'SKIP'
'283c21a81bf743a31def6f5e7889fb919c818314d911cbc86945eb604ba9fcb6'
'410449817b1b181737538be10d96d6d8aec134285f6288e80c96fbfdd5d19519')
validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
prepare() {
mkdir build
cd webkitgtk-$pkgver
# GTK-Doc 1.27
patch -Np1 -i ../gtkdoc.patch
sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
if [[ $CARCH == "arm" || $CARCH == "armv6h" ]]; then
patch -p0 -i ../remove_atomics.patch

View file

@ -1,24 +0,0 @@
diff -u -r webkitgtk-2.18.4/Tools/gtk/generate-gtkdoc webkitgtk-2.18.4-gtkdoc/Tools/gtk/generate-gtkdoc
--- webkitgtk-2.18.4/Tools/gtk/generate-gtkdoc 2017-12-18 18:36:59.000000000 +0100
+++ webkitgtk-2.18.4-gtkdoc/Tools/gtk/generate-gtkdoc 2017-12-20 02:52:09.008775941 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2
# Copyright (C) 2011 Igalia S.L.
#
# This library is free software; you can redistribute it and/or
diff -u -r webkitgtk-2.18.4/Tools/gtk/gtkdoc.py webkitgtk-2.18.4-gtkdoc/Tools/gtk/gtkdoc.py
--- webkitgtk-2.18.4/Tools/gtk/gtkdoc.py 2017-08-09 11:13:53.000000000 +0200
+++ webkitgtk-2.18.4-gtkdoc/Tools/gtk/gtkdoc.py 2017-12-20 02:52:00.722090939 +0100
@@ -319,9 +319,9 @@
ldflags = ' "-L%s" %s ' % (self.library_path, additional_ldflags) + ldflags
current_ld_library_path = env.get('LD_LIBRARY_PATH')
if current_ld_library_path:
- env['RUN'] = 'LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
+ env['RUN'] = 'env LD_LIBRARY_PATH="%s:%s" ' % (self.library_path, current_ld_library_path)
else:
- env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
+ env['RUN'] = 'env LD_LIBRARY_PATH="%s" ' % self.library_path
if ldflags:
env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))