openkylin
/
webkit2gtk
mirror of https://gitee.com/openkylin/webkit2gtk.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed debian/source/format to native

This commit is contained in:
openKylinBot 2022-05-14 03:18:04 +08:00
parent 4257995859
commit f5723d2765
12 changed files with 1 additions and 431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
debian/patches/detect-gstreamer-gl.patch vendored
View File

@ -1,23 +0,0 @@
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: Disable USE_GSTREAMER_GL is the package is not found
===================================================================
---
Source/cmake/GStreamerChecks.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
index 18b12f8..98f1de7 100644
--- a/Source/cmake/GStreamerChecks.cmake
+++ b/Source/cmake/GStreamerChecks.cmake
@@ -31,7 +31,8 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
endif ()
if (USE_GSTREAMER_GL AND NOT PC_GSTREAMER_GL_FOUND)
- message(FATAL_ERROR "GStreamerGL is needed for USE_GSTREAMER_GL.")
+ set(USE_GSTREAMER_GL OFF)
+ message(STATUS "GStreamerGL is needed for USE_GSTREAMER_GL.")
endif ()
SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)

23
debian/patches/detect-woff.patch vendored
View File

@ -1,23 +0,0 @@
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: Disable USE_WOFF2 if the package is not found
===================================================================
---
Source/cmake/OptionsGTK.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index e8df652..979b5a3 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -382,7 +382,8 @@ endif ()
if (USE_WOFF2)
find_package(WOFF2Dec 1.0.2)
if (NOT WOFF2DEC_FOUND)
- message(FATAL_ERROR "libwoff2dec is needed for USE_WOFF2.")
+ set(USE_WOFF2 OFF)
+ message(STATUS "libwoff2dec is needed for USE_WOFF2.")
endif ()
endif ()

29
debian/patches/dont-detect-sse2.patch vendored
View File

@ -1,29 +0,0 @@
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: Don't check for SSE2 support on i386
===================================================================
---
Source/cmake/WebKitCompilerFlags.cmake | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
index 4944664..d11a26f 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
+++ b/Source/cmake/WebKitCompilerFlags.cmake
@@ -138,15 +138,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
if (CMAKE_COMPILER_IS_GNUCXX)
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
endif ()
-
- # Force SSE2 fp on x86 builds.
- if (WTF_CPU_X86 AND NOT CMAKE_CROSSCOMPILING)
- WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-msse2 -mfpmath=sse)
- include(DetectSSE2)
- if (NOT SSE2_SUPPORT_FOUND)
- message(FATAL_ERROR "SSE2 support is required to compile WebKit")
- endif ()
- endif ()
endif ()
if (COMPILER_IS_GCC_OR_CLANG AND NOT MSVC)

172
debian/patches/fix-ftbfs-m68k.patch vendored
View File

@ -1,172 +0,0 @@
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: Fix FTBFS on m68k
===================================================================
---
Source/WTF/wtf/PlatformCPU.h | 5 +++++
Source/WebCore/css/CSSProperty.cpp | 4 ++++
Source/WebCore/dom/ElementRareData.cpp | 4 ++++
Source/WebCore/dom/NodeRareData.cpp | 4 ++++
Source/WebCore/dom/ShadowRoot.cpp | 4 ++++
Source/WebCore/platform/graphics/FontCascadeDescription.cpp | 4 ++++
Source/WebCore/rendering/style/RenderStyle.cpp | 8 ++++++++
Source/WebCore/rendering/style/StyleBoxData.cpp | 4 ++++
Source/WebCore/style/RuleData.cpp | 4 ++++
9 files changed, 41 insertions(+)
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index 2e101c2..b4472e3 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -35,6 +35,11 @@
/* ==== CPU() - the target CPU architecture ==== */
/* CPU(KNOWN) becomes true if we explicitly support a target CPU. */
+/* CPU(M68K) - m68k */
+#if defined(__m68k__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
/* CPU(MIPS) - MIPS 32-bit and 64-bit */
#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) || defined(__mips64))
#if defined(_ABI64) && (_MIPS_SIM == _ABI64)
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp
index c460595..6d71344 100644
--- a/Source/WebCore/css/CSSProperty.cpp
+++ b/Source/WebCore/css/CSSProperty.cpp
@@ -33,7 +33,11 @@ struct SameSizeAsCSSProperty {
void* value;
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(CSSProperty) <= sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
+#else
COMPILE_ASSERT(sizeof(CSSProperty) == sizeof(SameSizeAsCSSProperty), CSSProperty_should_stay_small);
+#endif
CSSPropertyID StylePropertyMetadata::shorthandID() const
{
diff --git a/Source/WebCore/dom/ElementRareData.cpp b/Source/WebCore/dom/ElementRareData.cpp
index 8aaeaec..038853a 100644
--- a/Source/WebCore/dom/ElementRareData.cpp
+++ b/Source/WebCore/dom/ElementRareData.cpp
@@ -56,6 +56,10 @@ struct SameSizeAsElementRareData : NodeRareData {
};
+#if defined(__m68k__)
+static_assert(sizeof(ElementRareData) <= sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
+#else
static_assert(sizeof(ElementRareData) == sizeof(SameSizeAsElementRareData), "ElementRareData should stay small");
+#endif
} // namespace WebCore
diff --git a/Source/WebCore/dom/NodeRareData.cpp b/Source/WebCore/dom/NodeRareData.cpp
index 4eb631c..cd8abcf 100644
--- a/Source/WebCore/dom/NodeRareData.cpp
+++ b/Source/WebCore/dom/NodeRareData.cpp
@@ -40,7 +40,11 @@ struct SameSizeAsNodeRareData {
void* m_pointer[2];
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(NodeRareData) <= sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
+#else
COMPILE_ASSERT(sizeof(NodeRareData) == sizeof(SameSizeAsNodeRareData), NodeRareDataShouldStaySmall);
+#endif
// Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
static_assert(Page::maxNumberOfFrames < 1024, "Frame limit should fit in rare data count");
diff --git a/Source/WebCore/dom/ShadowRoot.cpp b/Source/WebCore/dom/ShadowRoot.cpp
index 6f4f4c4..9654111 100644
--- a/Source/WebCore/dom/ShadowRoot.cpp
+++ b/Source/WebCore/dom/ShadowRoot.cpp
@@ -58,7 +58,11 @@ struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {
Optional<HashMap<AtomString, AtomString>> partMappings;
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(ShadowRoot) <= sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
+#else
COMPILE_ASSERT(sizeof(ShadowRoot) == sizeof(SameSizeAsShadowRoot), shadowroot_should_stay_small);
+#endif
ShadowRoot::ShadowRoot(Document& document, ShadowRootMode type, DelegatesFocus delegatesFocus)
: DocumentFragment(document, CreateShadowRoot)
diff --git a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
index 8eb4471..8864394 100644
--- a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
+++ b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
@@ -51,7 +51,11 @@ struct SameSizeAsFontCascadeDescription {
unsigned bitfields3 : 10;
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(FontCascadeDescription) >= sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#else
COMPILE_ASSERT(sizeof(FontCascadeDescription) == sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#endif
FontCascadeDescription::FontCascadeDescription()
: m_isAbsoluteSize(false)
diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
index 9054200..2df4e78 100644
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -65,7 +65,11 @@ struct SameSizeAsBorderValue {
int m_restBits;
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(BorderValue) <= sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
+#else
COMPILE_ASSERT(sizeof(BorderValue) == sizeof(SameSizeAsBorderValue), BorderValue_should_not_grow);
+#endif
struct SameSizeAsRenderStyle {
void* dataRefs[7];
@@ -83,7 +87,11 @@ struct SameSizeAsRenderStyle {
#endif
};
+#if defined(__m68k__)
+static_assert(sizeof(RenderStyle) <= sizeof(SameSizeAsRenderStyle), "RenderStyle should stay small");
+#else
static_assert(sizeof(RenderStyle) == sizeof(SameSizeAsRenderStyle), "RenderStyle should stay small");
+#endif
DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(RenderStyle);
diff --git a/Source/WebCore/rendering/style/StyleBoxData.cpp b/Source/WebCore/rendering/style/StyleBoxData.cpp
index db977a8..77ae85c 100644
--- a/Source/WebCore/rendering/style/StyleBoxData.cpp
+++ b/Source/WebCore/rendering/style/StyleBoxData.cpp
@@ -33,7 +33,11 @@ struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> {
uint32_t bitfields;
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(StyleBoxData) <= sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
+#else
COMPILE_ASSERT(sizeof(StyleBoxData) == sizeof(SameSizeAsStyleBoxData), StyleBoxData_should_not_grow);
+#endif
DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(StyleBoxData);
diff --git a/Source/WebCore/style/RuleData.cpp b/Source/WebCore/style/RuleData.cpp
index 7b9adee..f32e706 100644
--- a/Source/WebCore/style/RuleData.cpp
+++ b/Source/WebCore/style/RuleData.cpp
@@ -60,7 +60,11 @@ struct SameSizeAsRuleData {
unsigned d[4];
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(RuleData) <= sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
+#else
COMPILE_ASSERT(sizeof(RuleData) == sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
+#endif
static inline MatchBasedOnRuleHash computeMatchBasedOnRuleHash(const CSSSelector& selector)
{

25
debian/patches/fix-ftbfs-sparc64.patch vendored
View File

@ -1,25 +0,0 @@
From: David Matthew Mattli <dmm@mattli.us>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: Fix FTBFS in sparc64
===================================================================
---
Source/WTF/wtf/PlatformCPU.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index bce23e0..2e101c2 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -89,6 +89,11 @@
#define WTF_CPU_KNOWN 1
#endif
+/* CPU(SPARC64) - sparc64 */
+#if defined(__sparc__) && defined(__sparc_v9__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
/* CPU(X86) - i386 / x86 32-bit */
#if defined(__i386__) \
|| defined(i386) \

40
debian/patches/fix-ftbfs-x32.patch vendored
View File

@ -1,40 +0,0 @@
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: fix-ftbfs-x32
===================================================================
---
CMakeLists.txt | 2 ++
Source/WTF/wtf/PlatformCPU.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5f5b9d..89fc21f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,6 +93,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
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)")
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index b4472e3..e280f5a 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -117,10 +117,12 @@
/* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
#if defined(__x86_64__) \
|| defined(_M_X64)
+#if !defined(__ILP32__)
#define WTF_CPU_X86_64 1
#define WTF_CPU_X86_SSE2 1
#define WTF_CPU_KNOWN 1
#endif
+#endif
/* CPU(ARM64) - Apple */
#if (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__)

24
debian/patches/fix-ftbfs-x86.patch vendored
View File

@ -1,24 +0,0 @@
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: fix-ftbfs-x86
===================================================================
---
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b5f7a7..a5f5b9d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,6 +93,10 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
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

32
debian/patches/prefer-pthread.patch vendored
View File

@ -1,32 +0,0 @@
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: prefer-pthread
===================================================================
---
Source/cmake/OptionsGTK.cmake | 2 ++
Source/cmake/OptionsJSCOnly.cmake | 1 +
2 files changed, 3 insertions(+)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 979b5a3..6a61e3e 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT
set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+
find_package(Cairo 1.14.0 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
index b2e8741..326ade2 100644
--- a/Source/cmake/OptionsJSCOnly.cmake
+++ b/Source/cmake/OptionsJSCOnly.cmake
@@ -1,3 +1,4 @@
+set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
if (MSVC)

26
debian/patches/reduce-memory-overheads.patch vendored
View File

@ -1,26 +0,0 @@
From: Alberto Garcia <berto@igalia.com>
Date: Sat, 14 May 2022 03:18:03 +0800
Subject: Reduce memory usage when not using the Gold linker
===================================================================
---
Source/cmake/OptionsCommon.cmake | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index a574ef8..1eacda8 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -112,6 +112,12 @@ if (DEBUG_FISSION)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gdb-index")
endif ()
+# Pass --reduce-memory-overheads to the bfd linker in order to save memory
+if (NOT USE_LD_GOLD)
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--reduce-memory-overheads")
+endif ()
+
# Enable the usage of OpenMP.
# - At this moment, OpenMP is only used as an alternative implementation
# to native threads for the parallelization of the SVG filters.

10
debian/patches/series vendored
View File

@ -1,10 +0,0 @@
fix-ftbfs-sparc64.patch
fix-ftbfs-x86.patch
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

26
debian/patches/user-agent-branding.patch vendored
View File

@ -1,26 +0,0 @@
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(+)
diff --git a/Source/WebCore/platform/glib/UserAgentGLib.cpp b/Source/WebCore/platform/glib/UserAgentGLib.cpp
index 7e7c9b5..908efa1 100644
--- a/Source/WebCore/platform/glib/UserAgentGLib.cpp
+++ b/Source/WebCore/platform/glib/UserAgentGLib.cpp
@@ -89,6 +89,9 @@ static String buildUserAgentString(const UserAgentQuirks& quirks)
else {
uaString.append(platformForUAString());
uaString.appendLiteral("; ");
+#if defined(USER_AGENT_GTK_DISTRIBUTOR_NAME)
+ uaString.appendLiteral(USER_AGENT_GTK_DISTRIBUTOR_NAME "; ");
+#endif
uaString.append(platformVersionForUAString());
}

2
debian/source/format vendored
View File

@ -1 +1 @@
3.0 (quilt)
3.0 (native)