summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorleot <leot@pkgsrc.org>2019-08-28 10:11:09 +0000
committerleot <leot@pkgsrc.org>2019-08-28 10:11:09 +0000
commitac19caca297f2ae10e6db624bc3a10ec0809f568 (patch)
treef26d082c94f90e51a1685c8da9484cecf554e19b /www
parent04cedff282ee31172a1a743dd0dcf3eb1b6fb182 (diff)
downloadpkgsrc-ac19caca297f2ae10e6db624bc3a10ec0809f568.tar.gz
webkit-gtk: Update to 2.24.4
pkgsrc changes: - Permit to use Python 3.x for build - Update REPLACE_* lists and add tool dependency to bash - Remove no longer needed patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp (fixed upstream) Changes: 2.24.4 ------ - Updated the user agent string to make happy certain websites which would claim that the browser being used was unsupported. - Improve loading of multimedia streams to avoid memory exhaustion due to excessive caching. - Fix display of documents with MIME type application/xml in the Web Inspector, when loaded using XmlHttpRequest. - Fix a hang while scrolling certain websites which include HLS video content (Twitter, for example). - Fix rounding artifacts in volume levels for media playback. - Fix several crashes and rendering issues. - Fix the build with video track support disabled. - Fix the build with OpenGL support disabled. - Fix build issue which would cause media controls to disappear when Python 3.x was used during the build process.
Diffstat (limited to 'www')
-rw-r--r--www/webkit-gtk/Makefile40
-rw-r--r--www/webkit-gtk/PLIST6
-rw-r--r--www/webkit-gtk/distinfo11
-rw-r--r--www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp16
4 files changed, 37 insertions, 36 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 83b15a6b67b..a6221afbaa1 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.170 2019/08/11 13:25:09 wiz Exp $
+# $NetBSD: Makefile,v 1.171 2019/08/28 10:11:09 leot Exp $
-DISTNAME= webkitgtk-2.24.3
+DISTNAME= webkitgtk-2.24.4
PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION= 2
CATEGORIES= www
MASTER_SITES= https://www.webkitgtk.org/releases/
EXTRACT_SUFX= .tar.xz
@@ -19,7 +18,7 @@ TOOL_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
USE_CMAKE= yes
USE_LANGUAGES= c c++11
-USE_TOOLS+= automake bison flex gmake perl pkg-config msgfmt
+USE_TOOLS+= automake bash bison flex gmake perl pkg-config msgfmt
# Enabling -gdwarf-2 hits GNU ar limits on file size.
CTF_SUPPORTED= no
@@ -45,33 +44,52 @@ CMAKE_ARGS+= -DUSE_GSTREAMER_GL=OFF
CMAKE_ARGS+= -DUSE_LIBHYPHEN=OFF
CMAKE_ARGS+= -DUSE_OPENJPEG=OFF
+REPLACE_PERL+= Source/JavaScriptCore/Scripts/*.pl
REPLACE_PERL+= Source/JavaScriptCore/create_hash_table
+REPLACE_PERL+= Source/WebCore/Scripts/*.pl
REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pl
REPLACE_PERL+= Source/WebCore/bindings/scripts/*.pm
REPLACE_PERL+= Source/WebCore/css/*.pl
REPLACE_PERL+= Source/WebCore/dom/*.pl
REPLACE_PERL+= Source/WebCore/make-hash-tools.pl
+REPLACE_PERL+= Source/WebInspectorUI/Scripts/*.pl
+REPLACE_PERL+= Source/WebKit/Scripts/*.pl
+REPLACE_PERL+= Source/cmake/tools/scripts/*.pl
REPLACE_PYTHON+= Source/JavaScriptCore/Scripts/*.py
-REPLACE_PYTHON+= Source/JavaScriptCore/Scripts/builtins/*.py
-REPLACE_PYTHON+= Source/JavaScriptCore/generate-bytecode-files
+REPLACE_PYTHON+= Source/JavaScriptCore/Scripts/wkbuiltins/*.py
REPLACE_PYTHON+= Source/JavaScriptCore/inspector/scripts/*.py
REPLACE_PYTHON+= Source/JavaScriptCore/inspector/scripts/codegen/*.py
REPLACE_PYTHON+= Source/JavaScriptCore/wasm/*.py
+REPLACE_PYTHON+= Source/JavaScriptCore/yarr/*.py
REPLACE_PYTHON+= Source/JavaScriptCore/yarr/create_regex_tables
REPLACE_PYTHON+= Source/JavaScriptCore/yarr/generateYarrCanonicalizeUnicode
-REPLACE_PYTHON+= Source/ThirdParty/gtest/*.py
+REPLACE_PYTHON+= Source/ThirdParty/ANGLE/src/compiler/translator/*.py
+REPLACE_PYTHON+= Source/ThirdParty/ANGLE/src/libANGLE/*.py
+REPLACE_PYTHON+= Source/ThirdParty/ANGLE/src/libGLESv2/*.py
REPLACE_PYTHON+= Source/ThirdParty/gtest/scripts/*.py
REPLACE_PYTHON+= Source/ThirdParty/gtest/test/*.py
REPLACE_PYTHON+= Source/ThirdParty/gtest/xcode/Scripts/*.py
-REPLACE_PYTHON+= Source/WebCore/PAL/*.py
REPLACE_PYTHON+= Source/WebCore/css/*.py
REPLACE_PYTHON+= Source/WebCore/html/parser/create-html-entity-table
REPLACE_PYTHON+= Source/WebCore/platform/network/create-http-header-name-table
REPLACE_PYTHON+= Source/WebKit/Scripts/*.py
REPLACE_PYTHON+= Tools/glib/*.py
-REPLACE_PYTHON+= Tools/gtk/*.py
-REPLACE_PYTHON+= Tools/gtk/generate-gtkdoc
+REPLACE_PYTHON+= Tools/gtkdoc/generate-gtkdoc
+
+REPLACE_BASH+= Source/ThirdParty/ANGLE/src/compiler/preprocessor/generate_parser.sh
+REPLACE_BASH+= Source/ThirdParty/ANGLE/src/compiler/translator/generate_parser.sh
+REPLACE_BASH+= Source/ThirdParty/gtest/xcode/Samples/FrameworkSample/runtests.sh
+REPLACE_BASH+= Source/ThirdParty/gtest/xcode/Scripts/runtests.sh
+REPLACE_BASH+= Source/WebKit/Scripts/process-entitlements.sh
+REPLACE_BASH+= Tools/gtk/install-dependencies
+
+REPLACE_RUBY+= Source/JavaScriptCore/b3/air/*.rb
+REPLACE_RUBY+= Source/JavaScriptCore/offlineasm/*.rb
+REPLACE_RUBY+= Source/WebCore/Scripts/*.rb
+REPLACE_RUBY+= Source/WebCore/domjit/*.rb
+REPLACE_RUBY+= Source/WebInspectorUI/Scripts/*.rb
+REPLACE_RUBY+= Source/WebKit/Scripts/*.rb
SUBST_CLASSES+= python
SUBST_FILES.python+= Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
@@ -80,11 +98,11 @@ SUBST_STAGE.python= pre-configure
SUBST_MESSAGE.python= Fixing path to python binary.
.include "../../lang/ruby/rubyversion.mk"
+.include "../../lang/ruby/replace.mk"
TOOL_DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
CMAKE_ARGS+= -DRUBY_EXECUTABLE=${RUBY}
PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 36 37 # not yet ported as of 2.22.5
.include "../../lang/python/application.mk"
CMAKE_ARGS+= -DPYTHON_EXECUTABLE=${PYTHONBIN}
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index 8a0b7b6f285..3da4c0e9632 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.51 2019/07/02 10:48:08 leot Exp $
+@comment $NetBSD: PLIST,v 1.52 2019/08/28 10:11:09 leot Exp $
bin/WebKitWebDriver
include/webkitgtk-4.0/JavaScriptCore/JSBase.h
include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
@@ -212,10 +212,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.13.6
+lib/libjavascriptcoregtk-4.0.so.18.13.7
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
-lib/libwebkit2gtk-4.0.so.37.37.5
+lib/libwebkit2gtk-4.0.so.37.37.6
lib/pkgconfig/javascriptcoregtk-4.0.pc
lib/pkgconfig/webkit2gtk-4.0.pc
lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index beb128fc38c..cfd25abe32d 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.124 2019/07/02 10:48:08 leot Exp $
+$NetBSD: distinfo,v 1.125 2019/08/28 10:11:09 leot Exp $
-SHA1 (webkitgtk-2.24.3.tar.xz) = 26a33fd0af8223c130427cd59aaf5ccaba584114
-RMD160 (webkitgtk-2.24.3.tar.xz) = e2ce5fc050e8ebd080e1ef63c3c8f7b29b502243
-SHA512 (webkitgtk-2.24.3.tar.xz) = b358bb11f7df477e5b3d6a12e2e6b41cb4e6a7274e34ce6299bf0c56044ffc7db5a834e9abf5c71d992ef41d194d30171b8be406420ffc54fe766cc811afb79f
-Size (webkitgtk-2.24.3.tar.xz) = 17912032 bytes
+SHA1 (webkitgtk-2.24.4.tar.xz) = f978b967422c6b423b11062375bab6506243388c
+RMD160 (webkitgtk-2.24.4.tar.xz) = 1f18a5475cd7ad5191c4412f6a1755294ef3e473
+SHA512 (webkitgtk-2.24.4.tar.xz) = 1d713955a735ae2e2229beea7bda7f518a6247c6aa7f5753aeb5b5c6395339d451d0d146f7188e7ba65cb82ea5a74a5e73e956fe59d5f5f97659a44af33df112
+Size (webkitgtk-2.24.4.tar.xz) = 17575784 bytes
SHA1 (patch-CMakeLists.txt) = 571c65d258b6e12503971145777a8d442578145f
SHA1 (patch-Source_JavaScriptCore_Scripts_check-xcfilelists.sh) = 5bb44be142b474d517b2b1459f0edc7d2453aa61
SHA1 (patch-Source_JavaScriptCore_Scripts_generate-unified-sources.sh) = 308a7c8f687253b4fc75de0c66016dd18666e697
@@ -22,7 +22,6 @@ SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = 2a7ff15a2ec01a77481f8
SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 740eb33931b6f9cb8008748323235f23466328dc
SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
-SHA1 (patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp) = 38c24500c7619d290b22efd730eb36086e32461f
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
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp
deleted file mode 100644
index 35a64902112..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_WebCore_platform_graphics_gstreamer_MediaPlayerPrivateGStreamer.cpp,v 1.1 2019/05/17 16:11:17 leot Exp $
-
-updateTextureMapperFlags() is available only if TEXTURE_MAPPER_GL is enabled.
-
---- Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp.orig 2019-05-09 09:36:07.000000000 +0000
-+++ Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
-@@ -2460,7 +2460,9 @@ void MediaPlayerPrivateGStreamer::create
- else if (g_str_has_prefix(elementName.get(), "imxvpudecoder"))
- player->m_videoDecoderPlatform = WebKitGstVideoDecoderPlatform::ImxVPU;
-
-+#if USE(TEXTURE_MAPPER_GL)
- player->updateTextureMapperFlags();
-+#endif
- }), this);
-
- g_signal_connect_swapped(m_pipeline.get(), "source-setup", G_CALLBACK(sourceSetupCallback), this);