Compare commits
220 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b012b80ce6 | ||
|
|
805944c3be | ||
|
|
705ab9cfa8 | ||
|
|
6a8a9af815 | ||
|
|
accfa5debd | ||
|
|
e100ee7a17 | ||
|
|
1bc1233c2c | ||
|
|
111066fcff | ||
|
|
e9cd5eaa76 | ||
|
|
f454be3fd1 | ||
|
|
acc325cd20 | ||
|
|
bf4f89ef11 | ||
|
|
4b570825a3 | ||
|
|
4ed776f273 | ||
|
|
7d652e77a5 | ||
|
|
50dcf60ec5 | ||
|
|
56d20d04c9 | ||
|
|
eea81f2f02 | ||
|
|
d0e1c7dfa8 | ||
|
|
55c35ad618 | ||
|
|
acca7bb89e | ||
|
|
f03151986f | ||
|
|
2a7182ae49 | ||
|
|
19daf171bc | ||
|
|
1d14658556 | ||
|
|
95247f68df | ||
|
|
dbaa715e88 | ||
|
|
ea0da612d3 | ||
|
|
86e5954ac4 | ||
|
|
11bc4dad00 | ||
|
|
759c43c959 | ||
|
|
70f01d15c8 | ||
|
|
463777b07d | ||
|
|
8e9ab98460 | ||
|
|
d67dad2242 | ||
|
|
aa09283b95 | ||
|
|
b90e2d1d67 | ||
|
|
52eb35f0bc | ||
|
|
bb6ce8f764 | ||
|
|
94eac66f04 | ||
|
|
72c8cf7cd9 | ||
|
|
66c24b384a | ||
|
|
bc59d80176 | ||
|
|
fcb218038f | ||
|
|
1f9a18deaf | ||
|
|
5ed3c46814 | ||
|
|
f4536030c5 | ||
|
|
3da2ea985d |
||
|
|
f9a8d97ab5 |
||
|
|
7b284015f8 |
||
|
|
253cecd14a |
||
|
|
ad45dc9795 |
||
|
|
8e0b9e7679 |
||
|
|
b474392c33 | ||
|
|
b34411c4e1 | ||
|
|
59dcd2129a | ||
|
|
31ae9e612f | ||
| e054a63d21 | |||
| a75df5ef71 | |||
|
|
5085babe1a | ||
|
|
4026e0ecdc | ||
|
|
1da6cf595e | ||
|
|
1efbf7b66a | ||
|
|
50cae696b7 | ||
|
|
89ffd39bfe | ||
|
|
4037c02354 | ||
|
|
f0d252c34a | ||
|
|
3de6cb0f07 | ||
|
|
e67beaa132 | ||
|
|
cb9c9e2943 | ||
|
|
70665b9a1b | ||
|
|
dc14ad6a0e | ||
|
|
9bc4c62d44 | ||
|
|
0c4f7535d1 | ||
|
|
24e021e102 | ||
|
|
535cf00bbf | ||
|
|
2a0e6c39ec | ||
|
|
7f54c2a997 | ||
|
|
3d068f5592 | ||
|
|
44f98a0ae6 | ||
|
|
dd7877f950 | ||
|
|
ea3f8cbb69 | ||
|
|
65829197f6 | ||
|
|
2d2a385141 | ||
|
|
1d0634e7b6 | ||
|
|
8b92690ea5 | ||
|
|
bfa0e4c055 | ||
|
|
aca76789af | ||
|
|
337c45ada0 | ||
|
|
98604192c5 | ||
|
|
72634a91c2 | ||
|
|
ba68f3ced9 | ||
|
|
56e83eb8d3 | ||
|
|
862ac4af72 | ||
|
|
5d9918b45f | ||
|
|
d99a3321c0 | ||
|
|
915328c4e3 | ||
|
|
0ee430763b | ||
|
|
92dbb98196 | ||
|
|
b852437da9 | ||
|
|
cd7e45ea21 | ||
|
|
c8d620fff1 | ||
|
|
9f3212f08f | ||
|
|
b9ea0b1c48 | ||
|
|
7d27584f98 | ||
|
|
9686c85def | ||
|
|
51944b0e92 | ||
|
|
1e672992aa | ||
|
|
ad97763211 | ||
|
|
9c17d1998a | ||
|
|
f428956b0e | ||
|
|
36e3f8cf9d | ||
|
|
951bdc8fab | ||
|
|
8b3f7edd99 | ||
|
|
a101936262 | ||
|
|
11e3dc7d2f | ||
|
|
4b92cd6fc1 | ||
|
|
3fae8fa930 | ||
|
|
7eeeb66a4d | ||
|
|
3b52a75db8 | ||
|
|
4195221bd0 | ||
|
|
ee8bb9de81 | ||
|
|
2148153a10 | ||
|
|
97d8057b53 | ||
|
|
69d2c3b175 | ||
|
|
77b316c320 | ||
|
|
470cabb576 | ||
|
|
c88765bc1c | ||
|
|
37202f93bb | ||
|
|
229fcf8dd1 | ||
|
|
1f31e30081 | ||
|
|
f25af2888e | ||
|
|
75a11a9b58 | ||
|
|
81ee50ea5f | ||
|
|
5d2c1672bc | ||
|
|
1c16daccce | ||
|
|
fac6852e56 | ||
|
|
9031227061 | ||
|
|
24785ab83f | ||
|
|
77f1f587bb | ||
|
|
251b98dde8 | ||
|
|
74b6630981 | ||
|
|
1b16ab2c81 | ||
|
|
2c5dd84529 | ||
|
|
16fa808834 | ||
|
|
7834b41a9a | ||
|
|
cc3da95bc5 | ||
|
|
d9ba8348ec | ||
|
|
534a7d9a08 | ||
|
|
ceaeceb230 | ||
|
|
6572eb6dda | ||
|
|
ca90fef86e | ||
| c49438eba2 | |||
| 48f4d80fd8 | |||
|
|
910efa726d | ||
|
|
fe40d5cdfa | ||
|
|
c1bc326cc3 | ||
| 9d80218444 | |||
|
|
d8d0090a1a | ||
|
|
bd953c0c56 | ||
|
|
6d5a3e0677 | ||
|
|
539232f491 | ||
|
|
e6d2a00c82 | ||
|
|
62a930c5c3 | ||
|
|
cdde02131f | ||
|
|
dc7100f290 | ||
|
|
c2dad176d5 | ||
|
|
f1d95b90e5 | ||
|
|
6e0535cfb1 | ||
|
|
26c36a7a74 | ||
|
|
8403183d21 | ||
|
|
bc79de4676 | ||
|
|
5165c7b46c | ||
|
|
61852f76ba | ||
|
|
51993a16ec | ||
|
|
1fafd340ae | ||
|
|
efa123cfe2 | ||
|
|
8ea0b4518b | ||
|
|
0ece072912 | ||
|
|
ce50e0c146 | ||
|
|
727223835f | ||
|
|
8c44a317e0 | ||
|
|
8131de03a1 | ||
|
|
7d569cc1f1 | ||
|
|
60dd5a7bce | ||
|
|
890756203a | ||
|
|
61134e96d5 | ||
|
|
dd43cfb350 | ||
|
|
dbe951a5c8 | ||
|
|
4f42586c97 | ||
|
|
272535e42b | ||
|
|
ac5e1580e0 | ||
|
|
e35f6649ae | ||
|
|
4d5e6a0219 | ||
|
|
833783752d | ||
|
|
23de11ba15 | ||
|
|
3cef058cb6 | ||
|
|
d00bf0a598 | ||
|
|
e0f7553bb1 | ||
|
|
f00bb3a29d | ||
|
|
d68620b3ca | ||
|
|
48f0bf46d3 | ||
|
|
759fefc112 | ||
|
|
f497650988 | ||
|
|
8b5ba2e8e8 | ||
|
|
84fffb1012 | ||
|
|
9f59291a48 | ||
|
|
39b912e279 | ||
|
|
3c18376a2f | ||
|
|
e50679909c | ||
|
|
04aa19ceb0 | ||
|
|
6e07a1f388 | ||
|
|
fa15a128bb | ||
|
|
4b95c93825 | ||
|
|
d7f83b7ec3 | ||
|
|
7bbf33be9f | ||
|
|
b9695cfbf7 | ||
|
|
359bbb5907 | ||
|
|
e391c831d0 | ||
|
|
e689e45d0c |
14 changed files with 546 additions and 1098 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +1,2 @@
|
|||
/webkitgtk-*.tar.xz
|
||||
/webkitgtk-*.tar.xz.asc
|
||||
|
|
|
|||
2
changelog
Normal file
2
changelog
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
* Thu Aug 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.37.1-12
|
||||
- Initial import. This manual changelog entry hides the repo's long git history from rpm-autospec.
|
||||
13
monitoring.toml
Normal file
13
monitoring.toml
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# Enable/disable monitoring
|
||||
monitoring = false
|
||||
# Enable/disable filling bugzilla ticket for new release
|
||||
# When disabled it will also disable scratch builds
|
||||
bugzilla = true
|
||||
# Enable/disable reporting only stable versions
|
||||
# Stable versions are recognized based on release-monitoring.org project settings
|
||||
stable_only = false
|
||||
# Enable/disable reporting all new versions instead of the latest one
|
||||
# Enabling this will disable scratch builds
|
||||
all_versions = false
|
||||
# Enable/disable scratch build for newly opened version
|
||||
scratch_build = false
|
||||
5
rpminspect.yaml
Normal file
5
rpminspect.yaml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
inspections:
|
||||
abidiff: off
|
||||
changedfiles: off
|
||||
filesize: off
|
||||
82
skia-s390x.patch
Normal file
82
skia-s390x.patch
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
diff --git a/Source/ThirdParty/skia/include/core/SkTypes.h b/Source/ThirdParty/skia/include/core/SkTypes.h
|
||||
index 79644da049ff..fc0646e21772 100644
|
||||
--- a/Source/ThirdParty/skia/include/core/SkTypes.h
|
||||
+++ b/Source/ThirdParty/skia/include/core/SkTypes.h
|
||||
@@ -33,6 +33,8 @@
|
||||
# undef SK_DIRECT3D
|
||||
#endif
|
||||
|
||||
+#if !defined(SK_R32_SHIFT) || !defined(SK_G32_SHIFT) || !defined(SK_B32_SHIFT) || !defined(SK_A32_SHIFT)
|
||||
+
|
||||
// If SK_R32_SHIFT is set, we'll use that to choose RGBA or BGRA.
|
||||
// If not, we'll default to RGBA everywhere except BGRA on Windows.
|
||||
#if defined(SK_R32_SHIFT)
|
||||
@@ -52,6 +54,8 @@
|
||||
#define SK_G32_SHIFT 8
|
||||
#define SK_A32_SHIFT 24
|
||||
|
||||
+#endif
|
||||
+
|
||||
/**
|
||||
* SK_PMCOLOR_BYTE_ORDER can be used to query the byte order of SkPMColor at compile time.
|
||||
*/
|
||||
diff --git a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
|
||||
index c321fb77c0ae..a0a01cccd58a 100644
|
||||
--- a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
|
||||
+++ b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
|
||||
@@ -14,6 +14,7 @@
|
||||
#include "include/core/SkTypes.h"
|
||||
#include "include/private/SkEncodedInfo.h"
|
||||
#include "modules/skcms/skcms.h"
|
||||
+#include "src/core/SkEndian.h"
|
||||
#include "src/codec/SkColorPalette.h"
|
||||
#include "src/core/SkColorData.h"
|
||||
|
||||
diff --git a/Source/ThirdParty/skia/src/core/Sk4px.h b/Source/ThirdParty/skia/src/core/Sk4px.h
|
||||
index d5d481e7e300..c7ef0bcd0ed0 100644
|
||||
--- a/Source/ThirdParty/skia/src/core/Sk4px.h
|
||||
+++ b/Source/ThirdParty/skia/src/core/Sk4px.h
|
||||
@@ -27,7 +27,9 @@ public:
|
||||
|
||||
// RGBA rgba XYZW xyzw -> AAAA aaaa WWWW wwww
|
||||
Sk4px alphas() const {
|
||||
+#ifdef SK_CPU_LENDIAN
|
||||
static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
|
||||
+#endif
|
||||
return Sk4px(skvx::shuffle<3,3,3,3, 7,7,7,7, 11,11,11,11, 15,15,15,15>(fV));
|
||||
}
|
||||
Sk4px inv() const { return Sk4px(skvx::byte16(255) - fV); }
|
||||
diff --git a/Source/ThirdParty/skia/src/core/SkColorPriv.h b/Source/ThirdParty/skia/src/core/SkColorPriv.h
|
||||
index 45471c25529e..319fec78069b 100644
|
||||
--- a/Source/ThirdParty/skia/src/core/SkColorPriv.h
|
||||
+++ b/Source/ThirdParty/skia/src/core/SkColorPriv.h
|
||||
@@ -64,6 +64,20 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
|
||||
* Here we enforce this constraint.
|
||||
*/
|
||||
|
||||
+#ifdef SK_CPU_BENDIAN
|
||||
+
|
||||
+#define SK_RGBA_R32_SHIFT 24
|
||||
+#define SK_RGBA_G32_SHIFT 16
|
||||
+#define SK_RGBA_B32_SHIFT 8
|
||||
+#define SK_RGBA_A32_SHIFT 0
|
||||
+
|
||||
+#define SK_BGRA_B32_SHIFT 24
|
||||
+#define SK_BGRA_G32_SHIFT 16
|
||||
+#define SK_BGRA_R32_SHIFT 8
|
||||
+#define SK_BGRA_A32_SHIFT 0
|
||||
+
|
||||
+#else
|
||||
+
|
||||
#define SK_RGBA_R32_SHIFT 0
|
||||
#define SK_RGBA_G32_SHIFT 8
|
||||
#define SK_RGBA_B32_SHIFT 16
|
||||
@@ -74,6 +88,8 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
|
||||
#define SK_BGRA_R32_SHIFT 16
|
||||
#define SK_BGRA_A32_SHIFT 24
|
||||
|
||||
+#endif
|
||||
+
|
||||
#if defined(SK_PMCOLOR_IS_RGBA) || defined(SK_PMCOLOR_IS_BGRA)
|
||||
#error "Configure PMCOLOR by setting SK_R32_SHIFT."
|
||||
#endif
|
||||
3
sources
3
sources
|
|
@ -1 +1,2 @@
|
|||
312fd29eb7f5970660c6a64b8bf8420e webkitgtk-2.4.9.tar.xz
|
||||
SHA512 (webkitgtk-2.53.92.tar.xz) = 2be95cb351b300a1ec248b518861d31fd55f25f83d6ab05a12a0612b3f83a64f903404d40dfcd8e06558c562f5926c98b2e3995bed43741852c8ede65f416d08
|
||||
SHA512 (webkitgtk-2.53.92.tar.xz.asc) = 9a632b0fa3c3a6324be99d3141cd7fd4c2fb4c4dabc6adf27204b843a3478bc3c699ad2727b122621d2cdae9bc6de02327ba1cc07aa66a8e16429070914e6633
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff -Nur webkit-1.3.10.orig/Source/WebCore/plugins/PluginDatabase.cpp webkit-1.3.10/Source/WebCore/plugins/PluginDatabase.cpp
|
||||
--- webkit-1.3.10.orig/Source/WebCore/plugins/PluginDatabase.cpp 2011-01-08 09:50:59.000000000 -0700
|
||||
+++ webkit-1.3.10/Source/WebCore/plugins/PluginDatabase.cpp 2011-01-10 20:55:42.528231854 -0700
|
||||
@@ -393,6 +393,9 @@
|
||||
paths.append("/usr/lib64/mozilla/plugins");
|
||||
paths.append("/usr/lib/nsbrowser/plugins");
|
||||
paths.append("/usr/lib64/nsbrowser/plugins");
|
||||
+ /* And for nspluginwrapper */
|
||||
+ paths.append("/usr/lib64/mozilla/plugins-wrapped");
|
||||
+ paths.append("/usr/lib/mozilla/plugins-wrapped");
|
||||
|
||||
String mozHome(getenv("MOZILLA_HOME"));
|
||||
mozHome.append("/plugins");
|
||||
|
|
@ -1,199 +0,0 @@
|
|||
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h
|
||||
--- webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h.cloop_fix 2014-07-23 14:15:45.497658648 +0200
|
||||
+++ webkitgtk-2.4.4/Source/JavaScriptCore/interpreter/ProtoCallFrame.h 2014-07-23 14:16:46.997687779 +0200
|
||||
@@ -36,7 +36,7 @@ struct ProtoCallFrame {
|
||||
Register calleeValue;
|
||||
Register argCountAndCodeOriginValue;
|
||||
Register thisArg;
|
||||
- size_t paddedArgCount;
|
||||
+ uint32_t paddedArgCount;
|
||||
JSValue *args;
|
||||
|
||||
void init(CodeBlock*, JSScope*, JSObject*, JSValue, int, JSValue* otherArgs = 0);
|
||||
@@ -53,7 +53,7 @@ struct ProtoCallFrame {
|
||||
int argumentCountIncludingThis() const { return argCountAndCodeOriginValue.payload(); }
|
||||
int argumentCount() const { return argumentCountIncludingThis() - 1; }
|
||||
void setArgumentCountIncludingThis(int count) { argCountAndCodeOriginValue.payload() = count; }
|
||||
- void setPaddedArgsCount(size_t argCount) { paddedArgCount = argCount; }
|
||||
+ void setPaddedArgsCount(uint32_t argCount) { paddedArgCount = argCount; }
|
||||
|
||||
void clearCurrentVPC() { argCountAndCodeOriginValue.tag() = 0; }
|
||||
|
||||
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp
|
||||
--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp.cloop_fix 2014-07-23 14:16:02.057667404 +0200
|
||||
+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp 2014-07-23 14:16:46.997687779 +0200
|
||||
@@ -1354,7 +1354,7 @@ LLINT_SLOW_PATH_DECL(slow_path_get_from_
|
||||
CodeBlock* codeBlock = exec->codeBlock();
|
||||
ConcurrentJITLocker locker(codeBlock->m_lock);
|
||||
pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
|
||||
- pc[6].u.operand = slot.cachedOffset();
|
||||
+ pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1381,7 +1381,7 @@ LLINT_SLOW_PATH_DECL(slow_path_put_to_sc
|
||||
if (slot.isCacheable() && slot.base() == scope && scope->structure()->propertyAccessesAreCacheable()) {
|
||||
ConcurrentJITLocker locker(codeBlock->m_lock);
|
||||
pc[5].u.structure.set(exec->vm(), codeBlock->ownerExecutable(), scope->structure());
|
||||
- pc[6].u.operand = slot.cachedOffset();
|
||||
+ pc[6].u.pointer = reinterpret_cast<void*>(slot.cachedOffset());
|
||||
}
|
||||
}
|
||||
|
||||
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||
--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix 2014-07-23 14:16:13.047672325 +0200
|
||||
+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2014-07-23 14:18:27.547721786 +0200
|
||||
@@ -282,7 +282,7 @@ macro doCallToJavaScript(makeCall, doRet
|
||||
storep temp3, CodeBlock+4[cfr, temp1, 8]
|
||||
btinz temp1, .copyHeaderLoop
|
||||
|
||||
- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
|
||||
+ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
|
||||
subi 1, temp2
|
||||
loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3
|
||||
subi 1, temp3
|
||||
@@ -321,7 +321,7 @@ macro doCallToJavaScript(makeCall, doRet
|
||||
|
||||
.calleeFramePopped:
|
||||
loadp Callee[cfr], temp3 # VM.topCallFrame
|
||||
- loadp ScopeChain[cfr], temp4
|
||||
+ loadp ScopeChain + PayloadOffset[cfr], temp4
|
||||
storep temp4, [temp3]
|
||||
|
||||
doReturn(extraStackSpace)
|
||||
@@ -598,7 +598,7 @@ end
|
||||
|
||||
|
||||
macro branchIfException(label)
|
||||
- loadp ScopeChain[cfr], t3
|
||||
+ loadp ScopeChain + PayloadOffset[cfr], t3
|
||||
andp MarkedBlockMask, t3
|
||||
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
|
||||
bieq VM::m_exception + TagOffset[t3], EmptyValueTag, .noException
|
||||
@@ -2039,7 +2039,7 @@ _llint_op_catch:
|
||||
# the interpreter's throw trampoline (see _llint_throw_trampoline).
|
||||
# The throwing code must have known that we were throwing to the interpreter,
|
||||
# and have set VM::targetInterpreterPCForThrow.
|
||||
- loadp ScopeChain[cfr], t3
|
||||
+ loadp ScopeChain + PayloadOffset[cfr], t3
|
||||
andp MarkedBlockMask, t3
|
||||
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
|
||||
loadp VM::callFrameForThrow[t3], cfr
|
||||
@@ -2159,7 +2159,7 @@ macro nativeCallTrampoline(executableOff
|
||||
andp MarkedBlockMask, t3
|
||||
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
|
||||
elsif C_LOOP
|
||||
- loadp ScopeChain[cfr], t3
|
||||
+ loadp ScopeChain + PayloadOffset[cfr], t3
|
||||
andp MarkedBlockMask, t3
|
||||
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
|
||||
storep cfr, VM::topCallFrame[t3]
|
||||
@@ -2172,7 +2172,7 @@ macro nativeCallTrampoline(executableOff
|
||||
move t2, cfr
|
||||
cloopCallNative executableOffsetToFunction[t1]
|
||||
restoreReturnAddressBeforeReturn(t3)
|
||||
- loadp ScopeChain[cfr], t3
|
||||
+ loadp ScopeChain + PayloadOffset[cfr], t3
|
||||
andp MarkedBlockMask, t3
|
||||
loadp MarkedBlock::m_weakSet + WeakSet::m_vm[t3], t3
|
||||
else
|
||||
@@ -2212,7 +2212,7 @@ macro resolveScope()
|
||||
addi 1, t2
|
||||
|
||||
.resolveScopeAfterActivationCheck:
|
||||
- loadp ScopeChain[cfr], t0
|
||||
+ loadp ScopeChain + PayloadOffset[cfr], t0
|
||||
btiz t2, .resolveScopeLoopEnd
|
||||
|
||||
.resolveScopeLoop:
|
||||
@@ -2271,13 +2271,13 @@ _llint_op_resolve_scope:
|
||||
|
||||
macro loadWithStructureCheck(operand, slowPath)
|
||||
loadisFromInstruction(operand, t0)
|
||||
- loadp [cfr, t0, 8], t0
|
||||
+ loadp PayloadOffset[cfr, t0, 8], t0
|
||||
loadpFromInstruction(5, t1)
|
||||
bpneq JSCell::m_structure[t0], t1, slowPath
|
||||
end
|
||||
|
||||
macro getProperty()
|
||||
- loadisFromInstruction(6, t3)
|
||||
+ loadpFromInstruction(6, t3)
|
||||
loadPropertyAtVariableOffset(t3, t0, t1, t2)
|
||||
valueProfile(t1, t2, 28, t0)
|
||||
loadisFromInstruction(1, t0)
|
||||
@@ -2297,7 +2297,7 @@ end
|
||||
|
||||
macro getClosureVar()
|
||||
loadp JSVariableObject::m_registers[t0], t0
|
||||
- loadisFromInstruction(6, t3)
|
||||
+ loadpFromInstruction(6, t3)
|
||||
loadp TagOffset[t0, t3, 8], t1
|
||||
loadp PayloadOffset[t0, t3, 8], t2
|
||||
valueProfile(t1, t2, 28, t0)
|
||||
@@ -2356,7 +2356,7 @@ _llint_op_get_from_scope:
|
||||
macro putProperty()
|
||||
loadisFromInstruction(3, t1)
|
||||
loadConstantOrVariable(t1, t2, t3)
|
||||
- loadisFromInstruction(6, t1)
|
||||
+ loadpFromInstruction(6, t1)
|
||||
storePropertyAtVariableOffset(t1, t0, t2, t3)
|
||||
end
|
||||
|
||||
@@ -2374,7 +2374,7 @@ macro putClosureVar()
|
||||
loadisFromInstruction(3, t1)
|
||||
loadConstantOrVariable(t1, t2, t3)
|
||||
loadp JSVariableObject::m_registers[t0], t0
|
||||
- loadisFromInstruction(6, t1)
|
||||
+ loadpFromInstruction(6, t1)
|
||||
storei t2, TagOffset[t0, t1, 8]
|
||||
storei t3, PayloadOffset[t0, t1, 8]
|
||||
end
|
||||
diff -up webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm
|
||||
--- webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm.cloop_fix 2014-07-23 14:16:19.147675074 +0200
|
||||
+++ webkitgtk-2.4.4/Source/JavaScriptCore/llint/LowLevelInterpreter64.asm 2014-07-23 14:16:46.997687779 +0200
|
||||
@@ -171,7 +171,7 @@ macro doCallToJavaScript(makeCall, doRet
|
||||
storep temp3, CodeBlock[cfr, temp1, 8]
|
||||
btinz temp1, .copyHeaderLoop
|
||||
|
||||
- loadi ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
|
||||
+ loadi PayloadOffset + ProtoCallFrame::argCountAndCodeOriginValue[protoCallFrame], temp2
|
||||
subi 1, temp2
|
||||
loadi ProtoCallFrame::paddedArgCount[protoCallFrame], temp3
|
||||
subi 1, temp3
|
||||
@@ -2047,7 +2047,7 @@ macro loadWithStructureCheck(operand, sl
|
||||
end
|
||||
|
||||
macro getProperty()
|
||||
- loadisFromInstruction(6, t1)
|
||||
+ loadpFromInstruction(6, t1)
|
||||
loadPropertyAtVariableOffset(t1, t0, t2)
|
||||
valueProfile(t2, 7, t0)
|
||||
loadisFromInstruction(1, t0)
|
||||
@@ -2064,7 +2064,7 @@ end
|
||||
|
||||
macro getClosureVar()
|
||||
loadp JSVariableObject::m_registers[t0], t0
|
||||
- loadisFromInstruction(6, t1)
|
||||
+ loadpFromInstruction(6, t1)
|
||||
loadq [t0, t1, 8], t0
|
||||
valueProfile(t0, 7, t1)
|
||||
loadisFromInstruction(1, t1)
|
||||
@@ -2121,7 +2121,7 @@ _llint_op_get_from_scope:
|
||||
macro putProperty()
|
||||
loadisFromInstruction(3, t1)
|
||||
loadConstantOrVariable(t1, t2)
|
||||
- loadisFromInstruction(6, t1)
|
||||
+ loadpFromInstruction(6, t1)
|
||||
storePropertyAtVariableOffset(t1, t0, t2)
|
||||
end
|
||||
|
||||
@@ -2138,7 +2138,7 @@ macro putClosureVar()
|
||||
loadisFromInstruction(3, t1)
|
||||
loadConstantOrVariable(t1, t2)
|
||||
loadp JSVariableObject::m_registers[t0], t0
|
||||
- loadisFromInstruction(6, t1)
|
||||
+ loadpFromInstruction(6, t1)
|
||||
storeq t2, [t0, t1, 8]
|
||||
end
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
diff -up webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h
|
||||
--- webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h.ppc64_align 2014-05-12 08:03:53.000000000 +0200
|
||||
+++ webkitgtk-2.4.2/Source/JavaScriptCore/heap/CopiedBlock.h 2014-05-14 15:16:36.946318596 +0200
|
||||
@@ -81,7 +81,7 @@ public:
|
||||
size_t size();
|
||||
size_t capacity();
|
||||
|
||||
- static const size_t blockSize = 32 * KB;
|
||||
+ static const size_t blockSize = 64 * KB;
|
||||
|
||||
bool hasWorkList();
|
||||
CopyWorkList& workList();
|
||||
diff -up webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp
|
||||
--- webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp.ppc64_align 2014-05-12 08:03:53.000000000 +0200
|
||||
+++ webkitgtk-2.4.2/Source/JavaScriptCore/interpreter/JSStack.cpp 2014-05-14 15:17:35.617171141 +0200
|
||||
@@ -49,7 +49,8 @@ JSStack::JSStack(VM& vm, size_t capacity
|
||||
{
|
||||
ASSERT(capacity && isPageAligned(capacity));
|
||||
|
||||
- m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitSize), OSAllocator::JSVMStackPages);
|
||||
+ size_t commitsize = pageSize();
|
||||
+ m_reservation = PageReservation::reserve(roundUpAllocationSize(capacity * sizeof(Register), commitsize), OSAllocator::JSVMStackPages);
|
||||
updateStackLimit(highAddress());
|
||||
m_commitEnd = highAddress();
|
||||
|
||||
@@ -78,7 +79,8 @@ bool JSStack::growSlowCase(Register* new
|
||||
// Compute the chunk size of additional memory to commit, and see if we
|
||||
// have it is still within our budget. If not, we'll fail to grow and
|
||||
// return false.
|
||||
- long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitSize);
|
||||
+ size_t commitsize = pageSize();
|
||||
+ long delta = roundUpAllocationSize(reinterpret_cast<char*>(m_commitEnd) - reinterpret_cast<char*>(newEnd), commitsize);
|
||||
if (reinterpret_cast<char*>(m_commitEnd) - delta <= reinterpret_cast<char*>(m_useableEnd))
|
||||
return false;
|
||||
|
||||
@@ -134,7 +136,8 @@ void JSStack::enableErrorStackReserve()
|
||||
|
||||
void JSStack::disableErrorStackReserve()
|
||||
{
|
||||
- char* useableEnd = reinterpret_cast<char*>(reservationEnd()) + commitSize;
|
||||
+ size_t commitsize = pageSize();
|
||||
+ char* useableEnd = reinterpret_cast<char*>(reservationEnd()) + commitsize;
|
||||
m_useableEnd = reinterpret_cast_ptr<Register*>(useableEnd);
|
||||
|
||||
// By the time we get here, we are guaranteed to be destructing the last
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
|
||||
--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200
|
||||
+++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm 2013-09-12 15:32:34.000000000 +0200
|
||||
@@ -1679,7 +1679,7 @@ _llint_op_next_pname:
|
||||
loadi 20[PC], t2
|
||||
loadi PayloadOffset[cfr, t2, 8], t2
|
||||
loadp JSPropertyNameIterator::m_jsStrings[t2], t3
|
||||
- loadi [t3, t0, 8], t3
|
||||
+ loadi PayloadOffset[t3, t0, 8], t3
|
||||
addi 1, t0
|
||||
storei t0, PayloadOffset[cfr, t1, 8]
|
||||
loadi 4[PC], t1
|
||||
diff -up webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm
|
||||
--- webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm.cloop_fix_32 2013-08-28 21:06:29.000000000 +0200
|
||||
+++ webkitgtk-2.4.5/Source/JavaScriptCore/llint/LowLevelInterpreter.asm 2013-09-12 15:32:34.000000000 +0200
|
||||
@@ -276,13 +276,13 @@ macro assertNotConstant(index)
|
||||
end
|
||||
|
||||
macro functionForCallCodeBlockGetter(targetRegister)
|
||||
- loadp Callee[cfr], targetRegister
|
||||
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
||||
loadp JSFunction::m_executable[targetRegister], targetRegister
|
||||
loadp FunctionExecutable::m_codeBlockForCall[targetRegister], targetRegister
|
||||
end
|
||||
|
||||
macro functionForConstructCodeBlockGetter(targetRegister)
|
||||
- loadp Callee[cfr], targetRegister
|
||||
+ loadp Callee + PayloadOffset[cfr], targetRegister
|
||||
loadp JSFunction::m_executable[targetRegister], targetRegister
|
||||
loadp FunctionExecutable::m_codeBlockForConstruct[targetRegister], targetRegister
|
||||
end
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
From 050232bc122d6785fea01d39121c2f93e8dd16f1 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Catanzaro <mcatanzaro@igalia.com>
|
||||
Date: Thu, 26 Feb 2015 16:06:36 -0600
|
||||
Subject: [PATCH] Allow branding the user agent
|
||||
|
||||
---
|
||||
Source/WebCore/platform/gtk/UserAgentGtk.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Source/WebCore/platform/gtk/UserAgentGtk.cpp b/Source/WebCore/platform/gtk/UserAgentGtk.cpp
|
||||
index 91641dc..727fbaf 100644
|
||||
--- a/Source/WebCore/platform/gtk/UserAgentGtk.cpp
|
||||
+++ b/Source/WebCore/platform/gtk/UserAgentGtk.cpp
|
||||
@@ -84,7 +84,9 @@ static const char* cpuDescriptionForUAString()
|
||||
|
||||
static const char* platformForUAString()
|
||||
{
|
||||
-#if PLATFORM(X11)
|
||||
+#if defined USER_AGENT_GTK_DISTRIBUTOR_NAME
|
||||
+ return USER_AGENT_GTK_DISTRIBUTOR_NAME;
|
||||
+#elif PLATFORM(X11)
|
||||
return "X11";
|
||||
#elif OS(WINDOWS)
|
||||
return "";
|
||||
--
|
||||
2.1.0
|
||||
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
diff -up webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h
|
||||
--- webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h.aarch64 2015-05-20 11:03:24.000000000 +0200
|
||||
+++ webkitgtk-2.4.9/Source/WTF/wtf/dtoa/utils.h 2015-05-20 13:45:35.629023925 +0200
|
||||
@@ -49,7 +49,7 @@
|
||||
defined(__ARMEL__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
-#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(ARM64) || CPU(HPPA)
|
||||
+#elif CPU(MIPS) || CPU(MIPS64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(ALPHA) || CPU(AARCH64) || CPU(HPPA)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
#elif defined(_M_IX86) || defined(__i386__)
|
||||
#if defined(_WIN32)
|
||||
diff -up webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 webkitgtk-2.4.9/Source/WTF/wtf/Platform.h
|
||||
--- webkitgtk-2.4.9/Source/WTF/wtf/Platform.h.aarch64 2015-05-20 11:03:24.000000000 +0200
|
||||
+++ webkitgtk-2.4.9/Source/WTF/wtf/Platform.h 2015-05-20 13:47:34.439861401 +0200
|
||||
@@ -334,6 +334,14 @@
|
||||
#define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
|
||||
#endif
|
||||
|
||||
+/* CPU(AARCH64) - AArch64 */
|
||||
+#if defined(__aarch64__)
|
||||
+#define WTF_CPU_AARCH64 1
|
||||
+#if defined(__AARCH64BE__)
|
||||
+#define WTF_CPU_BIG_ENDIAN 1
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
/* ==== OS() - underlying operating system; only to be used for mandated low-level services like
|
||||
virtual memory, not to choose a GUI toolkit ==== */
|
||||
|
||||
@@ -654,7 +662,7 @@
|
||||
#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
|
||||
|| (CPU(IA64) && !CPU(IA64_32)) \
|
||||
|| CPU(ALPHA) \
|
||||
- || CPU(ARM64) \
|
||||
+ || CPU(AARCH64) \
|
||||
|| CPU(S390X) \
|
||||
|| CPU(MIPS64) \
|
||||
|| CPU(PPC64) \
|
||||
BIN
webkitgtk-keys.gpg
Normal file
BIN
webkitgtk-keys.gpg
Normal file
Binary file not shown.
1150
webkitgtk.spec
1150
webkitgtk.spec
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue