summaryrefslogtreecommitdiff
path: root/dev-qt/qtwebengine/files
diff options
context:
space:
mode:
Diffstat (limited to 'dev-qt/qtwebengine/files')
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch45
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch16
-rw-r--r--dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch41
3 files changed, 102 insertions, 0 deletions
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch b/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
new file mode 100644
index 0000000..e70d64c
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
@@ -0,0 +1,45 @@
+Fix build with jpeg-9. Bug #646456
+
+--- a/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
++++ b/src/3rdparty/chromium/third_party/pdfium/core/fxcodec/codec/fx_codec_jpeg.cpp
+@@ -74,11 +74,11 @@
+ }
+
+ static boolean _src_fill_buffer(j_decompress_ptr cinfo) {
+- return 0;
++ return FALSE;
+ }
+
+ static boolean _src_resync(j_decompress_ptr cinfo, int desired) {
+- return 0;
++ return FALSE;
+ }
+
+ static void _error_do_nothing(j_common_ptr cinfo) {}
+@@ -147,7 +147,7 @@
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+ }
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TRUE);
+ if (ret != JPEG_HEADER_OK) {
+ jpeg_destroy_decompress(&cinfo);
+ return false;
+@@ -231,7 +231,7 @@
+ }
+ cinfo.image_width = m_OrigWidth;
+ cinfo.image_height = m_OrigHeight;
+- int ret = jpeg_read_header(&cinfo, true);
++ int ret = jpeg_read_header(&cinfo, TRUE);
+ if (ret != JPEG_HEADER_OK)
+ return false;
+
+@@ -459,7 +459,7 @@
+ if (setjmp(ctx->m_JumpMark) == -1)
+ return 1;
+
+- int ret = jpeg_read_header(&ctx->m_Info, true);
++ int ret = jpeg_read_header(&ctx->m_Info, TRUE);
+ if (ret == JPEG_SUSPENDED)
+ return 2;
+ if (ret != JPEG_HEADER_OK)
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
new file mode 100644
index 0000000..9866ab9
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
@@ -0,0 +1,16 @@
+Fix build with >=ICU-60
+
+Bug: https://bugs.gentoo.org/639220
+Bug: https://bugreports.qt.io/browse/QTBUG-64925
+
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -488,7 +488,7 @@
+ // are added to the allowed set. The list has to be updated when a new
+ // version of Unicode is released. The current version is 9.0.0 and ICU 60
+ // will have Unicode 10.0 data.
+-#if U_ICU_VERSION_MAJOR_NUM < 60
++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
+ const icu::UnicodeSet aspirational_scripts(
+ icu::UnicodeString(
+ // Unified Canadian Syllabics
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
new file mode 100644
index 0000000..ecedaf6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
++++ b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -661,6 +661,7 @@ action("run_mksnapshot") {
+
+ deps = [
+ ":mksnapshot($v8_snapshot_toolchain)",
++ ":run_paxmark",
+ ]
+
+ script = "tools/run.py"
+@@ -706,6 +707,28 @@ action("run_mksnapshot") {
+ args += [ rebase_path(v8_embed_script, root_build_dir) ]
+ }
+ }
++action("run_paxmark") {
++ visibility = [ ":*" ] # Only targets in this file can depend on this.
++
++ deps = [
++ ":mksnapshot($v8_snapshot_toolchain)",
++ ]
++
++ script = "/usr/sbin/pypaxctl"
++
++ sources = []
++
++ outputs = [
++ "$target_out_dir/mksnapshot",
++ ]
++
++ args = [
++ "-sm",
++ "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++ "root_out_dir") + "/mksnapshot",
++ root_build_dir),
++ ]
++}
+
+ action("run_mkpeephole") {
+ visibility = [ ":*" ] # Only targets in this file can depend on this.