On Wed, Jul 07, 2021 at 06:40:39PM +0200, Sebastian Ramacher wrote:
> > At the moment doing an additional security release for wpewebkit
> > is going to be little more than adapting the webkit2gtk advisory.
>
> ACK, then please send a (filtered) debdiff for wpewebkit to the bug
> report so that we can look at unblocking it.
Attached.
Berto
diff -Nru wpewebkit-2.30.6/debian/changelog wpewebkit-2.32.1/debian/changelog
--- wpewebkit-2.30.6/debian/changelog 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/changelog 2021-05-08 16:53:58.000000000 +0200
@@ -1,3 +1,39 @@
+wpewebkit (2.32.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/patches/revert-soname-change.patch:
+ + Drop this patch, this is now upstream.
+ * debian/patches/fix-ftbfs-m68k.patch:
+ + Update patch.
+
+ -- Alberto Garcia <be...@igalia.com> Sat, 08 May 2021 16:53:58 +0200
+
+wpewebkit (2.32.0-2) unstable; urgency=medium
+
+ * debian/patches/fix-ftbfs-m68k.patch:
+ + Compile BytecodeGenerator.cpp without optimizations on m68k and sh4,
+ otherwise the build fails due to gcc bugs.
+
+ -- Alberto Garcia <be...@igalia.com> Thu, 22 Apr 2021 15:24:36 +0200
+
+wpewebkit (2.32.0-1) experimental; urgency=medium
+
+ * New upstream release.
+ * debian/gbp.conf:
+ + Update upstream branch name.
+ * Use -DFORCE_32BIT on 32-bit builds.
+ + This replaces debian/patches/fix-ftbfs-x86.patch.
+ * Refresh all patches.
+ * Update copyright information of all files.
+ * debian/control:
+ + Add build dependencies on libglib2.0-doc and libsoup2.4-doc.
+ * debian/libwpewebkit-1.0-3.symbols:
+ + Update symbols.
+ * debian/patches/revert-soname-change.patch:
+ + Revert upstream soname change.
+
+ -- Alberto Garcia <be...@igalia.com> Tue, 06 Apr 2021 11:20:35 +0200
+
wpewebkit (2.30.6-1) unstable; urgency=high
* New upstream release.
diff -Nru wpewebkit-2.30.6/debian/control wpewebkit-2.32.1/debian/control
--- wpewebkit-2.30.6/debian/control 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/control 2021-05-08 16:53:58.000000000 +0200
@@ -35,7 +35,9 @@
ninja-build,
ruby:native,
wayland-protocols
-Build-Depends-Indep: gtk-doc-tools
+Build-Depends-Indep: gtk-doc-tools,
+ libglib2.0-doc,
+ libsoup2.4-doc
Standards-Version: 4.5.1
Rules-Requires-Root: no
Vcs-Browser: https://salsa.debian.org/webkit-team/webkit
diff -Nru wpewebkit-2.30.6/debian/copyright wpewebkit-2.32.1/debian/copyright
--- wpewebkit-2.30.6/debian/copyright 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/copyright 2021-05-08 16:53:58.000000000 +0200
@@ -8,14 +8,14 @@
1999-2000 Lars Knoll <kn...@kde.org>
2001 Dirk Mueller <muel...@kde.org>
2002-2013 Vivek Thampi
- 2003-2020 Apple Inc
+ 2003-2021 Apple Inc
2004-2006 Rob Buis <b...@kde.org>
2004-2008 Nikolas Zimmermann <zimmerm...@kde.org>
- 2005 Alexey Proskuryakov
2005 Frerich Raabe <ra...@kde.org>
2005 Maksim Orlovich <mak...@kde.org>
- 2005, 2007-2013, 2015, 2017-2020 Google Inc
+ 2005, 2007-2013, 2015, 2017-2021 Google Inc
2005, 2008-2013 Nokia
+ 2005-2006 Alexey Proskuryakov
2005-2006 Kimmo Kinnunen <kimmo.t.kinnu...@nokia.com>
2005-2008 Eric Seidel <e...@webkit.org>
2006 Alexander Kellett <lypa...@kde.org>
@@ -46,7 +46,7 @@
2009-2010 Holger Hans Peter Freyther
2009-2011 Brent Fulgham <bfulg...@webkit.org>
2009-2015 University of Szeged
- 2009-2020 Igalia S.L.
+ 2009-2021 Igalia S.L.
2010 Andras Becsi <abe...@inf.u-szeged.hu>, University of Szeged
2010 Mozilla Corporation
2010 Peter Varga <pva...@inf.u-szeged.hu>, University of Szeged
@@ -70,7 +70,7 @@
2011 Peter Varga <pva...@webkit.org>, University of Szeged
2011 ProFUSION embedded systems
2011 Renata Hodovan <r...@webkit.org>
- 2011, 2015-2017 The Chromium Authors
+ 2011, 2014-2017 The Chromium Authors
2011-2012, 2014-2015 Ericsson AB
2011-2013 Intel Corporation
2011-2013 Samsung Electronics
@@ -111,14 +111,14 @@
2015, 2018 Andy VanWagoner <andy@vanwagoner.family>
2015-2016 Sukolsak Sakshuwong <sukol...@gmail.com>
2015-2017 Canon Inc
- 2015-2017 Devin Rousso <web...@devinrousso.com>
+ 2015-2020 Devin Rousso <web...@devinrousso.com>
2016 Caitlin Potter <ca...@igalia.com>
2016 Konstantin Tokavev <annu...@yandex.ru>
2016 Yusuke Suzuki <yusuke.suz...@sslab.ics.keio.ac.jp>
2016-2018 Akamai Technologies Inc
2016-2019 Oleksandr Skachkov <gskach...@gmail.com>
- 2016-2020 Metrological Group B.V
- 2016-2020 Sony Interactive Entertainment
+ 2016-2021 Metrological Group B.V
+ 2016-2021 Sony Interactive Entertainment
2017 Caio Lima <ticaiol...@gmail.com>
2017 Endless Mobile Inc
2017 Oleksandr Skachkov <gskack...@gmail.com>
@@ -126,7 +126,8 @@
2018 Yusuke Suzuki <yusukesuz...@slowstart.org>
2018 mce sys Ltd
2019 Carlos Eduardo Ramalho <cadubent...@gmail.com>
- 2019-2020 Alexey Shvayka <shvaikal...@gmail.com>
+ 2019-2021 Alexey Shvayka <shvaikal...@gmail.com>
+ 2020 Cloudinary Inc
2020 Darryl Pogue <dar...@dpogue.ca>
2020 Jan-Michael Brummer <jan.brum...@tabos.org>
2020 WikiMedia Foundation. All Rights Reserve
@@ -212,6 +213,7 @@
Source/WebCore/Modules/webdatabase/*
Source/WebCore/Scripts/extract-localizable-strings.pl
Source/WebCore/accessibility/*
+ Source/WebCore/animation/*
Source/WebCore/bindings/js/*
Source/WebCore/css/*
Source/WebCore/dom/*
@@ -260,7 +262,7 @@
Source/WebInspectorUI/UserInterface/Views/*
Source/WebKit/UIProcess/Launcher/playstation/ProcessLauncherPlayStation.cpp
Tools/TestWebKitAPI/Tests/WTF/*
-Copyright: 2003, 2005-2020 Apple Inc
+Copyright: 2003, 2005-2021 Apple Inc
2006 Alexey Proskuryakov
2006 Alexey Proskuryakov <a...@webkit.org>
2006 Michael Emmel mike.em...@gmail.com
@@ -292,7 +294,6 @@
2012, 2018 Igalia S.L.
2012-2014 Adobe Systems Inc
2013 Samsung Electronics
- 2013 University of Washington
2013 Xidorn Quan <quanxunz...@gmail.com>
2015 Canon Inc
2016 Konstantin Tokavev <annu...@yandex.ru>
@@ -305,9 +306,7 @@
Copyright: 2004 Apple Inc
License: BSD-3-clause-apple-mozilla
-Files: Source/WebCore/Modules/fetch/DOMWindowFetch.cpp
- Source/WebCore/Modules/fetch/DOMWindowFetch.h
- Source/WebCore/Modules/fetch/FetchBody.cpp
+Files: Source/WebCore/Modules/fetch/FetchBody.cpp
Source/WebCore/Modules/fetch/FetchBody.h
Source/WebCore/Modules/fetch/FetchBodyOwner.cpp
Source/WebCore/Modules/fetch/FetchBodyOwner.h
@@ -320,8 +319,6 @@
Source/WebCore/Modules/fetch/FetchRequest.h
Source/WebCore/Modules/fetch/FetchResponse.cpp
Source/WebCore/Modules/fetch/FetchResponse.h
- Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.cpp
- Source/WebCore/Modules/fetch/WorkerGlobalScopeFetch.h
Source/WebCore/Modules/streams/ReadableStreamSource.h
Source/WebCore/bindings/js/JSReadableStreamSourceCustom.cpp
Source/WebCore/bindings/js/ReadableStreamDefaultController.cpp
@@ -346,8 +343,6 @@
Source/WebCore/Modules/mediastream/PeerConnectionBackend.cpp
Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
Source/WebCore/Modules/mediastream/RTCIceTransport.h
- Source/WebCore/Modules/mediastream/RTCPeerConnection.js
- Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js
Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
Source/WebCore/Modules/mediastream/RTCRtpReceiver.h
Source/WebCore/Modules/mediastream/RTCRtpSender.cpp
@@ -437,12 +432,13 @@
Source/WebCore/Modules/mediastream/RTCConfiguration.h
Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp
Source/WebCore/Modules/mediastream/RTCIceCandidate.h
+ Source/WebCore/Modules/mediastream/RTCIceCandidateInit.h
Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
Source/WebCore/Modules/mediastream/RTCPeerConnection.h
Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp
Source/WebCore/Modules/mediastream/RTCSessionDescription.h
+ Source/WebCore/Modules/mediastream/RTCSessionDescriptionInit.h
Source/WebCore/Modules/notifications/*
- Source/WebCore/Modules/quota/*
Source/WebCore/Modules/speech/DOMWindowSpeechSynthesis.cpp
Source/WebCore/Modules/webauthn/apdu/*
Source/WebCore/Modules/webauthn/cbor/*
@@ -630,8 +626,8 @@
Source/WebCore/inspector/InstrumentingAgents.h
Source/WebCore/inspector/TimelineRecordFactory.cpp
Source/WebCore/inspector/TimelineRecordFactory.h
- Source/WebCore/inspector/WorkerScriptDebugServer.cpp
- Source/WebCore/inspector/WorkerScriptDebugServer.h
+ Source/WebCore/inspector/WorkerDebugger.cpp
+ Source/WebCore/inspector/WorkerDebugger.h
Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.cpp
Source/WebCore/inspector/agents/InspectorDOMDebuggerAgent.h
Source/WebCore/inspector/agents/InspectorIndexedDBAgent.cpp
@@ -801,7 +797,7 @@
Tools/TestWebKitAPI/Tests/WebCore/*
Tools/TestWebKitAPI/WTFStringUtilities.h
Copyright: 2003, 2005-2013, 2015, 2018 Google Inc
- 2004-2020 Apple Inc
+ 2004-2021 Apple Inc
2006-2008, 2010, 2012 the V8 project authors
2007-2009 Torch Mobile Inc
2008 Cameron Zwarich <cwzwar...@uwaterloo.ca>
@@ -842,6 +838,7 @@
Source/WebKit/UIProcess/API/wpe/WebKitSettings.h
Tools/TestWebKitAPI/Tests/WebKitGLib/TestWebKitSettings.cpp
Copyright: 2011-2012 Motorola Mobility
+ 2020 Apple Inc
License: BSD-3-clause-motorola
Files: Source/WebCore/html/track/VTTScanner.cpp
@@ -1145,6 +1142,7 @@
Source/WTF/wtf/text/unix/TextBreakIteratorInternalICUUnix.cpp
Source/WTF/wtf/unix/LanguageUnix.cpp
Source/WebCore/Modules/geolocation/*
+ Source/WebCore/Modules/webaudio/MediaStreamAudioSourceGStreamer.cpp
Source/WebCore/Modules/websockets/WebSocketFrame.cpp
Source/WebCore/PAL/config.h
Source/WebCore/WebCorePrefix.h
@@ -1173,7 +1171,7 @@
Source/WebCore/bindings/js/JSDOMConvertStrings.cpp
Source/WebCore/bindings/js/JSDOMExceptionHandling.cpp
Source/WebCore/bindings/js/JSDOMExceptionHandling.h
- Source/WebCore/bindings/js/JSDOMNamedConstructor.h
+ Source/WebCore/bindings/js/JSDOMLegacyFactoryFunction.h
Source/WebCore/bindings/js/JSDOMOperation.h
Source/WebCore/bindings/js/JSDOMOperationReturningPromise.h
Source/WebCore/bindings/js/JSDOMWindowBase.cpp
@@ -1419,7 +1417,7 @@
Source/WebCore/dom/WheelEvent.cpp
Source/WebCore/dom/WheelEvent.h
Source/WebCore/editing/EditingBehavior.h
- Source/WebCore/editing/EditingBehaviorTypes.h
+ Source/WebCore/editing/EditingBehaviorType.h
Source/WebCore/editing/TextCheckingHelper.h
Source/WebCore/editing/atk/FrameSelectionAtk.cpp
Source/WebCore/html/BaseTextInputType.cpp
@@ -1434,8 +1432,6 @@
Source/WebCore/html/FormNamedItem.h
Source/WebCore/html/HTMLAnchorElement.cpp
Source/WebCore/html/HTMLAnchorElement.h
- Source/WebCore/html/HTMLAppletElement.cpp
- Source/WebCore/html/HTMLAppletElement.h
Source/WebCore/html/HTMLAreaElement.cpp
Source/WebCore/html/HTMLAreaElement.h
Source/WebCore/html/HTMLBDIElement.h
@@ -1662,6 +1658,8 @@
Source/WebCore/platform/graphics/WidthIterator.cpp
Source/WebCore/platform/graphics/WidthIterator.h
Source/WebCore/platform/graphics/cairo/*
+ Source/WebCore/platform/graphics/coretext/FontCascadeCoreText.cpp
+ Source/WebCore/platform/graphics/coretext/FontPlatformDataCoreText.cpp
Source/WebCore/platform/graphics/egl/*
Source/WebCore/platform/graphics/filters/*
Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp
@@ -1675,6 +1673,8 @@
Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.h
Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/GRefPtrGStreamer.h
+ Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
+ Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.h
Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
@@ -1699,6 +1699,8 @@
Source/WebCore/platform/graphics/gstreamer/VideoSinkGStreamer.h
Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/VideoTextureCopierGStreamer.h
+ Source/WebCore/platform/graphics/gstreamer/WebKitAudioSinkGStreamer.cpp
+ Source/WebCore/platform/graphics/gstreamer/WebKitAudioSinkGStreamer.h
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp
Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h
Source/WebCore/platform/graphics/gstreamer/eme/*
@@ -1722,6 +1724,8 @@
Source/WebCore/platform/graphics/transforms/*
Source/WebCore/platform/image-decoders/ScalableImageDecoder.cpp
Source/WebCore/platform/mediastream/gstreamer/*
+ Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoCommon.cpp
+ Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoCommon.h
Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp
Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.h
Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoder.cpp
@@ -1735,13 +1739,11 @@
Source/WebCore/platform/network/NetworkingContext.h
Source/WebCore/platform/network/glib/NetworkStateNotifierGLib.cpp
Source/WebCore/platform/network/soup/CookieStorageSoup.cpp
- Source/WebCore/platform/network/soup/GRefPtrSoup.cpp
- Source/WebCore/platform/network/soup/GRefPtrSoup.h
Source/WebCore/platform/network/soup/GUniquePtrSoup.h
Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp
Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp
Source/WebCore/platform/network/soup/ResourceResponseSoup.cpp
- Source/WebCore/platform/soup/SharedBufferSoup.cpp
+ Source/WebCore/platform/network/soup/SoupVersioning.h
Source/WebCore/platform/text/BidiContext.cpp
Source/WebCore/platform/text/BidiContext.h
Source/WebCore/platform/text/BidiResolver.h
@@ -1762,6 +1764,7 @@
Source/WebCore/plugins/DOMPluginArray.h
Source/WebCore/plugins/PluginData.cpp
Source/WebCore/plugins/PluginData.h
+ Source/WebCore/preprocess-localizable-strings.pl
Source/WebCore/rendering/BidiRun.cpp
Source/WebCore/rendering/BidiRun.h
Source/WebCore/rendering/BreakLines.h
@@ -2385,8 +2388,9 @@
Source/WebKit/UIProcess/API/glib/WebKitInstallMissingMediaPluginsPermissionRequestPrivate.h
Source/WebKit/UIProcess/API/glib/WebKitJavascriptResult.cpp
Source/WebKit/UIProcess/API/glib/WebKitJavascriptResultPrivate.h
+ Source/WebKit/UIProcess/API/glib/WebKitMediaKeySystemPermissionRequest.cpp
+ Source/WebKit/UIProcess/API/glib/WebKitMediaKeySystemPermissionRequestPrivate.h
Source/WebKit/UIProcess/API/glib/WebKitMimeInfo.cpp
- Source/WebKit/UIProcess/API/glib/WebKitMimeInfoPrivate.h
Source/WebKit/UIProcess/API/glib/WebKitNavigationAction.cpp
Source/WebKit/UIProcess/API/glib/WebKitNavigationActionPrivate.h
Source/WebKit/UIProcess/API/glib/WebKitNavigationClient.cpp
@@ -2406,7 +2410,6 @@
Source/WebKit/UIProcess/API/glib/WebKitOptionMenuPrivate.h
Source/WebKit/UIProcess/API/glib/WebKitPermissionRequest.cpp
Source/WebKit/UIProcess/API/glib/WebKitPlugin.cpp
- Source/WebKit/UIProcess/API/glib/WebKitPluginPrivate.h
Source/WebKit/UIProcess/API/glib/WebKitPointerLockPermissionRequest.cpp
Source/WebKit/UIProcess/API/glib/WebKitPointerLockPermissionRequestPrivate.h
Source/WebKit/UIProcess/API/glib/WebKitPolicyDecision.cpp
@@ -2477,6 +2480,7 @@
Source/WebKit/UIProcess/API/wpe/WebKitInputMethodContextWPE.cpp
Source/WebKit/UIProcess/API/wpe/WebKitInstallMissingMediaPluginsPermissionRequest.h
Source/WebKit/UIProcess/API/wpe/WebKitJavascriptResult.h
+ Source/WebKit/UIProcess/API/wpe/WebKitMediaKeySystemPermissionRequest.h
Source/WebKit/UIProcess/API/wpe/WebKitMimeInfo.h
Source/WebKit/UIProcess/API/wpe/WebKitNavigationAction.h
Source/WebKit/UIProcess/API/wpe/WebKitNavigationPolicyDecision.h
@@ -2527,6 +2531,7 @@
Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h
Source/WebKit/UIProcess/UserMediaProcessManager.cpp
Source/WebKit/UIProcess/UserMediaProcessManager.h
+ Source/WebKit/UIProcess/glib/UserMediaPermissionRequestManagerProxyGLib.cpp
Source/WebKit/WebProcess/InjectedBundle/API/glib/DOM/*
Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitConsoleMessage.cpp
Source/WebKit/WebProcess/InjectedBundle/API/glib/WebKitConsoleMessagePrivate.h
@@ -2588,7 +2593,7 @@
2000-2003 Dirk Mueller <muel...@kde.org>
2001 Tobias Anton <an...@stud.fbi.fh-darmstadt.de>
2002-2003 The Karbon Developers
- 2002-2020 Apple Inc
+ 2002-2021 Apple Inc
2003-2017 Inc
2004 Zack Rusin <z...@kde.org>
2004, 2015 Red Hat Inc
@@ -2652,7 +2657,7 @@
2009-2010 Gustavo Noronha Silva
2009-2010 Rob Buis <rwlb...@gmail.com>
2009-2011 Torch Mobile (Beijing) Co
- 2009-2020 Igalia S.L.
+ 2009-2021 Igalia S.L.
2010 Andras Becsi <abe...@inf.u-szeged.hu>, University of Szeged
2010 Daniel Bates <dba...@intudata.com>
2010 Peter Varga <pva...@inf.u-szeged.hu>, University of Szeged
@@ -2698,7 +2703,7 @@
2015-2020 Metrological Group B.V
2017 Aidan Holm <aidanh...@gmail.com>
2017 Endless Mobile Inc
- 2017 Sony Interactive Entertainment
+ 2017, 2020 Sony Interactive Entertainment
2018-2019 Zodiac Inflight Innovations
2020 Jan-Michael Brummer <jan.brum...@tabos.org>
2020 Noam Rosenthal <n...@webkit.org>
@@ -2733,6 +2738,8 @@
Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderLayer.h
+ Source/WebCore/rendering/RenderLayerScrollableArea.cpp
+ Source/WebCore/rendering/RenderLayerScrollableArea.h
Source/WebCore/rendering/RenderMarquee.cpp
Source/WebCore/rendering/RenderMarquee.h
Source/WebCore/rendering/ScrollAlignment.cpp
@@ -2744,6 +2751,7 @@
2007-2009 Torch Mobile Inc
2009 Google Inc
2019 Adobe
+ 2020 Igalia S.L.
License: LGPL-2.1+ or MPL-1.1
Files: Source/JavaScriptCore/runtime/JSDateMath.h
diff -Nru wpewebkit-2.30.6/debian/gbp.conf wpewebkit-2.32.1/debian/gbp.conf
--- wpewebkit-2.30.6/debian/gbp.conf 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/gbp.conf 2021-05-08 16:53:58.000000000 +0200
@@ -2,6 +2,6 @@
debian-tag = wpe/debian/%(version)s
debian-branch = wpe/unstable
upstream-tag = wpe/upstream/%(version)s
-upstream-branch = wpewebkit-2.30
+upstream-branch = wpewebkit-2.32
pristine-tar = False
compression = xz
diff -Nru wpewebkit-2.30.6/debian/libwpewebkit-1.0-3.symbols wpewebkit-2.32.1/debian/libwpewebkit-1.0-3.symbols
--- wpewebkit-2.30.6/debian/libwpewebkit-1.0-3.symbols 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/libwpewebkit-1.0-3.symbols 2021-05-08 16:53:58.000000000 +0200
@@ -116,6 +116,7 @@
webkit_application_info_set_name@Base 2.24.1
webkit_application_info_set_version@Base 2.24.1
webkit_application_info_unref@Base 2.24.1
+ webkit_audio_sink_get_type@Base 2.32.0
webkit_authentication_request_authenticate@Base 2.24.1
webkit_authentication_request_can_save_credentials@Base 2.24.1
webkit_authentication_request_cancel@Base 2.24.1
@@ -299,6 +300,7 @@
webkit_get_micro_version@Base 2.24.1
webkit_get_minor_version@Base 2.24.1
webkit_gl_video_sink_get_type@Base 2.28.0
+ webkit_gst_common_debug@Base 2.32.0
webkit_hit_test_result_context_get_type@Base 2.24.1
webkit_hit_test_result_context_is_editable@Base 2.24.1
webkit_hit_test_result_context_is_image@Base 2.24.1
@@ -354,6 +356,8 @@
webkit_javascript_result_ref@Base 2.24.1
webkit_javascript_result_unref@Base 2.24.1
webkit_load_event_get_type@Base 2.24.1
+ webkit_media_key_system_permission_get_name@Base 2.32.0
+ webkit_media_key_system_permission_request_get_type@Base 2.32.0
webkit_media_player_debug@Base 2.24.1
webkit_media_src_get_type@Base 2.24.1
webkit_mime_info_get_description@Base 2.24.1
@@ -378,6 +382,7 @@
webkit_navigation_type_get_type@Base 2.24.1
webkit_network_error_get_type@Base 2.24.1
webkit_network_error_quark@Base 2.24.1
+ webkit_text_sink_get_type@Base 2.32.0
webkit_network_proxy_mode_get_type@Base 2.24.1
webkit_network_proxy_settings_add_proxy_for_scheme@Base 2.24.1
webkit_network_proxy_settings_copy@Base 2.24.1
@@ -642,6 +647,8 @@
webkit_user_content_manager_remove_all_style_sheets@Base 2.24.1
webkit_user_content_manager_remove_filter@Base 2.24.1
webkit_user_content_manager_remove_filter_by_id@Base 2.26.2
+ webkit_user_content_manager_remove_script@Base 2.32.0
+ webkit_user_content_manager_remove_style_sheet@Base 2.32.0
webkit_user_content_manager_unregister_script_message_handler@Base 2.24.1
webkit_user_content_manager_unregister_script_message_handler_in_world@Base 2.24.1
webkit_user_media_permission_is_for_audio_device@Base 2.24.1
@@ -848,6 +855,7 @@
webkit_website_data_manager_get_offline_application_cache_directory@Base 2.24.1
webkit_website_data_manager_get_persistent_credential_storage_enabled@Base 2.30.0
webkit_website_data_manager_get_service_worker_registrations_directory@Base 2.30.0
+ webkit_website_data_manager_get_tls_errors_policy@Base 2.32.0
webkit_website_data_manager_get_type@Base 2.24.1
webkit_website_data_manager_get_websql_directory@Base 2.24.1
webkit_website_data_manager_is_ephemeral@Base 2.24.1
@@ -856,7 +864,9 @@
webkit_website_data_manager_remove@Base 2.24.1
webkit_website_data_manager_remove_finish@Base 2.24.1
webkit_website_data_manager_set_itp_enabled@Base 2.30.0
+ webkit_website_data_manager_set_network_proxy_settings@Base 2.32.0
webkit_website_data_manager_set_persistent_credential_storage_enabled@Base 2.30.0
+ webkit_website_data_manager_set_tls_errors_policy@Base 2.32.0
webkit_website_data_ref@Base 2.24.1
webkit_website_data_types_get_type@Base 2.24.1
webkit_website_data_unref@Base 2.24.1
diff -Nru wpewebkit-2.30.6/debian/patches/dont-detect-sse2.patch wpewebkit-2.32.1/debian/patches/dont-detect-sse2.patch
--- wpewebkit-2.30.6/debian/patches/dont-detect-sse2.patch 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/patches/dont-detect-sse2.patch 2021-05-08 16:53:58.000000000 +0200
@@ -6,7 +6,7 @@
===================================================================
--- webkitgtk.orig/Source/cmake/WebKitCompilerFlags.cmake
+++ webkitgtk/Source/cmake/WebKitCompilerFlags.cmake
-@@ -138,15 +138,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
+@@ -141,15 +141,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
if (CMAKE_COMPILER_IS_GNUCXX)
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
endif ()
diff -Nru wpewebkit-2.30.6/debian/patches/fix-ftbfs-m68k.patch wpewebkit-2.32.1/debian/patches/fix-ftbfs-m68k.patch
--- wpewebkit-2.30.6/debian/patches/fix-ftbfs-m68k.patch 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/patches/fix-ftbfs-m68k.patch 2021-05-08 16:53:58.000000000 +0200
@@ -38,7 +38,7 @@
===================================================================
--- webkitgtk.orig/Source/WebCore/dom/ElementRareData.cpp
+++ webkitgtk/Source/WebCore/dom/ElementRareData.cpp
-@@ -56,6 +56,10 @@ struct SameSizeAsElementRareData : NodeR
+@@ -50,6 +50,10 @@ struct SameSizeAsElementRareData : NodeR
};
@@ -53,7 +53,7 @@
===================================================================
--- webkitgtk.orig/Source/WebCore/dom/NodeRareData.cpp
+++ webkitgtk/Source/WebCore/dom/NodeRareData.cpp
-@@ -40,7 +40,11 @@ struct SameSizeAsNodeRareData {
+@@ -41,7 +41,11 @@ struct SameSizeAsNodeRareData {
void* m_pointer[2];
};
@@ -129,7 +129,7 @@
===================================================================
--- webkitgtk.orig/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
+++ webkitgtk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
-@@ -52,7 +52,11 @@ struct SameSizeAsFontCascadeDescription
+@@ -48,7 +48,11 @@ struct SameSizeAsFontCascadeDescription
unsigned bitfields3 : 10;
};
@@ -157,3 +157,42 @@
static inline MatchBasedOnRuleHash computeMatchBasedOnRuleHash(const CSSSelector& selector)
{
+Index: webkitgtk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+===================================================================
+--- webkitgtk.orig/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
++++ webkitgtk/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+@@ -62,6 +62,11 @@
+ #include <wtf/StdLibExtras.h>
+ #include <wtf/text/WTFString.h>
+
++#if defined(__m68k__) || defined(__SH4__)
++#pragma GCC push_options
++#pragma GCC optimize ("-O0")
++#endif
++
+ namespace JSC {
+
+ template<typename CallOp, typename = std::true_type>
+@@ -5503,3 +5508,6 @@ void printInternal(PrintStream& out, JSC
+
+ } // namespace WTF
+
++#if defined(__m68k__) || defined(__SH4__)
++#pragma GCC pop_options
++#endif
+Index: webkitgtk/Source/WebCore/css/CSSValue.cpp
+===================================================================
+--- webkitgtk.orig/Source/WebCore/css/CSSValue.cpp
++++ webkitgtk/Source/WebCore/css/CSSValue.cpp
+@@ -79,7 +79,11 @@ struct SameSizeAsCSSValue {
+ uint32_t bitfields;
+ };
+
++#if defined(__m68k__)
++COMPILE_ASSERT(sizeof(CSSValue) <= sizeof(SameSizeAsCSSValue), CSS_value_should_stay_small);
++#else
+ COMPILE_ASSERT(sizeof(CSSValue) == sizeof(SameSizeAsCSSValue), CSS_value_should_stay_small);
++#endif
+
+ bool CSSValue::isImplicitInitialValue() const
+ {
diff -Nru wpewebkit-2.30.6/debian/patches/fix-ftbfs-x32.patch wpewebkit-2.32.1/debian/patches/fix-ftbfs-x32.patch
--- wpewebkit-2.30.6/debian/patches/fix-ftbfs-x32.patch 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/patches/fix-ftbfs-x32.patch 2021-05-08 16:53:58.000000000 +0200
@@ -22,16 +22,16 @@
/* CPU(ARM64) */
#if defined(__arm64__) || defined(__aarch64__)
-Index: webkitgtk/CMakeLists.txt
+Index: webkitgtk/Source/cmake/WebKitCommon.cmake
===================================================================
---- webkitgtk.orig/CMakeLists.txt
-+++ webkitgtk/CMakeLists.txt
-@@ -97,6 +97,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
- set(WTF_CPU_MIPS64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
- set(WTF_CPU_MIPS 1)
-+elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
-+ set(WTF_CPU_UNKNOWN 1)
- elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(x64|x86_64|amd64)")
- set(WTF_CPU_X86_64 1)
- elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(i[3-6]86|x86)")
+--- webkitgtk.orig/Source/cmake/WebKitCommon.cmake
++++ webkitgtk/Source/cmake/WebKitCommon.cmake
+@@ -90,6 +90,8 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
+ set(WTF_CPU_MIPS64 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
+ set(WTF_CPU_MIPS 1)
++ elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
++ set(WTF_CPU_UNKNOWN 1)
+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
+ # FORCE_32BIT is set in the build script when --32-bit is passed
+ # on a Linux/intel 64bit host. This allows us to produce 32bit
diff -Nru wpewebkit-2.30.6/debian/patches/fix-ftbfs-x86.patch wpewebkit-2.32.1/debian/patches/fix-ftbfs-x86.patch
--- wpewebkit-2.30.6/debian/patches/fix-ftbfs-x86.patch 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/patches/fix-ftbfs-x86.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,22 +0,0 @@
-From: Alberto Garcia <be...@igalia.com>
-Bug: https://bugs.webkit.org/show_bug.cgi?id=172799
-Description: Use CMAKE_CXX_LIBRARY_ARCHITECTURE to detect x86
- When building for x86 in a x86_64 host (e.g. with pbuilder) CMake
- will set CMAKE_SYSTEM_PROCESSOR to x86_64, and WebKit will assume
- that it's a 64-bit build. Let's use the C++ compiler architecture as
- a temporary solution to detect x86 correctly.
-Index: webkitgtk/CMakeLists.txt
-===================================================================
---- webkitgtk.orig/CMakeLists.txt
-+++ webkitgtk/CMakeLists.txt
-@@ -97,6 +97,10 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
- set(WTF_CPU_MIPS64 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
- set(WTF_CPU_MIPS 1)
-+elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(x64|x86_64|amd64)")
-+ set(WTF_CPU_X86_64 1)
-+elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(i[3-6]86|x86)")
-+ set(WTF_CPU_X86 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64|x86_64|amd64)")
- # FORCE_32BIT is set in the build script when --32-bit is passed
- # on a Linux/intel 64bit host. This allows us to produce 32bit
diff -Nru wpewebkit-2.30.6/debian/patches/prefer-pthread.patch wpewebkit-2.32.1/debian/patches/prefer-pthread.patch
--- wpewebkit-2.30.6/debian/patches/prefer-pthread.patch 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/patches/prefer-pthread.patch 2021-05-08 16:53:58.000000000 +0200
@@ -8,9 +8,9 @@
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsWPE.cmake
+++ webkitgtk/Source/cmake/OptionsWPE.cmake
-@@ -17,6 +17,8 @@ if (USER_AGENT_BRANDING)
- add_definitions(-DUSER_AGENT_BRANDING=${USER_AGENT_BRANDING})
- endif ()
+@@ -5,6 +5,8 @@ SET_PROJECT_VERSION(2 32 0)
+
+ set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+
diff -Nru wpewebkit-2.30.6/debian/patches/reduce-memory-overheads.patch wpewebkit-2.32.1/debian/patches/reduce-memory-overheads.patch
--- wpewebkit-2.30.6/debian/patches/reduce-memory-overheads.patch 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/patches/reduce-memory-overheads.patch 2021-05-08 16:53:58.000000000 +0200
@@ -6,9 +6,9 @@
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsCommon.cmake
+++ webkitgtk/Source/cmake/OptionsCommon.cmake
-@@ -95,6 +95,12 @@ option(GCC_OFFLINEASM_SOURCE_MAP
- "Produce debug line information for offlineasm-generated code"
- ${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT})
+@@ -102,6 +102,12 @@ option(GCC_OFFLINEASM_SOURCE_MAP
+
+ option(USE_APPLE_ICU "Use Apple's internal ICU" ${APPLE})
+# Pass --reduce-memory-overheads to the bfd linker in order to save memory
+if (NOT USE_LD_GOLD)
diff -Nru wpewebkit-2.30.6/debian/patches/series wpewebkit-2.32.1/debian/patches/series
--- wpewebkit-2.30.6/debian/patches/series 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/patches/series 2021-05-08 16:53:58.000000000 +0200
@@ -1,5 +1,4 @@
fix-ftbfs-sparc64.patch
-fix-ftbfs-x86.patch
fix-ftbfs-m68k.patch
fix-ftbfs-x32.patch
prefer-pthread.patch
diff -Nru wpewebkit-2.30.6/debian/rules wpewebkit-2.32.1/debian/rules
--- wpewebkit-2.30.6/debian/rules 2021-03-19 20:17:01.000000000 +0100
+++ wpewebkit-2.32.1/debian/rules 2021-05-08 16:53:58.000000000 +0200
@@ -11,6 +11,7 @@
# Sacrifice speed in order to make it more likely resource limits
# won't be hit.
ifeq ($(DEB_BUILD_ARCH_BITS),32)
+ EXTRA_CMAKE_ARGUMENTS += -DFORCE_32BIT=ON
LDFLAGS += -Wl,--no-keep-memory
endif
