Received: by mail.netbsd.org (Postfix, from userid 605) id 07FFE84D78; Tue, 28 Jul 2020 14:24:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8471584D72 for ; Tue, 28 Jul 2020 14:24:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id idynDbpyb_lt for ; Tue, 28 Jul 2020 14:24:03 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id C508884D02 for ; Tue, 28 Jul 2020 14:24:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BAA1AFB28; Tue, 28 Jul 2020 14:24:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159594624377630" MIME-Version: 1.0 Date: Tue, 28 Jul 2020 14:24:03 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/www/webkit-gtk To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20200728142403.BAA1AFB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159594624377630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Tue Jul 28 14:24:03 UTC 2020 Modified Files: pkgsrc/www/webkit-gtk: Makefile PLIST distinfo Added Files: pkgsrc/www/webkit-gtk/patches: patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp patch-Source_WebCore_rendering_RenderLayerBacking.h Log Message: webkit-gtk: Update to 2.28.4 pkgsrc changes: - Define non-standard __WORDSIZE if not already defined (at the moment the patches directly patch problematic files where __WORDSIZE is used, it would be probably nicer to find a common place to define it). Changes: 2.28.4 ------ - Fix several crashes and rendering issues. To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 pkgsrc/www/webkit-gtk/Makefile cvs rdiff -u -r1.61 -r1.62 pkgsrc/www/webkit-gtk/PLIST cvs rdiff -u -r1.136 -r1.137 pkgsrc/www/webkit-gtk/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp \ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159594624377630 Content-Disposition: inline Content-Length: 5952 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/webkit-gtk/Makefile diff -u pkgsrc/www/webkit-gtk/Makefile:1.189 pkgsrc/www/webkit-gtk/Makefile:1.190 --- pkgsrc/www/webkit-gtk/Makefile:1.189 Thu Jul 9 10:56:39 2020 +++ pkgsrc/www/webkit-gtk/Makefile Tue Jul 28 14:24:03 2020 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.189 2020/07/09 10:56:39 leot Exp $ +# $NetBSD: Makefile,v 1.190 2020/07/28 14:24:03 leot Exp $ -DISTNAME= webkitgtk-2.28.3 +DISTNAME= webkitgtk-2.28.4 PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} CATEGORIES= www MASTER_SITES= https://www.webkitgtk.org/releases/ Index: pkgsrc/www/webkit-gtk/PLIST diff -u pkgsrc/www/webkit-gtk/PLIST:1.61 pkgsrc/www/webkit-gtk/PLIST:1.62 --- pkgsrc/www/webkit-gtk/PLIST:1.61 Thu Jul 9 10:56:39 2020 +++ pkgsrc/www/webkit-gtk/PLIST Tue Jul 28 14:24:03 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.61 2020/07/09 10:56:39 leot Exp $ +@comment $NetBSD: PLIST,v 1.62 2020/07/28 14:24:03 leot Exp $ bin/WebKitWebDriver include/webkitgtk-4.0/JavaScriptCore/JSBase.h include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h @@ -216,10 +216,10 @@ ${PLIST.introspection}lib/girepository-1 ${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.16.6 +lib/libjavascriptcoregtk-4.0.so.18.16.7 lib/libwebkit2gtk-4.0.so lib/libwebkit2gtk-4.0.so.37 -lib/libwebkit2gtk-4.0.so.37.44.5 +lib/libwebkit2gtk-4.0.so.37.44.6 lib/pkgconfig/javascriptcoregtk-4.0.pc lib/pkgconfig/webkit2gtk-4.0.pc lib/pkgconfig/webkit2gtk-web-extension-4.0.pc Index: pkgsrc/www/webkit-gtk/distinfo diff -u pkgsrc/www/webkit-gtk/distinfo:1.136 pkgsrc/www/webkit-gtk/distinfo:1.137 --- pkgsrc/www/webkit-gtk/distinfo:1.136 Thu Jul 9 10:56:39 2020 +++ pkgsrc/www/webkit-gtk/distinfo Tue Jul 28 14:24:03 2020 @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.136 2020/07/09 10:56:39 leot Exp $ +$NetBSD: distinfo,v 1.137 2020/07/28 14:24:03 leot Exp $ -SHA1 (webkitgtk-2.28.3.tar.xz) = af1d845d373e67fd666105e798a44e2cadaef83c -RMD160 (webkitgtk-2.28.3.tar.xz) = 2145913664c08decc1919437db97d2c79f21f153 -SHA512 (webkitgtk-2.28.3.tar.xz) = 575184edb8279f1dca67cbeeb45280ca5da9aa388e208251d9ad7a56907950cfd85b1fc426eee90699593c428f4e1037c96cb6aa16f534c71734c64950f2d643 -Size (webkitgtk-2.28.3.tar.xz) = 21425556 bytes +SHA1 (webkitgtk-2.28.4.tar.xz) = 70e9dd80647b30eaaf8a7f5b30d8869cd1254056 +RMD160 (webkitgtk-2.28.4.tar.xz) = d6d4ce81153e997b1276a474bed88f2269b27cda +SHA512 (webkitgtk-2.28.4.tar.xz) = 227cd4066235180521a32a83d3a906212adf4f234f15a1fff4ac86b48e39c431f1e0cb4a56f62924015099a0c8909a73a21a56f8dc71a16c53ac65de4a5773a1 +Size (webkitgtk-2.28.4.tar.xz) = 21424908 bytes SHA1 (patch-CMakeLists.txt) = 08f647f6928bf3fce0dabb02586e1447d16da297 SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = f4f117e6c1cd8eb8e4905f74946e0367156ed528 SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697 @@ -25,8 +25,10 @@ SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3 SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615 SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 740eb33931b6f9cb8008748323235f23466328dc +SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750 SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9 +SHA1 (patch-Source_WebCore_rendering_RenderLayerBacking.h) = ecf722df1d1cca13573786b34fe1e3d85edf1e1e SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8 SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 8c19692e78b1cfb021b95435508a10bc6542b173 Added files: Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp:1.1 --- /dev/null Tue Jul 28 14:24:03 2020 +++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp Tue Jul 28 14:24:03 2020 @@ -0,0 +1,17 @@ +$NetBSD: patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp,v 1.1 2020/07/28 14:24:03 leot Exp $ + +Define non-stardard __WORDSIZE. + +--- Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp.orig 2020-02-04 10:24:07.000000000 +0000 ++++ Source/WebCore/crypto/algorithms/CryptoAlgorithmAES_GCM.cpp +@@ -26,6 +26,10 @@ + #include "config.h" + #include "CryptoAlgorithmAES_GCM.h" + ++#ifndef __WORDSIZE ++#define __WORDSIZE (__SIZEOF_LONG__ * 8) ++#endif ++ + #if ENABLE(WEB_CRYPTO) + + #include "CryptoAlgorithmAesGcmParams.h" Index: pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h diff -u /dev/null pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h:1.1 --- /dev/null Tue Jul 28 14:24:03 2020 +++ pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_rendering_RenderLayerBacking.h Tue Jul 28 14:24:03 2020 @@ -0,0 +1,17 @@ +$NetBSD: patch-Source_WebCore_rendering_RenderLayerBacking.h,v 1.1 2020/07/28 14:24:03 leot Exp $ + +Define non-stardard __WORDSIZE. + +--- Source/WebCore/rendering/RenderLayerBacking.h.orig 2020-02-04 10:24:08.000000000 +0000 ++++ Source/WebCore/rendering/RenderLayerBacking.h +@@ -33,6 +33,10 @@ + #include "RenderLayerCompositor.h" + #include "ScrollingCoordinator.h" + ++#ifndef __WORDSIZE ++#define __WORDSIZE (__SIZEOF_LONG__ * 8) ++#endif ++ + namespace WebCore { + + class EventRegionContext; --_----------=_159594624377630--