webkit-gtk: Update wip/webkit-gtk to 2.22.2

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: webkit-gtk: Update wip/webkit-gtk to 2.22.2
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Tue, 25 Sep 2018 20:36:19 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Tue Sep 25 22:36:19 2018 +0200
Changeset:	1724bcfa16a20ab985385700a8e95444f4f3ec4f

Modified Files:
	webkit-gtk/Makefile
	webkit-gtk/PLIST
	webkit-gtk/distinfo
	webkit-gtk/patches/patch-CMakeLists.txt
	webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
	webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake

Log Message:
webkit-gtk: Update wip/webkit-gtk to 2.22.2

Changes:
WebKitGTK+ 2.22.2
=================
  - Several fixes for video playback with media source extensions (MSE).
    This allows using WebM support for YouTube, which no longer works through
    regular video source. Note that MSE is still disabled by default and
    webkit_settings_set_enable_mediasource() has to be used to enable the
    feature.
  - Fix the build when only Wayland support is enabled and X11 headers are
    not available.

WebKitGTK+ 2.22.1
=================
  - Fix printing in landscape.
  - Fix the build in several platforms: s390x, ppc64le, armv7hl.
  - Fix the build with a11y disabled.
  - Fix the build with video disabled.
  - Fix several crashes and rendering issues.

WebKitGTK+ 2.22.0
==================
  - Add warn_unused_result attribute to some JavaScriptCore GLib APIs.
  - Make pinch to zoom scale the page without changing the layout.
  - Fix the build in mips64.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1724bcfa16a20ab985385700a8e95444f4f3ec4f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/Makefile                                      |  3 +--
 webkit-gtk/PLIST                                         | 16 +++++++++++++---
 webkit-gtk/distinfo                                      | 14 +++++++-------
 webkit-gtk/patches/patch-CMakeLists.txt                  |  6 +++---
 ...ebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp | 14 +++++++-------
 webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake |  6 +++---
 6 files changed, 34 insertions(+), 25 deletions(-)

diffs:
diff --git a/webkit-gtk/Makefile b/webkit-gtk/Makefile
index 267b604747..a118e71a0e 100644
--- a/webkit-gtk/Makefile
+++ b/webkit-gtk/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.144 2018/08/22 09:47:59 wiz Exp $
 
-DISTNAME=	webkitgtk-2.20.5
+DISTNAME=	webkitgtk-2.22.2
 PKGNAME=	${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=	.tar.xz
diff --git a/webkit-gtk/PLIST b/webkit-gtk/PLIST
index 20b7efd0e6..8404e1fb62 100644
--- a/webkit-gtk/PLIST
+++ b/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2018/08/19 19:59:12 wiz Exp $
+@comment $NetBSD$
 bin/WebKitWebDriver
 include/webkitgtk-4.0/JavaScriptCore/JSBase.h
 include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -8,6 +8,16 @@ include/webkitgtk-4.0/JavaScriptCore/JSTypedArray.h
 include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
 include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
 include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
+include/webkitgtk-4.0/jsc/JSCAutocleanups.h
+include/webkitgtk-4.0/jsc/JSCClass.h
+include/webkitgtk-4.0/jsc/JSCContext.h
+include/webkitgtk-4.0/jsc/JSCDefines.h
+include/webkitgtk-4.0/jsc/JSCException.h
+include/webkitgtk-4.0/jsc/JSCValue.h
+include/webkitgtk-4.0/jsc/JSCVersion.h
+include/webkitgtk-4.0/jsc/JSCVirtualMachine.h
+include/webkitgtk-4.0/jsc/JSCWeakValue.h
+include/webkitgtk-4.0/jsc/jsc.h
 include/webkitgtk-4.0/webkit2/WebKitApplicationInfo.h
 include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
 include/webkitgtk-4.0/webkit2/WebKitAutocleanups.h
@@ -198,10 +208,10 @@ ${PLIST.introspection}lib/girepository-1.0/WebKit2-4.0.typelib
 ${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.7.13
+lib/libjavascriptcoregtk-4.0.so.18.11.3
 lib/libwebkit2gtk-4.0.so
 lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.28.5
+lib/libwebkit2gtk-4.0.so.37.33.3
 lib/pkgconfig/javascriptcoregtk-4.0.pc
 lib/pkgconfig/webkit2gtk-4.0.pc
 lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index 35d05ea37a..cc4471f663 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -1,10 +1,10 @@
 $NetBSD: distinfo,v 1.105 2018/08/19 19:59:12 wiz Exp $
 
-SHA1 (webkitgtk-2.20.5.tar.xz) = 63bff8f9b3811e8ee294c0c1af6a7e2e453f0916
-RMD160 (webkitgtk-2.20.5.tar.xz) = 6a4cda986d2a4c4762b0daf0ff2007cd95b72b79
-SHA512 (webkitgtk-2.20.5.tar.xz) = d92fd079ec2826b2880ae5b2d90795ee3071a331bd7a576230b77b9f67a829ab27f09a9b0241a780f612f4f78ea5cc849e4b3d09285d4903eb600a7a7729c1e7
-Size (webkitgtk-2.20.5.tar.xz) = 16625200 bytes
-SHA1 (patch-CMakeLists.txt) = 684aad9e5bcc25b1afc128a1b5df00f34f1208e9
+SHA1 (webkitgtk-2.22.2.tar.xz) = ff0c40e81e240aa0743f7e6483f175defebd1417
+RMD160 (webkitgtk-2.22.2.tar.xz) = f8f16a72800debdf9b74a03151299f16f69fcc1c
+SHA512 (webkitgtk-2.22.2.tar.xz) = 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
+Size (webkitgtk-2.22.2.tar.xz) = 16769120 bytes
+SHA1 (patch-CMakeLists.txt) = e41dffe2a680dcb6a8b975e5236ef35db114550c
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e
@@ -16,8 +16,8 @@ SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807
 SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
 SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
 SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
-SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 6a8c147b0606a55c18f4bef46a3bbf2932349c58
-SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 67f71d609c7c7459447a9be8a5a7ad8455f88a33
+SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 3051360e2770360781027f6f0153e0ea6f304073
+SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 91a7e63ebeac06cca21547aa7025a55a4d174b6d
 SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = f5235df843849f8e1dd8fceaa015bc91785d8b3b
diff --git a/webkit-gtk/patches/patch-CMakeLists.txt b/webkit-gtk/patches/patch-CMakeLists.txt
index 903af75703..9356bf4013 100644
--- a/webkit-gtk/patches/patch-CMakeLists.txt
+++ b/webkit-gtk/patches/patch-CMakeLists.txt
@@ -4,7 +4,7 @@ $NetBSD: patch-CMakeLists.txt,v 1.4 2018/04/28 19:10:13 wiz Exp $
 - Fix support for ppc and add support for sparc64.
   From FreeBSD and OpenBSD ports.
 
---- CMakeLists.txt.orig	2018-02-19 07:44:43.000000000 +0000
+--- CMakeLists.txt.orig	2018-09-06 11:51:31.000000000 +0000
 +++ CMakeLists.txt
 @@ -85,6 +85,8 @@ else ()
  endif ()
@@ -14,8 +14,8 @@ $NetBSD: patch-CMakeLists.txt,v 1.4 2018/04/28 19:10:13 wiz Exp $
 +    set(WTF_CPU_ARM 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
      set(WTF_CPU_ARM64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-@@ -93,11 +95,13 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
+@@ -95,11 +97,13 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
      set(WTF_CPU_X86_64 1)
  elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
      set(WTF_CPU_X86 1)
diff --git a/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp b/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
index a986a00ebf..0a7d4324af 100644
--- a/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
+++ b/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
@@ -2,12 +2,12 @@ $NetBSD: patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp,v 1
 
 SunOS does not support DT_{DIR,REG}
 
---- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig	2018-02-19 07:45:32.000000000 +0000
+--- Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp.orig	2018-07-25 11:56:32.000000000 +0000
 +++ Source/WebKit/NetworkProcess/cache/NetworkCacheFileSystem.cpp
-@@ -50,6 +50,12 @@ namespace NetworkCache {
- 
+@@ -54,6 +54,12 @@ namespace NetworkCache {
  static DirectoryEntryType directoryEntryType(uint8_t dtype)
  {
+ #if !OS(WINDOWS)
 +#ifndef DT_DIR
 +#define DT_DIR	S_IFDIR
 +#endif
@@ -17,10 +17,10 @@ SunOS does not support DT_{DIR,REG}
      switch (dtype) {
      case DT_DIR:
          return DirectoryEntryType::Directory;
-@@ -63,12 +69,20 @@ static DirectoryEntryType directoryEntry
- 
+@@ -71,12 +77,20 @@ static DirectoryEntryType directoryEntry
  void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
  {
+ #if !OS(WINDOWS)
 +#ifdef __sun
 +    struct stat s;
 +#endif
@@ -38,7 +38,7 @@ SunOS does not support DT_{DIR,REG}
              continue;
          const char* name = dp->d_name;
          if (!strcmp(name, ".") || !strcmp(name, ".."))
-@@ -76,7 +90,11 @@ void traverseDirectory(const String& pat
+@@ -84,7 +98,11 @@ void traverseDirectory(const String& pat
          auto nameString = String::fromUTF8(name);
          if (nameString.isNull())
              continue;
@@ -49,4 +49,4 @@ SunOS does not support DT_{DIR,REG}
 +#endif
      }
      closedir(dir);
- }
+ #else
diff --git a/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake b/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
index 974283f437..1b081fb60b 100644
--- a/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
+++ b/webkit-gtk/patches/patch-Source_WebKit_PlatformGTK.cmake
@@ -2,11 +2,11 @@ $NetBSD: patch-Source_WebKit_PlatformGTK.cmake,v 1.1 2018/05/16 18:55:45 jperkin
 
 SunOS ld does not support --version-script.
 
---- Source/WebKit/PlatformGTK.cmake.orig	2018-04-10 07:33:13.000000000 +0000
+--- Source/WebKit/PlatformGTK.cmake.orig	2018-08-21 16:06:11.000000000 +0000
 +++ Source/WebKit/PlatformGTK.cmake
-@@ -24,7 +24,7 @@ add_definitions(-DLOCALEDIR="${CMAKE_INS
+@@ -22,7 +22,7 @@ add_definitions(-DPKGLIBEXECDIR="${LIBEX
+ add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
  add_definitions(-DLIBDIR="${LIB_INSTALL_DIR}")
- add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
  
 -if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
 +if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" AND NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
Prev by Date: webkit-gtk: Import webkitgtk-2.20.5nb1 as wip/webkit-gtk
Next by Date: webkit-gtk: Add initial support for NetBSD JIT
Previous by Thread: webkit-gtk: Import webkitgtk-2.20.5nb1 as wip/webkit-gtk
Next by Thread: webkit-gtk: Add initial support for NetBSD JIT
Indexes:
Home | Main Index | Thread Index | Old Index