git: 1f59a9f816cd - 2025Q1 - devel/py-qt6-pyqt: Fix build with Qt 6.8.2
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 03 Feb 2025 13:16:13 UTC
The branch 2025Q1 has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1f59a9f816cd73a4ad9360e901644aa203c67b73
commit 1f59a9f816cd73a4ad9360e901644aa203c67b73
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2025-02-03 12:08:21 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2025-02-03 13:16:08 +0000
devel/py-qt6-pyqt: Fix build with Qt 6.8.2
/wrkdirs/usr/ports/devel/py-qt6-pyqt/work-py311/PyQt6-6.8.0/build/QtCore/sipQtCoreQStringConverterBase.cpp:58:26:
error: call to implicitly-deleted copy constructor of '::QStringConvert
58 | sipCpp = new ::QStringConverterBase(*a0);
MFH: 2025Q1
(cherry picked from commit 93ae5ca9b65bf3768fc55aca3761f5cf7470bb7d)
---
devel/py-qt6-pyqt/Makefile | 1 +
.../files/patch-sip_QtCore_qstringconverter__base.sip | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/devel/py-qt6-pyqt/Makefile b/devel/py-qt6-pyqt/Makefile
index e42e1e71b0c9..9a250a05ba86 100644
--- a/devel/py-qt6-pyqt/Makefile
+++ b/devel/py-qt6-pyqt/Makefile
@@ -1,5 +1,6 @@
PORTNAME= pyqt
DISTVERSION= ${PYQT_VERSION}
+PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_PYQT}
PKGNAMEPREFIX= ${PYQT_PY_RELNAME}-
diff --git a/devel/py-qt6-pyqt/files/patch-sip_QtCore_qstringconverter__base.sip b/devel/py-qt6-pyqt/files/patch-sip_QtCore_qstringconverter__base.sip
new file mode 100644
index 000000000000..700296f903bb
--- /dev/null
+++ b/devel/py-qt6-pyqt/files/patch-sip_QtCore_qstringconverter__base.sip
@@ -0,0 +1,17 @@
+Fix build with Qt 6.8.2
+
+/wrkdirs/usr/ports/devel/py-qt6-pyqt/work-py311/PyQt6-6.8.0/build/QtCore/sipQtCoreQStringConverterBase.cpp:58:26:
+error: call to implicitly-deleted copy constructor of '::QStringConvert
+ 58 | sipCpp = new ::QStringConverterBase(*a0);
+
+--- sip/QtCore/qstringconverter_base.sip.orig 2024-12-06 14:41:44 UTC
++++ sip/QtCore/qstringconverter_base.sip
+@@ -22,7 +22,7 @@
+
+ %If (Qt_6_4_0 -)
+
+-class QStringConverterBase
++class QStringConverterBase /NoDefaultCtors/
+ {
+ %TypeHeaderCode
+ #include <qstringconverter_base.h>