pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/webkit-gtk webkit-gtk: Update to 2.22.7



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e38ab84daca5
branches:  trunk
changeset: 320161:e38ab84daca5
user:      leot <leot%pkgsrc.org@localhost>
date:      Fri Mar 01 18:53:17 2019 +0000

description:
webkit-gtk: Update to 2.22.7

pkgsrc changes:
 - Remove patch-Source_JavaScriptCore_dfg_DFGDoesGC.cpp, it was applied in
   2.22.7

Changes:
2.22.7
======
  - Fix rendering of glyphs in Hebrew (and possibly other languages) when
    Unicode NFC normalization is used.
  - Fix several crashes and race conditions.

diffstat:

 www/webkit-gtk/Makefile                                              |   5 +-
 www/webkit-gtk/PLIST                                                 |   6 +-
 www/webkit-gtk/distinfo                                              |  11 +-
 www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGDoesGC.cpp |  96 ----------
 4 files changed, 10 insertions(+), 108 deletions(-)

diffs (158 lines):

diff -r df61ee30ea9d -r e38ab84daca5 www/webkit-gtk/Makefile
--- a/www/webkit-gtk/Makefile   Fri Mar 01 18:11:18 2019 +0000
+++ b/www/webkit-gtk/Makefile   Fri Mar 01 18:53:17 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.157 2019/02/21 18:52:15 maya Exp $
+# $NetBSD: Makefile,v 1.158 2019/03/01 18:53:17 leot Exp $
 
-DISTNAME=      webkitgtk-2.22.6
-PKGREVISION=   1
+DISTNAME=      webkitgtk-2.22.7
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
diff -r df61ee30ea9d -r e38ab84daca5 www/webkit-gtk/PLIST
--- a/www/webkit-gtk/PLIST      Fri Mar 01 18:11:18 2019 +0000
+++ b/www/webkit-gtk/PLIST      Fri Mar 01 18:53:17 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2019/02/09 11:29:44 leot Exp $
+@comment $NetBSD: PLIST,v 1.47 2019/03/01 18:53:17 leot Exp $
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -208,10 +208,10 @@
 ${PLIST.introspection}lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
 lib/libjavascriptcoregtk-4.0.so
 lib/libjavascriptcoregtk-4.0.so.18
-lib/libjavascriptcoregtk-4.0.so.18.11.7
+lib/libjavascriptcoregtk-4.0.so.18.11.8
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.33.7
+lib/libwebkit2gtk-4.0.so.37.33.8
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff -r df61ee30ea9d -r e38ab84daca5 www/webkit-gtk/distinfo
--- a/www/webkit-gtk/distinfo   Fri Mar 01 18:11:18 2019 +0000
+++ b/www/webkit-gtk/distinfo   Fri Mar 01 18:53:17 2019 +0000
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.116 2019/02/21 18:52:15 maya Exp $
+$NetBSD: distinfo,v 1.117 2019/03/01 18:53:17 leot Exp $
 
-SHA1 (webkitgtk-2.22.6.tar.xz) = 26a8f8951da03aa4dfc2c25257b6899ea3c2558f
-RMD160 (webkitgtk-2.22.6.tar.xz) = 4ddd00a0eed1e8122a71e070f1f6f5f49f59ca75
-SHA512 (webkitgtk-2.22.6.tar.xz) = 18f4a4c145b524bebf1eaae58057e1e6cb74ba5a162c5195f072ba25c4399e7749c74fe6f8e9351bb9f2630a2c43f59935943e5bb318a5c4977f727a68602709
-Size (webkitgtk-2.22.6.tar.xz) = 16773696 bytes
+SHA1 (webkitgtk-2.22.7.tar.xz) = 5f45147f6fc4b6a0dd3c545bf857679313230507
+RMD160 (webkitgtk-2.22.7.tar.xz) = ec7badb02357401ed264e1055c6a2ace84aa9a10
+SHA512 (webkitgtk-2.22.7.tar.xz) = c11f60b14f279752bb75efce4b69cbfd75e854bfb16772edc3b24d28eff2fb65090e03f24c1cfaf1f27668e017d877e04d5210560da70568029c5af33a916126
+Size (webkitgtk-2.22.7.tar.xz) = 16777676 bytes
 SHA1 (patch-CMakeLists.txt) = 93466370f447c6be9008512aa1fc2dc0bd2b843b
 SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = a41e02c7a1f9bfb91a2af36ec0410e1bf2b9a745
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = bae08310572c2e23c69cbf6aa9760a67345dcfe3
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = ab75ef8714e5071fcd094735717a2f5d0321c747
-SHA1 (patch-Source_JavaScriptCore_dfg_DFGDoesGC.cpp) = 802d83a69975d0754dfb6198488aacc7e3f04d83
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 36d29a5db03c2413ae93224ac391f3ff248983e8
 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 784baf6f3baba2986fbcb7aa10e7abed8f8c6336
diff -r df61ee30ea9d -r e38ab84daca5 www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGDoesGC.cpp
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGDoesGC.cpp      Fri Mar 01 18:11:18 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_dfg_DFGDoesGC.cpp,v 1.1 2019/02/21 18:52:15 maya Exp $
-
-Fix remote code execution in JavaScript. From upstream commit:
-
-From d51ece4028133113e9e5d0f2576ad23489801ddc Mon Sep 17 00:00:00 2001
-From: "mark.lam%apple.com@localhost"
- <mark.lam%apple.com@localhost@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
-Date: Tue, 19 Feb 2019 02:32:10 +0000
-Subject: [PATCH] Fix DFG doesGC() for CompareEq/Less/LessEq/Greater/GreaterEq
- and CompareStrictEq nodes. https://bugs.webkit.org/show_bug.cgi?id=194800
- <rdar://problem/48183773>
-
-Reviewed by Yusuke Suzuki.
-
-Fix doesGC() for the following nodes:
-
-    CompareEq:
-    CompareLess:
-    CompareLessEq:
-    CompareGreater:
-    CompareGreaterEq:
-    CompareStrictEq:
-        Only return false (i.e. does not GC) for child node use kinds that have
-        been vetted to not do anything that can GC.  For all other use kinds
-        (including StringUse and BigIntUse), we return true (i.e. does GC).
-
-* dfg/DFGDoesGC.cpp:
-(JSC::DFG::doesGC):
-
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@241753 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
---- Source/JavaScriptCore/dfg/DFGDoesGC.cpp.orig       2019-02-08 16:17:00.000000000 +0000
-+++ Source/JavaScriptCore/dfg/DFGDoesGC.cpp
-@@ -146,14 +146,8 @@ bool doesGC(Graph& graph, Node* node)
-     case RegExpTest:
-     case RegExpMatchFast:
-     case RegExpMatchFastGlobal:
--    case CompareLess:
--    case CompareLessEq:
--    case CompareGreater:
--    case CompareGreaterEq:
-     case CompareBelow:
-     case CompareBelowEq:
--    case CompareEq:
--    case CompareStrictEq:
-     case CompareEqPtr:
-     case SameValue:
-     case Call:
-@@ -374,6 +368,46 @@ bool doesGC(Graph& graph, Node* node)
-     case MapSet:
-         return true;
- 
-+    case CompareEq:
-+    case CompareLess:
-+    case CompareLessEq:
-+    case CompareGreater:
-+    case CompareGreaterEq:
-+        if (node->isBinaryUseKind(Int32Use)
-+#if USE(JSVALUE64)
-+            || node->isBinaryUseKind(Int52RepUse)
-+#endif
-+            || node->isBinaryUseKind(DoubleRepUse)
-+            || node->isBinaryUseKind(StringIdentUse)
-+            )
-+            return false;
-+        if (node->op() == CompareEq) {
-+            if (node->isBinaryUseKind(BooleanUse)
-+                || node->isBinaryUseKind(SymbolUse)
-+                || node->isBinaryUseKind(ObjectUse)
-+                || node->isBinaryUseKind(ObjectUse, ObjectOrOtherUse) || node->isBinaryUseKind(ObjectOrOtherUse, ObjectUse))
-+                return false;
-+        }
-+        return true;
-+
-+    case CompareStrictEq:
-+        if (node->isBinaryUseKind(BooleanUse)
-+            || node->isBinaryUseKind(Int32Use)
-+#if USE(JSVALUE64)
-+            || node->isBinaryUseKind(Int52RepUse)
-+#endif
-+            || node->isBinaryUseKind(DoubleRepUse)
-+            || node->isBinaryUseKind(SymbolUse)
-+            || node->isBinaryUseKind(SymbolUse, UntypedUse)
-+            || node->isBinaryUseKind(UntypedUse, SymbolUse)
-+            || node->isBinaryUseKind(StringIdentUse)
-+            || node->isBinaryUseKind(ObjectUse, UntypedUse) || node->isBinaryUseKind(UntypedUse, ObjectUse)
-+            || node->isBinaryUseKind(ObjectUse)
-+            || node->isBinaryUseKind(MiscUse, UntypedUse) || node->isBinaryUseKind(UntypedUse, MiscUse)
-+            || node->isBinaryUseKind(StringIdentUse, NotStringVarUse) || node->isBinaryUseKind(NotStringVarUse, StringIdentUse))
-+            return false;
-+        return true;
-+
-     case GetIndexedPropertyStorage:
-         if (node->arrayMode().type() == Array::String)
-             return true;



Home | Main Index | Thread Index | Old Index