qtwebengine from qt repo (build fix)

4 files changed, 125 insertions, 0 deletions

diff --git a/dev-qt/qtwebengine/files/build_fix.patch b/dev-qt/qtwebengine/files/build_fix.patch
new file mode 100644
index 0000000..926e685
--- /dev/null
+++ b/dev-qt/qtwebengine/files/build_fix.patch
@@ -0,0 +1,13 @@
+diff -Naur qtwebengine-5.9.9999.orig/src/core/api/qwebengineurlrequestinfo.h qtwebengine-5.9.9999/src/core/api/qwebengineurlrequestinfo.h
+--- a/src/core/api/qwebengineurlrequestinfo.h	2017-07-09 16:18:41.375836372 +0300
++++ b/src/core/api/qwebengineurlrequestinfo.h	2017-07-09 16:18:11.829833351 +0300
+@@ -75,9 +75,7 @@
+         ResourceTypeServiceWorker,  // the main resource of a service worker.
+         ResourceTypeCspReport,      // Content Security Policy (CSP) violation report
+         ResourceTypePluginResource, // A resource requested by a plugin
+-#ifndef Q_QDOC
+         ResourceTypeLast,
+-#endif
+         ResourceTypeUnknown = 255
+     };
+ 
diff --git a/dev-qt/qtwebengine/files/build_fix2.patch b/dev-qt/qtwebengine/files/build_fix2.patch
new file mode 100644
index 0000000..6ba339a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/build_fix2.patch
@@ -0,0 +1,20 @@
+diff -Naur /var/tmp/paludis/dev-qt-qtwebengine-5.9.9999/work/qtwebengine-5.9.9999/src/core/network_delegate_qt.cpp /home/sss/temp/qtwebengine-5.9.9999/src/core/network_delegate_qt.cpp
+--- a/src/core/network_delegate_qt.cpp	2017-07-09 17:37:49.762321907 +0300
++++ b/src/core/network_delegate_qt.cpp	2017-07-09 17:37:14.075318258 +0300
+@@ -55,6 +55,7 @@
+ #include "type_conversion.h"
+ #include "web_contents_adapter_client.h"
+ #include "web_contents_view_qt.h"
++#include <QWebEngineUrlRequestInfo>
+ 
+ namespace QtWebEngineCore {
+ 
+@@ -83,7 +84,7 @@
+ 
+ QWebEngineUrlRequestInfo::ResourceType toQt(content::ResourceType resourceType)
+ {
+-    if (resourceType >= 0 && resourceType < content::ResourceType(QWebEngineUrlRequestInfo::ResourceTypeLast))
++    if (resourceType >= 0 && resourceType < content::ResourceType(QWebEngineUrlRequestInfo::ResourceTypeUnknown))
+         return static_cast<QWebEngineUrlRequestInfo::ResourceType>(resourceType);
+     return QWebEngineUrlRequestInfo::ResourceTypeUnknown;
+ }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
new file mode 100644
index 0000000..5eb8ce1
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
@@ -0,0 +1,46 @@
+--- a/src/3rdparty/chromium/v8/src/v8.gyp
++++ b/src/3rdparty/chromium/v8/src/v8.gyp
+@@ -36,6 +36,7 @@
+     'v8_experimental_extra_library_files%': [],
+     'v8_enable_inspector%': 0,
+     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'mkpeephole_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mkpeephole<(EXECUTABLE_SUFFIX)',
+     'v8_os_page_size%': 0,
+   },
+@@ -2432,7 +2433,7 @@
+         ]
+     },
+     {
+-      'target_name': 'mksnapshot',
++      'target_name': 'mksnapshot_u',
+       'type': 'executable',
+       'dependencies': [
+         'v8_base',
+@@ -2485,5 +2486,26 @@
+         }],
+       ],
+     },
++    {
++      'target_name': 'mksnapshot',
++      'type': 'executable',
++      'dependencies': ['mksnapshot_u'],
++      'actions': [
++        {
++          'action_name': 'paxmark_m_mksnapshot',
++          'inputs': [
++            '<(mksnapshot_u_exec)',
++          ],
++          'outputs': [
++            '<(mksnapshot_exec)',
++          ],
++          'action': [
++            'sh',
++            '-c',
++            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
++          ],
++        },
++      ],
++    },
+   ],
+ }
diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
new file mode 100644
index 0000000..c71cedc
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
@@ -0,0 +1,46 @@
+--- qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp	2016-03-04 01:48:36.000000000 +1100
++++ qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp	2016-05-01 19:15:44.052770543 +1000
+@@ -33,6 +33,7 @@
+     'embed_script%': "",
+     'v8_extra_library_files%': [],
+     'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++    'mksnapshot_u_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+     'remove_v8base_debug_symbols%': 0,
+   },
+   'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
+@@ -1913,7 +1914,7 @@
+         ]
+     },
+     {
+-      'target_name': 'mksnapshot',
++      'target_name': 'mksnapshot_u',
+       'type': 'executable',
+       'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
+       'include_dirs+': [
+@@ -1936,5 +1937,26 @@
+         }],
+       ],
+     },
++    {
++      'target_name': 'mksnapshot',
++      'type': 'executable',
++      'dependencies': ['mksnapshot_u'],
++      'actions': [
++        {
++          'action_name': 'paxmark_m_mksnapshot',
++          'inputs': [
++            '<(mksnapshot_u_exec)',
++          ],
++          'outputs': [
++            '<(mksnapshot_exec)',
++          ],
++          'action': [
++            'sh',
++            '-c',
++            'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m <(mksnapshot_exec)',
++          ],
++        },
++      ],
++    },
+   ],
+ }