[arch-commits] Commit in wxgtk/trunk (PKGBUILD wxgtk-webkit-infinite-loop.patch)

[Antonio Rojas]

    Date: Friday, March 9, 2018 @ 19:51:45
  Author: arojas
Revision: 318358

Update to 3.0.4

Modified:
  wxgtk/trunk/PKGBUILD
Deleted:
  wxgtk/trunk/wxgtk-webkit-infinite-loop.patch

----------------------------------+
 PKGBUILD                         |   33 ++++++---------------------------
 wxgtk-webkit-infinite-loop.patch |   36 ------------------------------------
 2 files changed, 6 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-09 19:50:46 UTC (rev 318357)
+++ PKGBUILD	2018-03-09 19:51:45 UTC (rev 318358)
@@ -3,8 +3,8 @@
 
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
-pkgver=3.0.3.1
-pkgrel=11
+pkgver=3.0.4
+pkgrel=1
 arch=('x86_64')
 url="https://wxwidgets.org"
 license=('custom:wxWindows')
@@ -11,18 +11,9 @@
 makedepends=('gst-plugins-base' 'gconf' 'glu' 'webkit2gtk' 'libnotify' 'gtk2')
 options=('!emptydirs')
 source=(https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidgets-$pkgver.tar.bz2
-        make-abicheck-non-fatal.patch wxgtk-webkit2gtk.patch::"https://github.com/wxWidgets/wxWidgets/commit/ec6e54bc.patch"
-        wxgtk2-fix-webview.patch::"https://github.com/wxWidgets/wxWidgets/commit/fd247cca.patch"
-        wxgtk-filezilla-assert.patch::"https://github.com/wxWidgets/wxWidgets/commit/ce1dce11.patch"
-        wxgtk-webkit-infinite-loop.patch
-        wxgtk3-scroll.patch::"https://github.com/wxWidgets/wxWidgets/commit/7626292f.patch")
-sha256sums=('3164ad6bc5f61c48d2185b39065ddbe44283eb834a5f62beb13f1d0923e366e4'
-            '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453'
-            '5cc7804696d94f88470d99899d628f1873a5ecff359a5e6fcf67318f3dcfd3ee'
-            'c441ae48381b1d92522e6f125d733d5710105065099327c00fa35f50e146bdf4'
-            '168deb2e76e21bcd46c3a1efd86c0f3e1354e9511cf12a9dc54b7dc82c0e3d63'
-            'e983e95bc321544e31ba34220665a463c99b28d7645e28c1192cf6da1978cfb5'
-            '7f21db7139d5c3423282227698fd31f68299fd75ed0e028da979e091bd02d168')
+        make-abicheck-non-fatal.patch)
+sha256sums=('96157f988d261b7368e5340afa1a0cad943768f35929c22841f62c25b17bf7f0'
+            '46a1bb97d69163547da13d5e23a4c73e68de27ee601da5d2fb5bc5c417931453')
 
 prepare() {
   cd wxWidgets-${pkgver}
@@ -31,18 +22,6 @@
   # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
   patch -Np1 -i ../make-abicheck-non-fatal.patch
 
-  # Support webkit2gtk
-  sed -e 's|setup0.h|setup.h|g' -i ../wxgtk-webkit2gtk.patch
-  patch -p1 -i ../wxgtk-webkit2gtk.patch
-  # fix webview after webkit2gtk port
-  patch -p1 -i ../wxgtk2-fix-webview.patch
-  # fix assert in FileZilla
-  patch -p1 -i ../wxgtk-filezilla-assert.patch
-  # fix infinite loop in webkit
-  patch -p1 -i ../wxgtk-webkit-infinite-loop.patch
-  # fix scrolling in wxgtk3
-  patch -p1 -i ../wxgtk3-scroll.patch
-
   cd ..
   cp -r wxWidgets-${pkgver} wxWidgets-${pkgver}-gtk3
 }
@@ -79,7 +58,7 @@
 
 package_wxgtk2() {
   pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
-  depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 'libnotify')
+  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common' 'libnotify')
   conflicts=('wxgtk')
   provides=('wxgtk')
   replaces=('wxgtk')

Deleted: wxgtk-webkit-infinite-loop.patch
===================================================================
--- wxgtk-webkit-infinite-loop.patch	2018-03-09 19:50:46 UTC (rev 318357)
+++ wxgtk-webkit-infinite-loop.patch	2018-03-09 19:51:45 UTC (rev 318358)
@@ -1,36 +0,0 @@
-From 572fe37898f8d4f8664849ec76483dd63ea13a13 Mon Sep 17 00:00:00 2001
-From: Paul Cornett <paulcor at users.noreply.github.com>
-Date: Sat, 6 Jan 2018 11:07:11 -0800
-Subject: [PATCH] Avoid calling default "key-press-event" handler
-
-We have already done everything it does, and doing it again seems to
-cause an infinite loop with WebKitGTK. See #17932
----
- src/gtk/toplevel.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
-index f63fdd3e463..ae825d40396 100644
---- a/src/gtk/toplevel.cpp
-+++ b/src/gtk/toplevel.cpp
-@@ -227,15 +227,15 @@ wxgtk_tlw_key_press_event(GtkWidget *widget, GdkEventKey *event)
-     // GTK+ gtk_window_key_press_event() handler.
- 
-     if ( gtk_window_propagate_key_event(window, event) )
--        return TRUE;
-+        return true;
- 
-     if ( gtk_window_activate_key(window, event) )
--        return TRUE;
-+        return true;
- 
--    if (GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event))
--        return TRUE;
-+    GTK_WIDGET_GET_CLASS(widget)->key_press_event(widget, event);
- 
--    return FALSE;
-+    // Avoid calling the default handler, we have already done everything it does
-+    return true;
- }
- }
-