pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-qt6-webengine: finish package



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sat Apr 19 09:28:35 2025 +0200
Changeset:	6b228cf180ba84df9c627d2cd3ff48215f6bba3d

Modified Files:
	py-qt6-webengine/PLIST
	py-qt6-webengine/distinfo
Added Files:
	py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebengineframe.sip
	py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebenginepage.sip
Removed Files:
	py-qt6-webengine/TODO

Log Message:
py-qt6-webengine: finish package

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

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

diffstat:
 py-qt6-webengine/PLIST                             | 84 ++++++++++++----------
 py-qt6-webengine/TODO                              | 21 ------
 py-qt6-webengine/distinfo                          |  2 +
 .../patch-sip_QtWebEngineCore_qwebengineframe.sip  | 14 ++++
 .../patch-sip_QtWebEngineCore_qwebenginepage.sip   | 14 ++++
 5 files changed, 77 insertions(+), 58 deletions(-)

diffs:
diff --git a/py-qt6-webengine/PLIST b/py-qt6-webengine/PLIST
index a5c02c2a68..39ef6c44d4 100644
--- a/py-qt6-webengine/PLIST
+++ b/py-qt6-webengine/PLIST
@@ -1,40 +1,50 @@
-@comment $NetBSD: PLIST,v 1.3 2023/10/28 19:57:26 wiz Exp $
-${PYSITELIB}/PyQt5/QtWebEngine.abi3.so
-${PYSITELIB}/PyQt5/QtWebEngineCore.abi3.so
-${PYSITELIB}/PyQt5/QtWebEngineWidgets.abi3.so
-${PYSITELIB}/PyQt5/bindings/QtWebEngine/QtWebEngine.toml
-${PYSITELIB}/PyQt5/bindings/QtWebEngine/QtWebEnginemod.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngine/qquickwebengineprofile.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngine/qquickwebenginescript.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngine/qtwebengineglobal.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/QtWebEngineCore.toml
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/QtWebEngineCoremod.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebengineclientcertificatestore.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebenginecookiestore.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebenginefindtextresult.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebenginehttprequest.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebenginenotification.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebenginequotarequest.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebengineurlrequestinfo.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebengineurlrequestinterceptor.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebengineurlrequestjob.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebengineurlscheme.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineCore/qwebengineurlschemehandler.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/QtWebEngineWidgets.toml
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginecertificateerror.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebengineclientcertificateselection.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginecontextmenudata.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginedownloaditem.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginefullscreenrequest.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginehistory.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginepage.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebengineprofile.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginescript.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginescriptcollection.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebenginesettings.sip
-${PYSITELIB}/PyQt5/bindings/QtWebEngineWidgets/qwebengineview.sip
+@comment $NetBSD$
+${PYSITELIB}/PyQt6/QtWebEngineCore.abi3.so
+${PYSITELIB}/PyQt6/QtWebEngineQuick.abi3.so
+${PYSITELIB}/PyQt6/QtWebEngineWidgets.abi3.so
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/QtWebEngineCore.toml
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/QtWebEngineCoremod.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qtwebenginecoreglobal.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginecertificateerror.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineclientcertificateselection.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineclientcertificatestore.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineclienthints.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginecontextmenurequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginecookiestore.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginedesktopmediarequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginedownloadrequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginefilesystemaccessrequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginefindtextresult.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineframe.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginefullscreenrequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineglobalsettings.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginehistory.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginehttprequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineloadinginfo.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginenavigationrequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginenewwindowrequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginenotification.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginepage.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginepermission.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineprofile.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginequotarequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineregisterprotocolhandlerrequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginescript.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginescriptcollection.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginesettings.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineurlrequestinfo.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineurlrequestinterceptor.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineurlrequestjob.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineurlscheme.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebengineurlschemehandler.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineCore/qwebenginewebauthuxrequest.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineQuick/QtWebEngineQuick.toml
+${PYSITELIB}/PyQt6/bindings/QtWebEngineQuick/QtWebEngineQuickmod.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineQuick/qquickwebengineprofile.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineQuick/qtwebenginequickglobal.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineWidgets/QtWebEngineWidgets.toml
+${PYSITELIB}/PyQt6/bindings/QtWebEngineWidgets/QtWebEngineWidgetsmod.sip
+${PYSITELIB}/PyQt6/bindings/QtWebEngineWidgets/qwebengineview.sip
 ${PYSITELIB}/${WHEEL_INFODIR}/METADATA
 ${PYSITELIB}/${WHEEL_INFODIR}/RECORD
 ${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
diff --git a/py-qt6-webengine/TODO b/py-qt6-webengine/TODO
deleted file mode 100644
index 2a920effe7..0000000000
--- a/py-qt6-webengine/TODO
+++ /dev/null
@@ -1,21 +0,0 @@
-/usr/pkgsrc/wip/py-qt6-webengine/work/PyQt6_WebEngine-6.8.0/sip/QtWebEngineCore/qwebengineframe.sip: In lambda function:
-/usr/pkgsrc/wip/py-qt6-webengine/work/PyQt6_WebEngine-6.8.0/sip/QtWebEngineCore/qwebengineframe.sip:52:64: error: invalid use of incomplete type 'class QVariant'
-   52 |             res = sipCallMethod(NULL, a1, "N", new QVariant(arg), sipType_QVariant, NULL);
-      |                                                                ^
-In file included from /usr/pkgsrc/wip/py-qt6-webengine/work/.buildlink/qt6/include/QtCore/qtypeinfo.h:9,
-                 from /usr/pkgsrc/wip/py-qt6-webengine/work/.buildlink/qt6/include/QtCore/qglobal.h:47,
-                 from /usr/pkgsrc/wip/py-qt6-webengine/work/.buildlink/qt6/include/QtCore/qmetatype.h:9,
-                 from /usr/pkgsrc/wip/py-qt6-webengine/work/.buildlink/qt6/include/QtCore/QMetaType:1,
-                 from sipAPIQtWebEngineCore.h:33,
-                 from sipQtWebEngineCoreQWebEngineFrame.cpp:24:
-/usr/pkgsrc/wip/py-qt6-webengine/work/.buildlink/qt6/include/QtCore/qcontainerfwd.h:49:7: note: forward declaration of 'class QVariant'
-   49 | class QVariant;
-      |       ^~~~~~~~
-/usr/pkgsrc/wip/py-qt6-webengine/work/PyQt6_WebEngine-6.8.0/sip/QtWebEngineCore/qwebengineframe.sip: In lambda function:
-/usr/pkgsrc/wip/py-qt6-webengine/work/PyQt6_WebEngine-6.8.0/sip/QtWebEngineCore/qwebengineframe.sip:79:64: error: invalid use of incomplete type 'class QVariant'
-   79 |             res = sipCallMethod(NULL, a2, "N", new QVariant(arg), sipType_QVariant, NULL);
-      |                                                                ^
-/usr/pkgsrc/wip/py-qt6-webengine/work/.buildlink/qt6/include/QtCore/qcontainerfwd.h:49:7: note: forward declaration of 'class QVariant'
-   49 | class QVariant;
-      |       ^~~~~~~~
-*** Error code 1
diff --git a/py-qt6-webengine/distinfo b/py-qt6-webengine/distinfo
index 6eeff0b201..b1ede29942 100644
--- a/py-qt6-webengine/distinfo
+++ b/py-qt6-webengine/distinfo
@@ -3,3 +3,5 @@ $NetBSD: distinfo,v 1.2 2022/12/02 15:34:17 wiz Exp $
 BLAKE2s (PyQt6_WebEngine-6.8.0.tar.gz) = 1e667c5d508fddada8c785b1af2864c641a4cd591f367812a5f9315f5f80f4f6
 SHA512 (PyQt6_WebEngine-6.8.0.tar.gz) = f48575829ccf9350ec6e743f2185975706c149dd37b8fbdf5c76bb65f606084b3d3c732ce39bfd35317d1e65659d5ec6e77b489a83c43971b5b3b3ce278bd8dc
 Size (PyQt6_WebEngine-6.8.0.tar.gz) = 34203 bytes
+SHA1 (patch-sip_QtWebEngineCore_qwebengineframe.sip) = bbbdef1ead6580a84ad0b1a25b1de6947802a123
+SHA1 (patch-sip_QtWebEngineCore_qwebenginepage.sip) = 3767edfa26446c53890099f1cbf4a19ac9508632
diff --git a/py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebengineframe.sip b/py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebengineframe.sip
new file mode 100644
index 0000000000..fc521d6506
--- /dev/null
+++ b/py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebengineframe.sip
@@ -0,0 +1,14 @@
+$NetBSD$
+
+https://crux.nu/ports/crux-3.7/contrib/python3-pyqt6-webengine/pyqt6-webengine-fix-build.patch
+
+--- sip/QtWebEngineCore/qwebengineframe.sip.orig	2024-12-06 14:49:43.838095400 +0000
++++ sip/QtWebEngineCore/qwebengineframe.sip
+@@ -25,6 +25,7 @@
+ class QWebEngineFrame /NoDefaultCtors/
+ {
+ %TypeHeaderCode
++#include <qvariant.h>
+ #include <qwebengineframe.h>
+ %End
+ 
diff --git a/py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebenginepage.sip b/py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebenginepage.sip
new file mode 100644
index 0000000000..0e1c5064ee
--- /dev/null
+++ b/py-qt6-webengine/patches/patch-sip_QtWebEngineCore_qwebenginepage.sip
@@ -0,0 +1,14 @@
+$NetBSD$
+
+https://crux.nu/ports/crux-3.7/contrib/python3-pyqt6-webengine/pyqt6-webengine-fix-build.patch
+
+--- sip/QtWebEngineCore/qwebenginepage.sip.orig	2024-12-06 14:49:43.839698600 +0000
++++ sip/QtWebEngineCore/qwebenginepage.sip
+@@ -23,6 +23,7 @@
+ class QWebEnginePage : public QObject
+ {
+ %TypeHeaderCode
++#include <qvariant.h>
+ #include <qwebenginepage.h>
+ %End
+ 


Home | Main Index | Thread Index | Old Index