pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/converters/wkhtmltopdf Various portability fixes. Fix ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c40fd2cb100b
branches: trunk
changeset: 368107:c40fd2cb100b
user: joerg <joerg%pkgsrc.org@localhost>
date: Sun Sep 10 19:58:36 2017 +0000
description:
Various portability fixes. Fix library path for the final binaries. Bump
revision.
diffstat:
converters/wkhtmltopdf/Makefile | 15 +-
converters/wkhtmltopdf/distinfo | 26 ++-
converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_freetype_freetype.pro | 11 +
converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_libjpeg_libjpeg.pro | 10 +
converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_libpng_libpng.pro | 10 +
converters/wkhtmltopdf/patches/patch-qt_config.tests_x11_mitshm_mitshm.pro | 11 +
converters/wkhtmltopdf/patches/patch-qt_config.tests_x11_xrender_xrender.pro | 10 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_bytecompiler_BytecodeGenerator.cpp | 25 ++
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp | 37 +++
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h | 12 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp | 15 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_Identifier.cpp | 13 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSONObject.cpp | 13 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_StringPrototype.cpp | 13 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h | 41 +++
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h | 104 +++++++++
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h | 22 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_text_AtomicString.cpp | 13 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_dom_DocumentMarkerController.cpp | 13 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_dom_Element.cpp | 13 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp | 13 +
converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp | 112 ++++++++++
converters/wkhtmltopdf/patches/patch-qt_src_plugins_platforms_xlib_xlib.pro | 13 +
converters/wkhtmltopdf/patches/patch-src_image_image.pro | 13 +
converters/wkhtmltopdf/patches/patch-src_lib_lib.pro | 13 +
converters/wkhtmltopdf/patches/patch-src_pdf_pdf.pro | 13 +
26 files changed, 597 insertions(+), 7 deletions(-)
diffs (truncated from 746 to 300 lines):
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/Makefile
--- a/converters/wkhtmltopdf/Makefile Sun Sep 10 17:39:34 2017 +0000
+++ b/converters/wkhtmltopdf/Makefile Sun Sep 10 19:58:36 2017 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2017/06/23 07:12:19 manu Exp $
+# $NetBSD: Makefile,v 1.2 2017/09/10 19:58:36 joerg Exp $
DISTNAME= wkhtmltox-0.12.4
PKGNAME= wkhtmltopdf-0.12.4
+PKGREVISION= 1
MASTER_SITES= ${MASTER_SITE_GITHUB:=wkhtmltopdf/}
GITHUB_PROJECT= wkhtmltopdf
GITHUB_RELEASE= ${PKGVERSION_NOREV}
@@ -13,10 +14,9 @@
COMMENT= Command line tools to render HTML into PDF
LICENSE= gnu-lgpl-v3
-USE_LANGUAGES+= c c++
+USE_LANGUAGES+= c c++ gnu++11
USE_TOOLS+= perl
#USE_LIBTOOL= yes
-CHECK_SHLIBS_SUPPORTED= no # until libtool
SUBST_CLASSES+= x11
SUBST_MESSAGE.x11= Fixing x11 options.
@@ -32,7 +32,8 @@
done
do-build:
- cd ${WRKSRC} && ${PYTHONBIN} scripts/build.py posix-local -debug
+ cd ${WRKSRC} && \
+ ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} scripts/build.py posix-local -debug
WKHTMLTOX_BUILD=${WRKSRC}/static-build/posix-local-dbg/${DISTNAME}
WKHTMLTOX_BIN=${DESTDIR}${PREFIX}/bin
@@ -55,9 +56,11 @@
ln -sf libwkhtmltox.so.0.12.4 libwkhtmltox.so.0.1 && \
ln -sf libwkhtmltox.so.0.12.4 libwkhtmltox.so.0
+.include "../../graphics/freetype2/buildlink3.mk"
.include "../../lang/python/application.mk"
+.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/distinfo
--- a/converters/wkhtmltopdf/distinfo Sun Sep 10 17:39:34 2017 +0000
+++ b/converters/wkhtmltopdf/distinfo Sun Sep 10 19:58:36 2017 +0000
@@ -1,9 +1,33 @@
-$NetBSD: distinfo,v 1.1 2017/06/23 07:12:19 manu Exp $
+$NetBSD: distinfo,v 1.2 2017/09/10 19:58:36 joerg Exp $
SHA1 (wkhtmltox-0.12.4.tar.bz2) = 6a0ca9b01d5e37af3fb451bbd934afff43cf26ae
RMD160 (wkhtmltox-0.12.4.tar.bz2) = 665abd76618cdfac27585e62caa52b33d09990fa
SHA512 (wkhtmltox-0.12.4.tar.bz2) = 1526c6138d6276d0f6188737a67848b8ae9c16016c119eb00bbdaf7159464f8799c53ca9a997ea40eea4c2d1cadc35a10607564949fd39a3b7b7e6745a3dbdcb
Size (wkhtmltox-0.12.4.tar.bz2) = 36355721 bytes
SHA1 (patch-qt_config.tests_mac_dwarf2.test) = efabd53a31dc69feac1bc2767c801fab5514a447
+SHA1 (patch-qt_config.tests_unix_freetype_freetype.pro) = 9db2892dd438581307b70ce73c62de721f91ab67
+SHA1 (patch-qt_config.tests_unix_libjpeg_libjpeg.pro) = 5012c36257fb1f2cef7f086e93b885030406d7b9
+SHA1 (patch-qt_config.tests_unix_libpng_libpng.pro) = be0dead445dbbfeef9bc2a816ef5efd85aba0411
+SHA1 (patch-qt_config.tests_x11_mitshm_mitshm.pro) = 5a411a67f6a99f87a9f22698a2a6e1e01b1a38e7
+SHA1 (patch-qt_config.tests_x11_xrender_xrender.pro) = a1120252f1f6b289caafa3835e2f2d42be69446c
SHA1 (patch-qt_configure) = e13eb806e11a88a20650fc62d38d162145eaabae
SHA1 (patch-qt_mkspecs_netbsd-g++_qmake.conf) = 508b1f25735d3a8f29a1da08a988f608186751bf
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_bytecompiler_BytecodeGenerator.cpp) = b8ef0623e9cd666d708295c006b5e72693ac715e
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp) = 79ad51f005e68156d2e339d0d925fc79ab79f059
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h) = d2af081598a049e33fb7b61cecf6163ec1986166
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp) = 5cb93130dc74d039944700afbe0a78a3825cf0a4
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_Identifier.cpp) = a82582dd815b63cb7e6c15d3adb40cf1f216fde4
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSONObject.cpp) = e49fc03256fde8a615e984921874dda9b8f2f7a4
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_StringPrototype.cpp) = e5041f4cb61d57cc71b83be761b8b5f9402e92c9
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_Atomics.h) = 88580505164ab1b3961c70296a26f1dca4502728
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_HashSet.h) = 979b874cf3d47fe9568b82f78eb1dd66b065513e
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 674e895fb9ae64376c2d88e62596db332cbf961a
+SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_wtf_text_AtomicString.cpp) = 5ec061aab070a3ac4d6680ccfe2f9cfcb0fbdf9a
+SHA1 (patch-qt_src_3rdparty_webkit_Source_WebCore_dom_DocumentMarkerController.cpp) = db09ecbfd0488fe13ff7dc9e785f420e00ba6162
+SHA1 (patch-qt_src_3rdparty_webkit_Source_WebCore_dom_Element.cpp) = 776c988688af27ebbcd43a75b40515a13b48b9d5
+SHA1 (patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) = 1dfde3ad2e0d30026e0cd2c62f5f959aeace394c
+SHA1 (patch-qt_src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = d510329e032f0e7362802ea23b19528d5ecdcc81
+SHA1 (patch-qt_src_plugins_platforms_xlib_xlib.pro) = 18516ea36e61c57d2acc3f5fa06890ab7a88fbe6
+SHA1 (patch-src_image_image.pro) = d33d1676608ebe663bc7c0dd43a2b71b478da7a6
+SHA1 (patch-src_lib_lib.pro) = a3b1958c2bc63b79a195325cb226de37eecc17a0
+SHA1 (patch-src_pdf_pdf.pro) = e46a2a14aa3540b3128182f9938c5e64f9b39b8c
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_freetype_freetype.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_freetype_freetype.pro Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-qt_config.tests_unix_freetype_freetype.pro,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/config.tests/unix/freetype/freetype.pro.orig 2017-09-10 11:24:46.252716190 +0000
++++ qt/config.tests/unix/freetype/freetype.pro
+@@ -1,5 +1,5 @@
+ SOURCES = freetype.cpp
+ CONFIG += x11
+ CONFIG -= qt
+-LIBS += -lfreetype
++LIBS += ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -lfreetype
+ include(freetype.pri)
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_libjpeg_libjpeg.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_libjpeg_libjpeg.pro Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-qt_config.tests_unix_libjpeg_libjpeg.pro,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/config.tests/unix/libjpeg/libjpeg.pro.orig 2017-09-10 11:25:23.534649648 +0000
++++ qt/config.tests/unix/libjpeg/libjpeg.pro
+@@ -1,4 +1,4 @@
+ SOURCES = libjpeg.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+-LIBS += -ljpeg
++LIBS += ${COMPILER_RPATH_FLAG}${PREFIX}/lib -ljpeg
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_libpng_libpng.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_config.tests_unix_libpng_libpng.pro Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-qt_config.tests_unix_libpng_libpng.pro,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/config.tests/unix/libpng/libpng.pro.orig 2017-09-10 11:25:06.276114904 +0000
++++ qt/config.tests/unix/libpng/libpng.pro
+@@ -1,4 +1,4 @@
+ SOURCES = libpng.cpp
+ CONFIG -= qt dylib
+ mac:CONFIG -= app_bundle
+-LIBS += -lpng
++LIBS += ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lpng
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_config.tests_x11_mitshm_mitshm.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_config.tests_x11_mitshm_mitshm.pro Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,11 @@
+$NetBSD: patch-qt_config.tests_x11_mitshm_mitshm.pro,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/config.tests/x11/mitshm/mitshm.pro.orig 2017-09-10 11:24:26.728648117 +0000
++++ qt/config.tests/x11/mitshm/mitshm.pro
+@@ -1,5 +1,5 @@
+ SOURCES = mitshm.cpp
+ CONFIG += x11
+ CONFIG -= qt
+-LIBS += -lXext
++LIBS += ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -lXext
+ hpux*:DEFINES+=Q_OS_HPUX
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_config.tests_x11_xrender_xrender.pro
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_config.tests_x11_xrender_xrender.pro Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,10 @@
+$NetBSD: patch-qt_config.tests_x11_xrender_xrender.pro,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/config.tests/x11/xrender/xrender.pro.orig 2017-09-10 11:25:41.279541527 +0000
++++ qt/config.tests/x11/xrender/xrender.pro
+@@ -1,4 +1,4 @@
+ SOURCES = xrender.cpp
+ CONFIG += x11
+ CONFIG -= qt
+-LIBS += -lXrender
++LIBS += ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -lXrender
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_bytecompiler_BytecodeGenerator.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_bytecompiler_BytecodeGenerator.cpp Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_bytecompiler_BytecodeGenerator.cpp,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp.orig 2017-09-09 19:18:57.033156793 +0000
++++ qt/src/3rdparty/webkit/Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp
+@@ -2058,9 +2058,9 @@ RegisterID* BytecodeGenerator::emitCatch
+ {
+ m_usesExceptions = true;
+ #if ENABLE(JIT)
+- HandlerInfo info = { start->bind(0, 0), end->bind(0, 0), instructions().size(), m_dynamicScopeDepth + m_baseScopeDepth, CodeLocationLabel() };
++ HandlerInfo info = { (uint32_t)start->bind(0, 0), (uint32_t)end->bind(0, 0), (uint32_t)instructions().size(), (uint32_t)(m_dynamicScopeDepth + m_baseScopeDepth, CodeLocationLabel()) };
+ #else
+- HandlerInfo info = { start->bind(0, 0), end->bind(0, 0), instructions().size(), m_dynamicScopeDepth + m_baseScopeDepth };
++ HandlerInfo info = { (uint32_t)start->bind(0, 0), (uint32_t)end->bind(0, 0), (uint32_t)instructions().size(), (uint32_t)(m_dynamicScopeDepth + m_baseScopeDepth) };
+ #endif
+
+ m_codeBlock->addExceptionHandler(info);
+@@ -2107,7 +2107,7 @@ void BytecodeGenerator::emitPushNewScope
+
+ void BytecodeGenerator::beginSwitch(RegisterID* scrutineeRegister, SwitchInfo::SwitchType type)
+ {
+- SwitchInfo info = { instructions().size(), type };
++ SwitchInfo info = { (uint32_t)instructions().size(), type };
+ switch (type) {
+ case SwitchInfo::SwitchImmediate:
+ emitOpcode(op_switch_imm);
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.cpp,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkedSpace.cpp.orig 2016-08-23 06:13:30.000000000 +0000
++++ qt/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkedSpace.cpp
+@@ -124,8 +124,8 @@ void MarkedSpace::sweep()
+ size_t MarkedSpace::objectCount() const
+ {
+ size_t result = 0;
+- BlockIterator end = m_blocks.end();
+- for (BlockIterator it = m_blocks.begin(); it != end; ++it)
++ ConstBlockIterator end = m_blocks.end();
++ for (ConstBlockIterator it = m_blocks.begin(); it != end; ++it)
+ result += (*it)->markCount();
+ return result;
+ }
+@@ -133,8 +133,8 @@ size_t MarkedSpace::objectCount() const
+ size_t MarkedSpace::size() const
+ {
+ size_t result = 0;
+- BlockIterator end = m_blocks.end();
+- for (BlockIterator it = m_blocks.begin(); it != end; ++it)
++ ConstBlockIterator end = m_blocks.end();
++ for (ConstBlockIterator it = m_blocks.begin(); it != end; ++it)
+ result += (*it)->size();
+ return result;
+ }
+@@ -142,8 +142,8 @@ size_t MarkedSpace::size() const
+ size_t MarkedSpace::capacity() const
+ {
+ size_t result = 0;
+- BlockIterator end = m_blocks.end();
+- for (BlockIterator it = m_blocks.begin(); it != end; ++it)
++ ConstBlockIterator end = m_blocks.end();
++ for (ConstBlockIterator it = m_blocks.begin(); it != end; ++it)
+ result += (*it)->capacity();
+ return result;
+ }
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MarkedSpace.h,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkedSpace.h.orig 2016-08-23 06:13:30.000000000 +0000
++++ qt/src/3rdparty/webkit/Source/JavaScriptCore/heap/MarkedSpace.h
+@@ -92,6 +92,7 @@ namespace JSC {
+ static const size_t impreciseCount = impreciseCutoff / impreciseStep - 1;
+
+ typedef HashSet<MarkedBlock*>::iterator BlockIterator;
++ typedef HashSet<MarkedBlock*>::const_iterator ConstBlockIterator;
+
+ struct SizeClass {
+ SizeClass();
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_parser_JSParser.cpp,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/src/3rdparty/webkit/Source/JavaScriptCore/parser/JSParser.cpp.orig 2016-08-23 06:13:30.000000000 +0000
++++ qt/src/3rdparty/webkit/Source/JavaScriptCore/parser/JSParser.cpp
+@@ -453,8 +453,8 @@ private:
+
+ void copyCapturedVariablesToVector(const IdentifierSet& capturedVariables, Vector<RefPtr<StringImpl> >& vector)
+ {
+- IdentifierSet::iterator end = capturedVariables.end();
+- for (IdentifierSet::iterator it = capturedVariables.begin(); it != end; ++it) {
++ IdentifierSet::const_iterator end = capturedVariables.end();
++ for (IdentifierSet::const_iterator it = capturedVariables.begin(); it != end; ++it) {
+ if (m_declaredVariables.contains(*it))
+ continue;
+ vector.append(*it);
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_Identifier.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_Identifier.cpp Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_Identifier.cpp,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/Identifier.cpp.orig 2017-09-09 19:16:30.554645837 +0000
++++ qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/Identifier.cpp
+@@ -222,7 +222,7 @@ PassRefPtr<StringImpl> Identifier::add(J
+ }
+ if (!length)
+ return StringImpl::empty();
+- UCharBuffer buf = {s, length};
++ UCharBuffer buf = {s, (unsigned)length};
+ pair<HashSet<StringImpl*>::iterator, bool> addResult = globalData->identifierTable->add<UCharBuffer, IdentifierUCharBufferTranslator>(buf);
+
+ // If the string is newly-translated, then we need to adopt it.
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSONObject.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSONObject.cpp Sun Sep 10 19:58:36 2017 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_JSONObject.cpp,v 1.1 2017/09/10 19:58:36 joerg Exp $
+
+--- qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp.orig 2017-09-09 19:17:09.419224855 +0000
++++ qt/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
+@@ -335,7 +335,7 @@ void Stringifier::appendQuotedString(USt
+ default:
+ static const char hexDigits[] = "0123456789abcdef";
+ UChar ch = data[i];
+- UChar hex[] = { '\\', 'u', hexDigits[(ch >> 12) & 0xF], hexDigits[(ch >> 8) & 0xF], hexDigits[(ch >> 4) & 0xF], hexDigits[ch & 0xF] };
++ UChar hex[] = { '\\', 'u', (UChar)hexDigits[(ch >> 12) & 0xF], (UChar)hexDigits[(ch >> 8) & 0xF], (UChar)hexDigits[(ch >> 4) & 0xF], (UChar)hexDigits[ch & 0xF] };
+ builder.append(hex, WTF_ARRAY_LENGTH(hex));
+ break;
+ }
diff -r 289fcbe78277 -r c40fd2cb100b converters/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_runtime_StringPrototype.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
Home |
Main Index |
Thread Index |
Old Index