commit 08bbd3eb7e5fd8c3790ecf1a8f7ee5b2d2040c93 Author: Jan Palus <at...@pld-linux.org> Date: Thu Mar 21 15:59:34 2019 +0100
try removing hunks from x32 patch related to non-existent files x32.patch | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) --- diff --git a/x32.patch b/x32.patch index f13fa19..4e4b455 100644 --- a/x32.patch +++ b/x32.patch @@ -32,38 +32,6 @@ diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/third_party/bor #elif defined(OPENSSL_X86) #define EXPECTED_NR_getrandom 355 #elif defined(OPENSSL_AARCH64) -diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi ---- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi 2018-06-15 09:47:20.000000000 +0200 -+++ qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/gypfiles/toolchain.gypi 2018-08-13 01:44:03.828604732 +0200 -@@ -1042,28 +1042,6 @@ - }], - ], - }], -- ['(OS=="linux" or OS=="android") and \ -- (v8_target_arch=="x64" or v8_target_arch=="arm64" or \ -- v8_target_arch=="ppc64" or v8_target_arch=="s390x")', { -- 'target_conditions': [ -- ['_toolset=="host"', { -- 'conditions': [ -- ['host_cxx_is_biarch==1', { -- 'cflags': [ '-m64' ], -- 'ldflags': [ '-m64' ] -- }], -- ], -- }], -- ['_toolset=="target"', { -- 'conditions': [ -- ['target_cxx_is_biarch==1', { -- 'cflags': [ '-m64' ], -- 'ldflags': [ '-m64' ], -- }], -- ] -- }], -- ], -- }], - ['OS=="android" and v8_android_log_stdout==1', { - 'defines': [ - 'V8_ANDROID_LOG_STDOUT', diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/objects/bigint.cc qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/src/objects/bigint.cc --- qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/objects/bigint.cc 2018-06-15 09:47:20.000000000 +0200 +++ qtwebengine-everywhere-src-5.11.1-x32/src/3rdparty/chromium/v8/src/objects/bigint.cc 2018-08-13 02:15:32.443103386 +0200 @@ -104,20 +72,6 @@ diff -ur qtwebengine-everywhere-src-5.11.1/src/3rdparty/chromium/v8/src/objects/ #define ARCH_CPU_X86_64 1 +#ifdef __ILP32__ +#define ARCH_CPU_32_BITS 1 -+#else - #define ARCH_CPU_64_BITS 1 -+#endif - #define ARCH_CPU_LITTLE_ENDIAN 1 - #elif defined(_M_IX86) || defined(__i386__) - #define ARCH_CPU_X86_FAMILY 1 ---- qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/third_party/pdfium/third_party/build/build_config.h~ 2018-06-15 09:47:20.000000000 +0200 -+++ qtwebengine-everywhere-src-5.11.1.clean/src/3rdparty/chromium/third_party/pdfium/third_party/build/build_config.h 2018-08-14 09:24:56.127049857 +0200 -@@ -104,7 +104,11 @@ - #if defined(_M_X64) || defined(__x86_64__) - #define ARCH_CPU_X86_FAMILY 1 - #define ARCH_CPU_X86_64 1 -+#ifdef __ILP32__ -+#define ARCH_CPU_32_BITS 1 +#else #define ARCH_CPU_64_BITS 1 +#endif ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/08bbd3eb7e5fd8c3790ecf1a8f7ee5b2d2040c93 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit