commit:     a76d2f0a50951a6fbef8c77f4aaaa49ab523e04d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 10:45:53 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb  9 10:46:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=a76d2f0a

dev-qt/qtwebengine: rebase jpeg-9 patch for qt-5.10

Closes: https://bugs.gentoo.org/647038
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/qtwebengine-5.10.0-jpeg-9.patch          | 45 ++++++++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild       |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild    |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild    |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild       |  2 +-
 5 files changed, 49 insertions(+), 4 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 00000000..21e147db
--- /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, TUE);
+   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/qtwebengine-5.10.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
index e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.0.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
        pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
 
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )

diff --git a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
index e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
        pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
 
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
        pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
 
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index e4e575b4..7f6d0349 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -81,7 +81,7 @@ DEPEND="${RDEPEND}
        pax_kernel? ( sys-apps/elfix )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch" )
+PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" )
 
 src_prepare() {
        use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )

Reply via email to