From 0e7b41a9edb44acc7a46dd2f860fb815d7a2fb5d Mon Sep 17 00:00:00 2001
From: Richard PALO <richard@NetBSD.org>
Date: Tue, 15 Dec 2015 16:27:51 +0100
Subject: [PATCH] wkhtmltopdf fixes for SunOS, gcc49...
---
wkhtmltopdf/Makefile | 7 +++++++
wkhtmltopdf/distinfo | 1 +
.../patches/patch-qt_config.tests_unix_iconv_iconv.cpp | 18 ++++++++++++++++++
3 files changed, 26 insertions(+)
create mode 100644 wkhtmltopdf/patches/patch-qt_config.tests_unix_iconv_iconv.cpp
diff --git a/wkhtmltopdf/Makefile b/wkhtmltopdf/Makefile
index 4f62fc3..a3a34d3 100644
--- a/wkhtmltopdf/Makefile
+++ b/wkhtmltopdf/Makefile
@@ -59,6 +59,7 @@ CONFIGURE_ARGS+= \
-no-qt3support -no-rpath -no-script -no-scripttools -no-sm \
-no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql -no-sql-sqlite \
-no-sql-sqlite2 -no-sse -no-sse2 -no-sse3 -no-sse4.1 -no-sse4.2 \
+ -no-sql-db2 -no-sql-tds -no-sql-oci \
-no-ssse3 -no-stl -no-xcursor -no-xfixes -no-xinerama -no-xinput \
-no-xkb -no-xrandr -no-xshape -no-xsync -no-javascript-jit
@@ -73,6 +74,9 @@ CONFIGURE_ARGS+= \
CFLAGS.SunOS+= -D_XPG6
+BUILDLINK_TRANSFORM+= rm:-I/usr/sfw/include
+BUILDLINK_TRANSFORM+= opt:-L/usr/sfw/lib:-L${PREFIX}/lib
+
INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}${PREFIX}
PLIST_SUBST+= LIBVERSION=${PKGVERSION_NOREV:C/([0-9]+\.)([0-9]+\.)([0-9]+)\.[0-9]+/\1\2\3/}
@@ -92,8 +96,11 @@ post-build:
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXv/buildlink3.mk"
+.include "../../x11/videoproto/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wkhtmltopdf/distinfo b/wkhtmltopdf/distinfo
index 7f9fcae..d527707 100644
--- a/wkhtmltopdf/distinfo
+++ b/wkhtmltopdf/distinfo
@@ -3,6 +3,7 @@ $NetBSD: distinfo,v 1.5 2015/08/17 15:34:47 fhajny Exp $
SHA1 (wkhtmltox-0.12.2.1.tar.bz2) = bd022c22eafb3f1015b2726de3fafabbcdc42dc0
RMD160 (wkhtmltox-0.12.2.1.tar.bz2) = b5081626d9f4617ee1b4555d1f0ed7514dbb5771
Size (wkhtmltox-0.12.2.1.tar.bz2) = 36248626 bytes
+SHA1 (patch-qt_config.tests_unix_iconv_iconv.cpp) = 360153c76216aa42b249a6ce9d149dfc9d8d95fd
SHA1 (patch-qt_mkspecs_solaris-g++-64_qmake.conf) = d61da21fe0ae9ed29a8f9fefb8e46a8dc7fd6fe3
SHA1 (patch-qt_src_3rdparty_sqlite_sqlite3.c) = 6c32831ef77792b532c701d8cd049b4743d689a4
SHA1 (patch-qt_src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 11f8fc8e810c368487be1a4602793efa980bab09
diff --git a/wkhtmltopdf/patches/patch-qt_config.tests_unix_iconv_iconv.cpp b/wkhtmltopdf/patches/patch-qt_config.tests_unix_iconv_iconv.cpp
new file mode 100644
index 0000000..0b8058a
--- /dev/null
+++ b/wkhtmltopdf/patches/patch-qt_config.tests_unix_iconv_iconv.cpp
@@ -0,0 +1,18 @@
+$NetBSD$
+
+convert possible error to warning:
+ invalid conversion from 'char**' to 'const char**' [-fpermissive]
+
+--- qt/config.tests/unix/iconv/iconv.cpp.orig 2015-01-03 18:06:12.000000000 +0000
++++ qt/config.tests/unix/iconv/iconv.cpp
+@@ -44,6 +44,10 @@
+ #else
+ #include <iconv.h>
+
++#ifdef __GNUG__
++#pragma GCC diagnostic warning "-fpermissive"
++#endif
++
+ int main(int, char **)
+ {
+ iconv_t x = iconv_open("", "");
--
2.6.4