qt6-qttools: revbump and fix build with litehtml 0.6

[Niclas Rosenvik <nros%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Sun Jul 10 12:05:02 2022 +0200
Changeset:	89f3cd535c73bfc291c6e079139d22d080658ed0

Modified Files:
	qt6-qttools/Makefile
	qt6-qttools/distinfo
Added Files:
	qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp
	qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h

Log Message:
qt6-qttools: revbump and fix build with litehtml 0.6

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=89f3cd535c73bfc291c6e079139d22d080658ed0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt6-qttools/Makefile                                      |  1 +
 qt6-qttools/distinfo                                      |  2 ++
 ...ch-src_assistant_qlitehtml_src_container__qpainter.cpp | 15 +++++++++++++++
 ...h-src_assistant_qlitehtml_src_container__qpainter__p.h | 15 +++++++++++++++
 4 files changed, 33 insertions(+)

diffs:
diff --git a/qt6-qttools/Makefile b/qt6-qttools/Makefile
index dd11745db3..3646c0f803 100644
--- a/qt6-qttools/Makefile
+++ b/qt6-qttools/Makefile
@@ -2,6 +2,7 @@
 
 DISTNAME=	qttools-everywhere-src-${QTVERSION}
 PKGNAME=	qt6-qttools-${QTVERSION}
+PKGREVISION=	1
 COMMENT=	Qt6 tools
 CATEGORIES=	x11
 LICENSE=	gnu-lgpl-v3 OR gnu-gpl-v2 OR gnu-gpl-v3
diff --git a/qt6-qttools/distinfo b/qt6-qttools/distinfo
index 02a828b7dd..f47914f8ab 100644
--- a/qt6-qttools/distinfo
+++ b/qt6-qttools/distinfo
@@ -4,4 +4,6 @@ BLAKE2s (qttools-everywhere-src-6.3.1.tar.xz) = 411a29de00f060c471b0060619e03b88
 SHA512 (qttools-everywhere-src-6.3.1.tar.xz) = 6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883
 Size (qttools-everywhere-src-6.3.1.tar.xz) = 8628880 bytes
 SHA1 (patch-src_assistant_CMakeLists.txt) = 41e1a4eb77337f52f2b6b37a01d3217c83a29bc8
+SHA1 (patch-src_assistant_qlitehtml_src_container__qpainter.cpp) = b2f9fb7e30af8bd8e42e1ba65289d56590595493
+SHA1 (patch-src_assistant_qlitehtml_src_container__qpainter__p.h) = a478ef2748d2baf7cfb9e3a064a334d079a5c042
 SHA1 (patch-src_linguist_lupdate_CMakeLists.txt) = d70ea348c3ba7f64bcc245de9445becefecf3a9c
diff --git a/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp b/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp
new file mode 100644
index 0000000000..6a44154abc
--- /dev/null
+++ b/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter.cpp
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* fix build with litehtml 0.6
+
+--- src/assistant/qlitehtml/src/container_qpainter.cpp.orig	2022-07-09 11:08:02.699425232 +0000
++++ src/assistant/qlitehtml/src/container_qpainter.cpp
+@@ -558,7 +558,7 @@ void DocumentContainerPrivate::draw_text
+     painter->drawText(toQRect(pos), 0, QString::fromUtf8(text));
+ }
+ 
+-int DocumentContainerPrivate::pt_to_px(int pt)
++int DocumentContainerPrivate::pt_to_px(int pt) const
+ {
+     // magic factor of 11/12 to account for differences to webengine/webkit
+     return m_paintDevice->physicalDpiY() * pt * 11 / m_paintDevice->logicalDpiY() / 12;
diff --git a/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h b/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h
new file mode 100644
index 0000000000..56cc9e4e9e
--- /dev/null
+++ b/qt6-qttools/patches/patch-src_assistant_qlitehtml_src_container__qpainter__p.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+* fix build with litehtml 0.6
+
+--- src/assistant/qlitehtml/src/container_qpainter_p.h.orig	2022-07-09 11:07:09.195443730 +0000
++++ src/assistant/qlitehtml/src/container_qpainter_p.h
+@@ -96,7 +96,7 @@ public: // document_container API
+                    litehtml::uint_ptr hFont,
+                    litehtml::web_color color,
+                    const litehtml::position &pos) override;
+-    int pt_to_px(int pt) override;
++    int pt_to_px(int pt) const override;
+     int get_default_font_size() const override;
+     const litehtml::tchar_t *get_default_font_name() const override;
+     void draw_list_marker(litehtml::uint_ptr hdc, const litehtml::list_marker &marker) override;