Rex Dieter
7 years ago
parent
91e4b5c4b0
commit
8d10a950e2
@ -1,9 +1,2 @@
|
||||
/qtwebengine-opensource-src-5.6.0-beta-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.6.0-rc-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.6.0-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.6.1-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.7.0-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.7.1-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.8.0-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.9.0-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.9.1-clean.tar.xz
|
||||
/qtwebengine-opensource-src-5.9.2-clean.tar.xz
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp.qt58 qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp
|
||||
--- qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp.qt58 2017-01-03 04:35:11.000000000 -0600
|
||||
+++ qtwebengine-opensource-src-5.8.0/src/core/proxy_config_service_qt.cpp 2017-03-24 14:43:55.120363292 -0500
|
||||
@@ -109,7 +109,7 @@ net::ProxyConfigService::ConfigAvailabil
|
||||
}
|
||||
m_qtApplicationProxy = qtProxy;
|
||||
m_qtProxyConfig = net::ProxyConfig();
|
||||
-#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
|
||||
+#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
|
||||
if (qtProxy.type() == QNetworkProxy::NoProxy
|
||||
&& QNetworkProxyFactory::usesSystemConfiguration()) {
|
||||
*config = systemConfig;
|
||||
@ -1,160 +0,0 @@
|
||||
diff -ur qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/base/process/memory_linux.cc qtwebengine-opensource-src-5.9.1-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc
|
||||
--- qtwebengine-opensource-src-5.9.1/src/3rdparty/chromium/base/process/memory_linux.cc 2017-06-20 11:10:02.000000000 +0200
|
||||
+++ qtwebengine-opensource-src-5.9.1-qtbug-61521/src/3rdparty/chromium/base/process/memory_linux.cc 2017-07-01 01:20:35.113886332 +0200
|
||||
@@ -60,6 +60,7 @@
|
||||
#endif
|
||||
void* __libc_memalign(size_t alignment, size_t size);
|
||||
|
||||
+#if !defined(TOOLKIT_QT) //QTBUG-61521,QTBUG-60565
|
||||
// Overriding the system memory allocation functions:
|
||||
//
|
||||
// For security reasons, we want malloc failures to be fatal. Too much code
|
||||
@@ -129,6 +130,7 @@
|
||||
*ptr = memalign(alignment, size);
|
||||
return 0;
|
||||
}
|
||||
+#endif // TOOLKIT_QT
|
||||
|
||||
} // extern C
|
||||
|
||||
diff -ur qtwebengine-opensource-src-5.9.1/src/core/api/qtbug-60565.cpp qtwebengine-opensource-src-5.9.1-qtbug-61521/src/core/api/qtbug-60565.cpp
|
||||
--- qtwebengine-opensource-src-5.9.1/src/core/api/qtbug-60565.cpp 2017-06-23 08:29:46.000000000 +0200
|
||||
+++ qtwebengine-opensource-src-5.9.1-qtbug-61521/src/core/api/qtbug-60565.cpp 2017-07-01 01:22:27.626242360 +0200
|
||||
@@ -39,6 +39,8 @@
|
||||
|
||||
#include <new>
|
||||
#include <unistd.h>
|
||||
+#include <stdlib.h>
|
||||
+#include <malloc.h>
|
||||
|
||||
#if defined(__LP64__)
|
||||
# define SIZE_T_MANGLING "m"
|
||||
@@ -83,10 +85,51 @@
|
||||
void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept
|
||||
SHIM_ALIAS_SYMBOL(ShimCppDeleteArray);
|
||||
|
||||
+__asm__(".symver __ShimMalloc, malloc@Qt_5");
|
||||
+void* __ShimMalloc(size_t size) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimMalloc);
|
||||
+
|
||||
+__asm__(".symver __ShimCalloc, calloc@Qt_5");
|
||||
+void* __ShimCalloc(size_t n, size_t size) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimCalloc);
|
||||
+
|
||||
+__asm__(".symver __ShimRealloc, realloc@Qt_5");
|
||||
+void* __ShimRealloc(void* address, size_t size) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimRealloc);
|
||||
+
|
||||
+__asm__(".symver __ShimMemalign, memalign@Qt_5");
|
||||
+void* __ShimMemalign(size_t alignment, size_t size) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimMemalign);
|
||||
+
|
||||
+__asm__(".symver __ShimPosixMemalign, posix_memalign@Qt_5");
|
||||
+int __ShimPosixMemalign(void** res, size_t alignment, size_t size) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
|
||||
+
|
||||
+__asm__(".symver __ShimValloc, valloc@Qt_5");
|
||||
+void* __ShimValloc(size_t size) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimValloc);
|
||||
+
|
||||
+__asm__(".symver __ShimPvalloc, pvalloc@Qt_5");
|
||||
+void* __ShimPvalloc(size_t size) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimPvalloc);
|
||||
+
|
||||
+__asm__(".symver __ShimFree, free@Qt_5");
|
||||
+void __ShimFree(void* address) noexcept
|
||||
+ SHIM_ALIAS_SYMBOL(ShimFree);
|
||||
+
|
||||
static void* __shimCppNew(size_t size);
|
||||
static void* __shimCppNewArray(size_t size);
|
||||
static void __shimCppDelete(void *address);
|
||||
static void __shimCppDeleteArray(void *address);
|
||||
+static void* __shimMalloc(size_t size) noexcept;
|
||||
+static void* __shimCalloc(size_t n, size_t size) noexcept;
|
||||
+static void* __shimRealloc(void* address, size_t size) noexcept;
|
||||
+static void* __shimMemalign(size_t alignment, size_t size) noexcept;
|
||||
+static int __shimPosixMemalign(void** res, size_t alignment, size_t size)
|
||||
+ noexcept;
|
||||
+static void* __shimValloc(size_t size) noexcept;
|
||||
+static void* __shimPvalloc(size_t size) noexcept;
|
||||
+static void __shimFree(void* address) noexcept;
|
||||
|
||||
SHIM_HIDDEN void* ShimCppNew(size_t size) {
|
||||
return __shimCppNew(size);
|
||||
@@ -103,6 +146,39 @@
|
||||
SHIM_HIDDEN void ShimCppDeleteArray(void* address) {
|
||||
__shimCppDeleteArray(address);
|
||||
}
|
||||
+
|
||||
+SHIM_HIDDEN void* ShimMalloc(size_t size) noexcept {
|
||||
+ return __shimMalloc(size);
|
||||
+}
|
||||
+
|
||||
+SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) noexcept {
|
||||
+ return __shimCalloc(n, size);
|
||||
+}
|
||||
+
|
||||
+SHIM_HIDDEN void* ShimRealloc(void* address, size_t size) noexcept {
|
||||
+ return __shimRealloc(address, size);
|
||||
+}
|
||||
+
|
||||
+SHIM_HIDDEN void* ShimMemalign(size_t alignment, size_t size) noexcept {
|
||||
+ return __shimMemalign(alignment, size);
|
||||
+}
|
||||
+
|
||||
+SHIM_HIDDEN int ShimPosixMemalign(void** res, size_t alignment, size_t size)
|
||||
+ noexcept {
|
||||
+ return __shimPosixMemalign(res, alignment, size);
|
||||
+}
|
||||
+
|
||||
+SHIM_HIDDEN void* ShimValloc(size_t size) noexcept {
|
||||
+ return __shimValloc(size);
|
||||
+}
|
||||
+
|
||||
+SHIM_HIDDEN void* ShimPvalloc(size_t size) noexcept {
|
||||
+ return __shimPvalloc(size);
|
||||
+}
|
||||
+
|
||||
+SHIM_HIDDEN void ShimFree(void* address) noexcept {
|
||||
+ __shimFree(address);
|
||||
+}
|
||||
} // extern "C"
|
||||
|
||||
static void* __shimCppNew(size_t size) {
|
||||
@@ -120,3 +196,36 @@
|
||||
static void __shimCppDeleteArray(void* address) {
|
||||
operator delete[](address);
|
||||
}
|
||||
+
|
||||
+static void* __shimMalloc(size_t size) noexcept {
|
||||
+ return malloc(size);
|
||||
+}
|
||||
+
|
||||
+static void* __shimCalloc(size_t n, size_t size) noexcept {
|
||||
+ return calloc(n, size);
|
||||
+}
|
||||
+
|
||||
+static void* __shimRealloc(void* address, size_t size) noexcept {
|
||||
+ return realloc(address, size);
|
||||
+}
|
||||
+
|
||||
+static void* __shimMemalign(size_t alignment, size_t size) noexcept {
|
||||
+ return memalign(alignment, size);
|
||||
+}
|
||||
+
|
||||
+static int __shimPosixMemalign(void** res, size_t alignment, size_t size)
|
||||
+ noexcept {
|
||||
+ return posix_memalign(res, alignment, size);
|
||||
+}
|
||||
+
|
||||
+static void* __shimValloc(size_t size) noexcept {
|
||||
+ return valloc(size);
|
||||
+}
|
||||
+
|
||||
+static void* __shimPvalloc(size_t size) noexcept {
|
||||
+ return pvalloc(size);
|
||||
+}
|
||||
+
|
||||
+static void __shimFree(void* address) noexcept {
|
||||
+ free(address);
|
||||
+}
|
||||
@ -1,11 +1,10 @@
|
||||
diff -ur qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri
|
||||
--- qtwebengine-opensource-src-5.9.0/src/core/config/linux.pri 2017-05-19 06:22:04.000000000 +0200
|
||||
+++ qtwebengine-opensource-src-5.9.0-linux-pri/src/core/config/linux.pri 2017-06-08 00:20:53.688419747 +0200
|
||||
@@ -148,3 +148,22 @@
|
||||
use?(system_ffmpeg): gn_args += use_system_ffmpeg=true
|
||||
diff -up qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri
|
||||
--- qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri.linux-pri 2017-10-09 15:08:43.206663093 -0500
|
||||
+++ qtwebengine-opensource-src-5.9.2/src/core/config/linux.pri 2017-10-09 15:09:52.248208321 -0500
|
||||
@@ -153,3 +153,21 @@ host_build {
|
||||
use?(system_re2): gn_args += use_system_re2=true
|
||||
#use?(system_protobuf): gn_args += use_system_protobuf=true
|
||||
}
|
||||
+
|
||||
+# some more system packages, that are not checked for for some reason
|
||||
+gn_args += use_system_re2=true
|
||||
+
|
||||
@ -1 +1 @@
|
||||
SHA512 (qtwebengine-opensource-src-5.9.1-clean.tar.xz) = 86bbfe50d557b82df3b3598a43340b5fa913d01df0a8c7cd43ae8d36eed59e6deca633e42f8813c1074b3bbc5ac21179571f2ef9fd125838875bddd92faca36c
|
||||
SHA512 (qtwebengine-opensource-src-5.9.2-clean.tar.xz) = d4919a4475101175c37455949b9e9dc8cdfb18243ff2fe3320e3c14c685523cc46a3e5fac4c01b40a090ad1f0f9458bf3fc15a86b7fcdd9b43f1c76b090dc9cf
|
||||
|
||||
Loading…
Reference in new issue