[arch-commits] Commit in webkitgtk/trunk (2 files)

[Jan Steffens]

    Date: Friday, July 4, 2014 @ 20:55:51
  Author: heftig
Revision: 216507

Obtain fix from Fedora hopefully fixing the crashes FS#40543

Added:
  webkitgtk/trunk/webkitgtk-2.4.3-angle_symbol_table.patch
Modified:
  webkitgtk/trunk/PKGBUILD

------------------------------------------+
 PKGBUILD                                 |    9 ++++++---
 webkitgtk-2.4.3-angle_symbol_table.patch |   13 +++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-04 18:39:50 UTC (rev 216506)
+++ PKGBUILD	2014-07-04 18:55:51 UTC (rev 216507)
@@ -4,7 +4,7 @@
 pkgbase=webkitgtk
 pkgname=(webkitgtk webkitgtk2)
 pkgver=2.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ Web content engine library"
 arch=(i686 x86_64)
 url="http://webkitgtk.org/"
@@ -17,9 +17,11 @@
             'gst-libav: nonfree media decoding')
 options=(!emptydirs)
 source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
-        fix-pretty-quotes.patch)
+        fix-pretty-quotes.patch
+        webkitgtk-2.4.3-angle_symbol_table.patch)
 sha256sums=('9862c3eac1d12cc6e52cc39060a1284163950b304d534529a0dbcc5958a8ceac'
-            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6')
+            '56316228bbbf0b7ebcbe210a35120f4e72cb9c1b680dd82cc2bde0f4549245e6'
+            'a2c0b96a1671d43c18baf3cbe53c84738181aa08c3ac448c423b50722953a50b')
 
 prepare() {
   mkdir build-gtk{,2} path
@@ -28,6 +30,7 @@
 
   cd $pkgbase-$pkgver
   patch -Np0 -i ../fix-pretty-quotes.patch
+  patch -Np1 -i ../webkitgtk-2.4.3-angle_symbol_table.patch
 }
 
 _build() (

Added: webkitgtk-2.4.3-angle_symbol_table.patch
===================================================================
--- webkitgtk-2.4.3-angle_symbol_table.patch	                        (rev 0)
+++ webkitgtk-2.4.3-angle_symbol_table.patch	2014-07-04 18:55:51 UTC (rev 216507)
@@ -0,0 +1,13 @@
+--- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
++++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
+@@ -171,7 +171,8 @@ TFunction::~TFunction()
+ TSymbolTableLevel::~TSymbolTableLevel()
+ {
+     for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
+-        delete (*it).second;
++        if ((*it).first == (*it).second->getMangledName())
++            delete (*it).second;
+ }
+
+ //
+