[arch-commits] Commit in wxgtk/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Thursday, June 8, 2017 @ 19:57:40
  Author: arojas
Revision: 298443

Port wxgtk3 to webkit2gtk (FS#54370)

Modified:
  wxgtk/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-08 19:56:38 UTC (rev 298442)
+++ PKGBUILD	2017-06-08 19:57:40 UTC (rev 298443)
@@ -4,16 +4,17 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org"
 license=('custom:wxWindows')
-makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkitgtk' 'libnotify')
+makedepends=('gst-plugins-base' 'gconf' 'webkitgtk2' 'glu' 'webkit2gtk' 'libnotify')
 options=('!emptydirs')
 source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
-        make-abicheck-non-fatal.patch)
+        make-abicheck-non-fatal.patch wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch")
 sha1sums=('ea785822d0f1c3290707bda6da570e596b3ec85a'
-          'dfe38650c655395b90bf082b5734c4093508bfa3')
+          'dfe38650c655395b90bf082b5734c4093508bfa3'
+          'c9d013552b3078d7a9700df897333c2960207b0f')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -24,6 +25,11 @@
 
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
+
+  # Support webkit2gtk
+  cd wxWidgets-${pkgver}-gtk3
+  sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
+  patch -p1 -i ../wxgtk-webkit2gtk.patch
 }
 
 build() {
@@ -74,7 +80,7 @@
 package_wxgtk3() {
   pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
   depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
-  optdepends=('webkitgtk: for webview support')
+  optdepends=('webkit2gtk: for webview support')
   conflicts=('wxgtk<3.0.3.1-2')
 
   cd wxWidgets-${pkgver}-gtk3