aboutsummaryrefslogtreecommitdiff
path: root/srcpkgs/qt5-webkit
diff options
context:
space:
mode:
authorĐoàn Trần Công Danh <congdanhqx@gmail.com>2021-06-19 03:03:21 +0000
committerĐoàn Trần Công Danh <sgn.danh@gmail.com>2021-06-20 06:17:29 +0000
commit635e9da391995fe80fb8cd5783363a62a52a54c3 (patch)
tree5fbc1614071957b94acb2a129eea7a12066b7980 /srcpkgs/qt5-webkit
parent49cb564d140a79e3a1a85c753aaef429981e4e67 (diff)
downloadvoid-packages-635e9da391995fe80fb8cd5783363a62a52a54c3.tar
void-packages-635e9da391995fe80fb8cd5783363a62a52a54c3.tar.gz
void-packages-635e9da391995fe80fb8cd5783363a62a52a54c3.tar.bz2
void-packages-635e9da391995fe80fb8cd5783363a62a52a54c3.tar.lz
void-packages-635e9da391995fe80fb8cd5783363a62a52a54c3.tar.xz
void-packages-635e9da391995fe80fb8cd5783363a62a52a54c3.tar.zst
void-packages-635e9da391995fe80fb8cd5783363a62a52a54c3.zip
srcpkgs/q*: convert patches to -Np1
* par is kept at -Np0 ```sh git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" | while read template; do for p in ${template%/template}/patches/*; do sed -i ' \,^[+-][+-][+-] /dev/null,b /^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b s,^[*][*][*] ,&a/, /^--- /{ s,\(^--- \)\(./\)*,\1a/, s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1, s/[.-][Oo][Rr][Ii][Gg]$// s/[.]patched[.]\([^.]\)/.\1/ h } /^+++ -/{ g s/^--- a/+++ b/ b } s,\(^+++ \)\(./\)*,\1b/, ' "$p" done sed -i '/^patch_args=/d' $template done ```
Diffstat (limited to 'srcpkgs/qt5-webkit')
-rw-r--r--srcpkgs/qt5-webkit/patches/armv6.patch12
-rw-r--r--srcpkgs/qt5-webkit/patches/bison3.7.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/jsc-musl.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/mips-isa-32.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/mips-isa-rev.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/musl-mcontext.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/musl-ppc.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/ppc-llint.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch4
-rw-r--r--srcpkgs/qt5-webkit/patches/reduce-exports.patch8
-rw-r--r--srcpkgs/qt5-webkit/template1
11 files changed, 26 insertions, 27 deletions
diff --git a/srcpkgs/qt5-webkit/patches/armv6.patch b/srcpkgs/qt5-webkit/patches/armv6.patch
index e60ac2a1c9a..d2911d6d717 100644
--- a/srcpkgs/qt5-webkit/patches/armv6.patch
+++ b/srcpkgs/qt5-webkit/patches/armv6.patch
@@ -23,8 +23,8 @@ Reviewed by NOBODY (OOPS!).
diff --git Source/JavaScriptCore/llint/LowLevelInterpreter.asm Source/JavaScriptCore/llint/LowLevelInterpreter.asm
index ab3c0c8e771..6c32eef8852 100644
---- Source/JavaScriptCore/llint/LowLevelInterpreter.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
@@ -1167,7 +1167,13 @@ macro setEntryAddress(index, label)
move index, t4
storep t1, [a0, t4, 8]
@@ -42,8 +42,8 @@ index ab3c0c8e771..6c32eef8852 100644
storep t4, [a0, t3, 4]
diff --git Source/JavaScriptCore/offlineasm/arm.rb Source/JavaScriptCore/offlineasm/arm.rb
index c8064a59196..a9c40c8995c 100644
---- Source/JavaScriptCore/offlineasm/arm.rb
-+++ Source/JavaScriptCore/offlineasm/arm.rb
+--- a/Source/JavaScriptCore/offlineasm/arm.rb
++++ b/Source/JavaScriptCore/offlineasm/arm.rb
@@ -504,6 +504,8 @@ class Instruction
when "mvlbl"
$asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
@@ -55,8 +55,8 @@ index c8064a59196..a9c40c8995c 100644
when "bieq", "bpeq", "bbeq"
diff --git Source/JavaScriptCore/offlineasm/instructions.rb Source/JavaScriptCore/offlineasm/instructions.rb
index bbfce7193b3..8cc1cb961ce 100644
---- Source/JavaScriptCore/offlineasm/instructions.rb
-+++ Source/JavaScriptCore/offlineasm/instructions.rb
+--- a/Source/JavaScriptCore/offlineasm/instructions.rb
++++ b/Source/JavaScriptCore/offlineasm/instructions.rb
@@ -261,7 +261,8 @@ X86_INSTRUCTIONS =
ARM_INSTRUCTIONS =
[
diff --git a/srcpkgs/qt5-webkit/patches/bison3.7.patch b/srcpkgs/qt5-webkit/patches/bison3.7.patch
index b7c3711bcdf..57855f12e50 100644
--- a/srcpkgs/qt5-webkit/patches/bison3.7.patch
+++ b/srcpkgs/qt5-webkit/patches/bison3.7.patch
@@ -1,5 +1,5 @@
---- Source/WebCore/css/makegrammar.pl 2020-04-14 00:51:51.000000000 +0200
-+++ Source/WebCore/css/makegrammar.pl 2020-10-25 14:59:39.879927464 +0100
+--- a/Source/WebCore/css/makegrammar.pl 2020-04-14 00:51:51.000000000 +0200
++++ b/Source/WebCore/css/makegrammar.pl 2020-10-25 14:59:39.879927464 +0100
@@ -73,7 +73,6 @@
}
diff --git a/srcpkgs/qt5-webkit/patches/jsc-musl.patch b/srcpkgs/qt5-webkit/patches/jsc-musl.patch
index b8b77523196..0165f21dc25 100644
--- a/srcpkgs/qt5-webkit/patches/jsc-musl.patch
+++ b/srcpkgs/qt5-webkit/patches/jsc-musl.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/runtime/Options.h 2020-04-14 00:51:51.000000000 +0200
-+++ - 2020-07-11 18:53:50.372744315 +0200
+--- a/Source/JavaScriptCore/runtime/Options.h 2020-04-14 00:51:51.000000000 +0200
++++ b/Source/JavaScriptCore/runtime/Options.h 2020-04-14 00:51:51.000000000 +0200
@@ -40,6 +40,16 @@
namespace JSC {
diff --git a/srcpkgs/qt5-webkit/patches/mips-isa-32.patch b/srcpkgs/qt5-webkit/patches/mips-isa-32.patch
index cfa3b72296c..4e823f4e3c0 100644
--- a/srcpkgs/qt5-webkit/patches/mips-isa-32.patch
+++ b/srcpkgs/qt5-webkit/patches/mips-isa-32.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2019-08-15 20:56:14.000000000 +0200
-+++ Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2020-03-04 10:43:29.468482593 +0100
+--- a/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2019-08-15 20:56:14.000000000 +0200
++++ b/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2020-03-04 10:43:29.468482593 +0100
@@ -315,11 +315,7 @@
void countLeadingZeros32(RegisterID src, RegisterID dest)
diff --git a/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch b/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch
index 78d03b9d3e4..b696ae4c53e 100644
--- a/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch
+++ b/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch
@@ -1,5 +1,5 @@
---- Source/WTF/wtf/Platform.h 2020-04-14 00:51:51.000000000 +0200
-+++ Source/WTF/wtf/Platform.h 2020-08-02 15:08:02.169747050 +0200
+--- a/Source/WTF/wtf/Platform.h 2020-04-14 00:51:51.000000000 +0200
++++ b/Source/WTF/wtf/Platform.h 2020-08-02 15:08:02.169747050 +0200
@@ -95,7 +95,12 @@
#define WTF_MIPS_PIC (defined __PIC__)
#define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v)
diff --git a/srcpkgs/qt5-webkit/patches/musl-mcontext.patch b/srcpkgs/qt5-webkit/patches/musl-mcontext.patch
index c15587f1991..32ae39b2668 100644
--- a/srcpkgs/qt5-webkit/patches/musl-mcontext.patch
+++ b/srcpkgs/qt5-webkit/patches/musl-mcontext.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/heap/MachineStackMarker.cppg 2019-01-12 19:48:12.801137040 +0100
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp 2019-01-12 20:09:03.662201571 +0100
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cppg 2019-01-12 19:48:12.801137040 +0100
++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2019-01-12 20:09:03.662201571 +0100
@@ -681,7 +681,19 @@
#endif
diff --git a/srcpkgs/qt5-webkit/patches/musl-ppc.patch b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
index 21d3017397e..cb3b961b939 100644
--- a/srcpkgs/qt5-webkit/patches/musl-ppc.patch
+++ b/srcpkgs/qt5-webkit/patches/musl-ppc.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/heap/MachineStackMarker.cpp
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
+--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp
++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -87,7 +87,11 @@ static void pthreadSignalHandlerSuspendResume(int, siginfo_t*, void* ucontext)
ucontext_t* userContext = static_cast<ucontext_t*>(ucontext);
diff --git a/srcpkgs/qt5-webkit/patches/ppc-llint.patch b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
index 2fc5a46e523..96440d2e2e3 100644
--- a/srcpkgs/qt5-webkit/patches/ppc-llint.patch
+++ b/srcpkgs/qt5-webkit/patches/ppc-llint.patch
@@ -3,8 +3,8 @@ This fixes JavaScriptCore on big endian systems (mainly ppc).
Without the patch, attempting to run any JS results in
a crash as the generated code was endian specific.
---- Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
-+++ Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+--- a/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ b/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
@@ -1500,13 +1500,13 @@ _llint_op_put_by_id:
loadp StructureChain::m_vector[t3], t3
assert(macro (ok) btpnz t3, ok end)
diff --git a/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch b/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch
index d3adbba9c32..d017b895697 100644
--- a/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch
+++ b/srcpkgs/qt5-webkit/patches/qt-musl-execinfo.patch
@@ -1,5 +1,5 @@
---- Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2018-01-20 16:53:35.000000000 +0100
-+++ Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2019-01-12 18:56:04.698975664 +0100
+--- a/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2018-01-20 16:53:35.000000000 +0100
++++ b/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2019-01-12 18:56:04.698975664 +0100
@@ -51,8 +51,10 @@
#include <cxxabi.h>
#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK))
diff --git a/srcpkgs/qt5-webkit/patches/reduce-exports.patch b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
index 7addb0f7c16..f5c2a5d82d4 100644
--- a/srcpkgs/qt5-webkit/patches/reduce-exports.patch
+++ b/srcpkgs/qt5-webkit/patches/reduce-exports.patch
@@ -3,8 +3,8 @@ Author: Dmitry Shachnev <mitya57@debian.org>
Forwarded: not-needed
Last-Update: 2017-08-27
---- Source/WTF/wtf/ExportMacros.h
-+++ Source/WTF/wtf/ExportMacros.h
+--- a/Source/WTF/wtf/ExportMacros.h
++++ b/Source/WTF/wtf/ExportMacros.h
@@ -56,7 +56,7 @@
#elif defined(__GNUC__) && !defined(__CC_ARM) && !defined(__ARMCC__)
@@ -14,8 +14,8 @@ Last-Update: 2017-08-27
#define WTF_IMPORT_DECLARATION WTF_EXPORT_DECLARATION
#define WTF_HIDDEN_DECLARATION __attribute__((visibility("hidden")))
---- Source/cmake/OptionsQt.cmake
-+++ Source/cmake/OptionsQt.cmake
+--- a/Source/cmake/OptionsQt.cmake
++++ b/Source/cmake/OptionsQt.cmake
@@ -658,6 +658,7 @@ if (COMPILER_IS_GCC_OR_CLANG AND UNIX)
if (NOT SHARED_CORE)
set(CMAKE_C_FLAGS "-fvisibility=hidden ${CMAKE_C_FLAGS}")
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 353a7e6609b..b2e7813cc45 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -25,7 +25,6 @@ license="LGPL-2.1-or-later"
homepage="https://www.qt.io/"
distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-opensource-src-${_v}.tar.xz"
checksum=9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17
-patch_args=-Np0
CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
CXXFLAGS="-fpermissive -Wno-class-memaccess -Wno-redundant-move -Wno-deprecated-copy"