[arch-commits] Commit in webkit2gtk/repos/testing-x86_64 (4 files)
Jan Steffens
heftig at archlinux.org
Thu Jan 25 05:39:02 UTC 2018
Date: Thursday, January 25, 2018 @ 05:39:01
Author: heftig
Revision: 315426
archrelease: copy trunk to testing-x86_64
Added:
webkit2gtk/repos/testing-x86_64/PKGBUILD
(from rev 315425, webkit2gtk/trunk/PKGBUILD)
webkit2gtk/repos/testing-x86_64/enchant-2.diff
(from rev 315425, webkit2gtk/trunk/enchant-2.diff)
Deleted:
webkit2gtk/repos/testing-x86_64/PKGBUILD
webkit2gtk/repos/testing-x86_64/enchant-2.diff
----------------+
PKGBUILD | 124 +++++++++++++++++++++++++++----------------------------
enchant-2.diff | 42 +++++++++---------
2 files changed, 83 insertions(+), 83 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2018-01-25 05:31:35 UTC (rev 315425)
+++ PKGBUILD 2018-01-25 05:39:01 UTC (rev 315426)
@@ -1,62 +0,0 @@
-# $Id$
-# Contributor: Eric Bélanger <eric at archlinux.org>
-
-pkgname=webkit2gtk
-pkgver=2.18.5
-pkgrel=2
-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}
- enchant-2.diff)
-sha256sums=('0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8'
- '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
-}
-
-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/testing-x86_64/PKGBUILD (from rev 315425, webkit2gtk/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2018-01-25 05:39:01 UTC (rev 315426)
@@ -0,0 +1,62 @@
+# $Id$
+# Contributor: Eric Bélanger <eric at archlinux.org>
+
+pkgname=webkit2gtk
+pkgver=2.18.6
+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}
+ 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
+}
+
+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: enchant-2.diff
===================================================================
--- enchant-2.diff 2018-01-25 05:31:35 UTC (rev 315425)
+++ enchant-2.diff 2018-01-25 05:39:01 UTC (rev 315426)
@@ -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}
- )
Copied: webkit2gtk/repos/testing-x86_64/enchant-2.diff (from rev 315425, webkit2gtk/trunk/enchant-2.diff)
===================================================================
--- enchant-2.diff (rev 0)
+++ enchant-2.diff 2018-01-25 05:39:01 UTC (rev 315426)
@@ -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}
+ )
More information about the arch-commits
mailing list