[arch-commits] Commit in webkit2gtk/repos/extra-x86_64 (3 files)

[Jan Steffens]

    Date: Thursday, January 11, 2018 @ 06:13:38
  Author: heftig
Revision: 314340

archrelease: copy trunk to extra-x86_64

Added:
  webkit2gtk/repos/extra-x86_64/PKGBUILD
    (from rev 314339, webkit2gtk/trunk/PKGBUILD)
Deleted:
  webkit2gtk/repos/extra-x86_64/PKGBUILD
  webkit2gtk/repos/extra-x86_64/gtkdoc.patch

--------------+
 PKGBUILD     |  116 +++++++++++++++++++++++++++------------------------------
 gtkdoc.patch |   24 -----------
 2 files changed, 56 insertions(+), 84 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-11 06:11:01 UTC (rev 314339)
+++ PKGBUILD	2018-01-11 06:13:38 UTC (rev 314340)
@@ -1,60 +0,0 @@
-# $Id$
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=webkit2gtk
-pkgver=2.18.4
-pkgrel=1
-pkgdesc="GTK+ Web content engine library"
-arch=(x86_64)
-url="https://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt enchant geoclue2 gst-plugins-base-libs gst-plugins-bad
-         libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen)
-makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2 ninja)
-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}
-        gtkdoc.patch)
-sha256sums=('87b6bb9a6065b949ecbe6191313c43e57ad28efdf1f2b5e763405093520632b8'
-            'SKIP'
-            '283c21a81bf743a31def6f5e7889fb919c818314d911cbc86945eb604ba9fcb6')
-validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
-
-prepare() {
-  mkdir build
-  cd webkitgtk-$pkgver
-
-  # GTK-Doc 1.27
-  patch -Np1 -i ../gtkdoc.patch
-}
-
-build() {
-  cd build
-  cmake \
-    -G Ninja \
-    -DPORT=GTK \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_SKIP_RPATH=ON \
-    -DENABLE_GTKDOC=ON \
-    -DLIBEXEC_INSTALL_DIR=/usr/lib \
-    -DLIB_INSTALL_DIR=/usr/lib \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-    ../webkitgtk-$pkgver
-  ninja
-}
-
-package() {
-  cd build
-  DESTDIR="$pkgdir" ninja 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"
-}

Copied: webkit2gtk/repos/extra-x86_64/PKGBUILD (from rev 314339, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-01-11 06:13:38 UTC (rev 314340)
@@ -0,0 +1,56 @@
+# $Id$
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.18.5
+pkgrel=1
+pkgdesc="GTK+ Web content engine library"
+arch=(x86_64)
+url="https://webkitgtk.org/"
+license=(custom)
+depends=(libxt libxslt enchant geoclue2 gst-plugins-base-libs gst-plugins-bad
+         libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen)
+makedepends=(gtk2 gperf gobject-introspection ruby gtk-doc cmake python python2 ninja)
+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')
+validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
+
+prepare() {
+  mkdir build
+  cd webkitgtk-$pkgver
+  sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
+}
+
+build() {
+  cd build
+  cmake \
+    -G Ninja \
+    -DPORT=GTK \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DENABLE_GTKDOC=ON \
+    -DLIBEXEC_INSTALL_DIR=/usr/lib \
+    -DLIB_INSTALL_DIR=/usr/lib \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    ../webkitgtk-$pkgver
+  ninja
+}
+
+package() {
+  cd build
+  DESTDIR="$pkgdir" ninja 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"
+}

Deleted: gtkdoc.patch
===================================================================
--- gtkdoc.patch	2018-01-11 06:11:01 UTC (rev 314339)
+++ gtkdoc.patch	2018-01-11 06:13:38 UTC (rev 314340)
@@ -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', ''))