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

[Jan Steffens]

    Date: Monday, June 11, 2018 @ 21:00:46
  Author: heftig
Revision: 326751

archrelease: copy trunk to extra-x86_64

Added:
  webkit2gtk/repos/extra-x86_64/PKGBUILD
    (from rev 326750, webkit2gtk/trunk/PKGBUILD)
Deleted:
  webkit2gtk/repos/extra-x86_64/PKGBUILD
  webkit2gtk/repos/extra-x86_64/gtk-doc.diff

--------------+
 PKGBUILD     |  119 +++++++++++++++++++++++++++++----------------------------
 gtk-doc.diff |   16 -------
 2 files changed, 61 insertions(+), 74 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-11 20:57:16 UTC (rev 326750)
+++ PKGBUILD	2018-06-11 21:00:46 UTC (rev 326751)
@@ -1,58 +0,0 @@
-# $Id$
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=webkit2gtk
-pkgver=2.20.2
-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
-         libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen woff2)
-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}
-        gtk-doc.diff)
-sha256sums=('dffe93a241f03f1c73b369f4e323e4d8f12e39d33d5515948cbf454ca4b526e2'
-            'SKIP'
-            '4f116b4508d4501498d1e1483555bc5d4e3f5504c5a2f3ec6a21c646b874cdb4')
-validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
-
-prepare() {
-  mkdir build
-  cd webkitgtk-$pkgver
-  patch -Np1 -i ../gtk-doc.diff
-  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() {
-  DESTDIR="$pkgdir" ninja -C build 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 326750, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-06-11 21:00:46 UTC (rev 326751)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.20.3
+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
+         libsecret libwebp harfbuzz-icu gtk3 libnotify hyphen woff2)
+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=('579b307d78fa16a73f112790178022166d7ad17d4147492ced9b9fba48f20dd8'
+            'SKIP')
+validpgpkeys=('D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3')
+
+prepare() {
+  mkdir build
+  cd webkitgtk-$pkgver
+  sed -i '1s/python$/&2/' Tools/gtk/generate-gtkdoc
+}
+
+build() {
+  cd build
+  cmake ../webkitgtk-$pkgver -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
+  cmake --build .
+}
+
+check() {
+  : # cmake --build build --target tests
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --build build --target install
+
+  cd webkitgtk-$pkgver
+  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"
+}
+
+# vim:set sw=2 et:

Deleted: gtk-doc.diff
===================================================================
--- gtk-doc.diff	2018-06-11 20:57:16 UTC (rev 326750)
+++ gtk-doc.diff	2018-06-11 21:00:46 UTC (rev 326751)
@@ -1,16 +0,0 @@
-diff -u -r webkitgtk-2.20.2/Source/PlatformGTK.cmake webkitgtk-2.20.2-doc/Source/PlatformGTK.cmake
---- webkitgtk-2.20.2/Source/PlatformGTK.cmake	2018-05-07 10:30:18.000000000 +0200
-+++ webkitgtk-2.20.2-doc/Source/PlatformGTK.cmake	2018-05-07 18:03:44.333500803 +0200
-@@ -15,10 +15,10 @@
- 
- if (ENABLE_GTKDOC)
-     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk-${WEBKITGTK_API_VERSION}/html/webkit2gtk-${WEBKITGTK_API_VERSION}
--            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkit2gtk-${WEBKITGTK_API_VERSION}"
-+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
-     )
-     install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitdomgtk-${WEBKITGTK_API_VERSION}/html/webkitdomgtk-${WEBKITGTK_API_VERSION}
--            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkitdomgtk-${WEBKITGTK_API_VERSION}"
-+            DESTINATION "${CMAKE_INSTALL_DATADIR}/gtk-doc/html"
-     )
- endif ()
-