Commit 264d9eda authored by Alberto Garcia's avatar Alberto Garcia
Browse files

Refresh all patches

parent 1e59da7a
......@@ -3,6 +3,10 @@ webkit2gtk (2.29.1-1) UNRELEASED; urgency=medium
* New upstream development release (Closes: #945237).
* debian/watch, debian/gbp.conf:
+ Update for 2.29.x packages in experimental.
* Refresh all patches.
* debian/patches/dont-fallback-to-libwpe.patch,
debian/patches/user-agent-branding.patch:
+ Drop these patches, they are now included upstream.
-- Alberto Garcia <berto@igalia.com> Mon, 18 May 2020 14:00:33 +0200
......
......@@ -5,7 +5,7 @@ Index: webkitgtk/Source/cmake/OptionsGTK.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsGTK.cmake
+++ webkitgtk/Source/cmake/OptionsGTK.cmake
@@ -382,7 +382,8 @@ endif ()
@@ -406,7 +406,8 @@ endif ()
if (USE_WOFF2)
find_package(WOFF2Dec 1.0.2)
if (NOT WOFF2DEC_FOUND)
......
From: Alberto Garcia <berto@igalia.com>
Subject: Don't create a PlatformDisplayLibWPE as a fallback when using Wayland or X11
Origin: https://trac.webkit.org/changeset/260750
Bug: https://bugs.webkit.org/show_bug.cgi?id=209431
Bug-Debian: https://bugs.debian.org/956219
Index: webkitgtk/Source/WebCore/platform/graphics/PlatformDisplay.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/platform/graphics/PlatformDisplay.cpp
+++ webkitgtk/Source/WebCore/platform/graphics/PlatformDisplay.cpp
@@ -90,12 +90,6 @@ std::unique_ptr<PlatformDisplay> Platfor
}
#endif // PLATFORM(GTK)
-#if USE(WPE_RENDERER)
- return PlatformDisplayLibWPE::create();
-#elif PLATFORM(WIN)
- return PlatformDisplayWin::create();
-#endif
-
#if PLATFORM(WAYLAND)
if (auto platformDisplay = PlatformDisplayWayland::create())
return platformDisplay;
@@ -113,6 +107,12 @@ std::unique_ptr<PlatformDisplay> Platfor
return PlatformDisplayX11::create(nullptr);
#endif
+#if USE(WPE_RENDERER)
+ return PlatformDisplayLibWPE::create();
+#elif PLATFORM(WIN)
+ return PlatformDisplayWin::create();
+#endif
+
RELEASE_ASSERT_NOT_REACHED();
}
......@@ -69,7 +69,7 @@ Index: webkitgtk/Source/WebCore/dom/ShadowRoot.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/dom/ShadowRoot.cpp
+++ webkitgtk/Source/WebCore/dom/ShadowRoot.cpp
@@ -58,7 +58,11 @@ struct SameSizeAsShadowRoot : public Doc
@@ -59,7 +59,11 @@ struct SameSizeAsShadowRoot : public Doc
Optional<HashMap<AtomString, AtomString>> partMappings;
};
......@@ -145,7 +145,7 @@ Index: webkitgtk/Source/WebCore/style/RuleData.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/style/RuleData.cpp
+++ webkitgtk/Source/WebCore/style/RuleData.cpp
@@ -60,7 +60,11 @@ struct SameSizeAsRuleData {
@@ -59,7 +59,11 @@ struct SameSizeAsRuleData {
unsigned d[4];
};
......
......@@ -20,13 +20,13 @@ Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
#endif
+#endif
/* CPU(ARM64) - Apple */
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)
/* CPU(ARM64) */
#if defined(__arm64__) || defined(__aarch64__)
Index: webkitgtk/CMakeLists.txt
===================================================================
--- webkitgtk.orig/CMakeLists.txt
+++ webkitgtk/CMakeLists.txt
@@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
@@ -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)
......
......@@ -9,7 +9,7 @@ Index: webkitgtk/CMakeLists.txt
===================================================================
--- webkitgtk.orig/CMakeLists.txt
+++ webkitgtk/CMakeLists.txt
@@ -93,6 +93,10 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
@@ -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)
......
......@@ -8,9 +8,9 @@ Index: webkitgtk/Source/cmake/OptionsGTK.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsGTK.cmake
+++ webkitgtk/Source/cmake/OptionsGTK.cmake
@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAK
set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
@@ -33,6 +33,8 @@ if (USER_AGENT_BRANDING)
add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}")
endif ()
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+
......
......@@ -6,9 +6,9 @@ Index: webkitgtk/Source/cmake/OptionsCommon.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsCommon.cmake
+++ webkitgtk/Source/cmake/OptionsCommon.cmake
@@ -112,6 +112,12 @@ if (DEBUG_FISSION)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
endif ()
@@ -95,6 +95,12 @@ option(GCC_OFFLINEASM_SOURCE_MAP
"Produce debug line information for offlineasm-generated code"
${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT})
+# Pass --reduce-memory-overheads to the bfd linker in order to save memory
+if (NOT USE_LD_GOLD)
......
......@@ -4,8 +4,6 @@ fix-ftbfs-m68k.patch
fix-ftbfs-x32.patch
detect-gstreamer-gl.patch
detect-woff.patch
user-agent-branding.patch
prefer-pthread.patch
dont-detect-sse2.patch
reduce-memory-overheads.patch
dont-fallback-to-libwpe.patch
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Thu, 26 Feb 2015 21:38:13 -0500
Subject: user-agent-branding
Add optional distributor string to user agent
https://bugs.webkit.org/show_bug.cgi?id=162611
https://src.fedoraproject.org/rpms/webkit2gtk3/blob/master/f/user-agent-branding.patch
---
Source/WebCore/platform/glib/UserAgentGLib.cpp | 3 +++
1 file changed, 3 insertions(+)
Index: webkitgtk/Source/WebCore/platform/glib/UserAgentGLib.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/platform/glib/UserAgentGLib.cpp
+++ webkitgtk/Source/WebCore/platform/glib/UserAgentGLib.cpp
@@ -89,6 +89,9 @@ static String buildUserAgentString(const
else {
uaString.append(platformForUAString());
uaString.appendLiteral("; ");
+#if defined(USER_AGENT_GTK_DISTRIBUTOR_NAME)
+ uaString.appendLiteral(USER_AGENT_GTK_DISTRIBUTOR_NAME "; ");
+#endif
uaString.append(platformVersionForUAString());
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment