commit: 731764edfb5e1647f119249a2621daa612116765
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 04:14:34 2018 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 04:14:34 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=731764ed
dev-qt/qtwebengine: delete unused patches
Package-Manager: Portage-2.3.24, Repoman-2.3.6
.../files/qtwebengine-5.10.0-jpeg-9.patch | 45 ---------------------
.../qtwebengine-5.9.0-paxmark-mksnapshot.patch | 46 ----------------------
2 files changed, 91 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
deleted file mode 100644
index e70d64c7..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.10.0-jpeg-9.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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.0-paxmark-mksnapshot.patch
b/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
deleted file mode 100644
index 5eb8ce12..00000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.9.0-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- 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)',
-+ ],
-+ },
-+ ],
-+ },
- ],
- }
