summaryrefslogtreecommitdiff
path: root/nonprism/webkit2gtk
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2018-07-03 20:04:23 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2018-07-03 20:04:23 -0500
commit0438b8c5fd0f978c903635c3c44d6891cbc753a1 (patch)
tree20a16ecf0b8cb3e611b3fb62b7c5b4eaa641fd64 /nonprism/webkit2gtk
parent16841380c105d69594095e625ae23c5630186dbe (diff)
downloadabslibre-0438b8c5fd0f978c903635c3c44d6891cbc753a1.tar.gz
abslibre-0438b8c5fd0f978c903635c3c44d6891cbc753a1.tar.bz2
abslibre-0438b8c5fd0f978c903635c3c44d6891cbc753a1.zip
webkit2gtk-2.20.3-1.nonprism1: updating version
Diffstat (limited to 'nonprism/webkit2gtk')
-rw-r--r--nonprism/webkit2gtk/PKGBUILD34
-rw-r--r--nonprism/webkit2gtk/enchant-2.diff21
2 files changed, 19 insertions, 36 deletions
diff --git a/nonprism/webkit2gtk/PKGBUILD b/nonprism/webkit2gtk/PKGBUILD
index 3511088a5..875c1effb 100644
--- a/nonprism/webkit2gtk/PKGBUILD
+++ b/nonprism/webkit2gtk/PKGBUILD
@@ -1,4 +1,5 @@
# $Id$
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor (Arch): Eric Bélanger <eric@archlinux.org>
# Contributor: Andreas Grapentin <andreas@grapentin.org>
# Contributor: Jesús E. <heckyel@parabola.nu>
@@ -9,8 +10,8 @@
# - remove geoclue2 support
pkgname=webkit2gtk
-pkgver=2.20.0
-pkgrel=2
+pkgver=2.20.3
+pkgrel=1
pkgrel+=.nonprism1
pkgdesc="GTK+ Web content engine library"
pkgdesc+=", without geoclue2 support"
@@ -26,7 +27,7 @@ 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})
-sha256sums=('57f640f720bd9a8a7207f3321cf803a15c2f207b4e7b75ff1be17bc1eeb00a3c'
+sha256sums=('579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8'
'SKIP')
validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
@@ -39,8 +40,7 @@ prepare() {
build() {
cd build
- cmake \
- -G Ninja \
+ cmake ../webkitgtk-$pkgver -G Ninja \
-DPORT=GTK \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -50,19 +50,23 @@ build() {
-DLIB_INSTALL_DIR=/usr/lib \
-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-DUSE_GEOCLUE2=OFF \
- -DENABLE_GEOLOCATION=OFF \
- ../webkitgtk-$pkgver
- ninja
+ -DENABLE_GEOLOCATION=OFF
+ cmake --build .
+}
+
+check() {
+ : # cmake --build build --target tests
}
package() {
- DESTDIR="$pkgdir" ninja -C build install
+ DESTDIR="$pkgdir" cmake --build build --target install
cd webkitgtk-$pkgver
- find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | while IFS= read -d $'\0' -r _f
- do
- echo "### $_f ###"
- cat "$_f"
- echo
- done | install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ find Source -name 'COPYING*' -or -name 'LICENSE*' -print0 | sort -z |
+ while IFS= read -d $'\0' -r _f; do
+ echo "### $_f ###"
+ cat "$_f"
+ echo
+ done |
+ install -Dm644 /dev/stdin "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/nonprism/webkit2gtk/enchant-2.diff b/nonprism/webkit2gtk/enchant-2.diff
deleted file mode 100644
index 93c988281..000000000
--- a/nonprism/webkit2gtk/enchant-2.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-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}
- )