summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorLoïc Bartoletti <lbartoletti@FreeBSD.org>2020-12-08 20:03:07 +0000
committerLoïc Bartoletti <lbartoletti@FreeBSD.org>2020-12-08 20:03:07 +0000
commit47b26d9293f196d71c39ba4d82df23d179884405 (patch)
tree3984ac0366432e29f9e1ac47cbac9b18032f7c04 /textproc
parentUpdate benchmarks/ali to version 0.5.4. (diff)
Update Qt/PySide2 to 5.15.2 / PyQt to 5.15.1 / SIP to 5.4.0
This commit combines several updates. - Update Qt to 5.12.2 - Update PyQt to 5.15.1 - Since PySide 5.15.1 is broken with Qt 5.15.2, so PySide and Shiboken are also updated to 5.15.2. - Update sip to 5.4.0 SIP is a collection of tools to create Python bindings for C and C++ libraries and used by PyQt and wxPython. There are some changes with sip5 [1]: - python 3.5+ is required - sip drops support of old deprecated methods as sipdistutils & cie. - this version breaks also PyQt5 extension ABI. SIP files will be installed in ${PYTHON_SITELIBDIR}/PyQt${_PYQT_VERSION}/bindings - some ports will use the new pyqtbuilder package with the pyproject.toml setup. Instead if the project have a setup.py, you should use sip-build to build it. - if a port needs sip, it should also needs pysip. BTW, py-qt5-core requires pysip, so that should be enough for PyQt packages. List of ports impacted by this change. Most of the patches have been integrated or are in the process of being integrated upstream: - devel/libsavitar - graphics/py-python-poppler-qt5 - net-im/scudcloud - net/libarcus - print/py-frescobaldi - science/py-veusz - graphics/qgis and graphics/qgis-ltr - deskutils/calibre A special note regarding calibre. New versions require sip>=5, we update it to the latest version (thanks to madpilot@) science/scidavis will remove the PyQt binding soon and there is no patch planned, so we remove the python option (ok makc@) While here, convert some ports to USE_PYQT (cad/cura, cad/uranium, devel/eric6, ...) Thanks to tcberner and adridg! [1] https://www.riverbankcomputing.com/static/Docs/sip/ PR: 250853 Exp-run by: antoine
Diffstat (limited to 'textproc')
-rw-r--r--textproc/goldendict/files/patch-sptr.hh12
-rw-r--r--textproc/kompare/files/patch-git-68d3eee3.diff30
-rw-r--r--textproc/py-qt5-xml/Makefile2
-rw-r--r--textproc/py-qt5-xmlpatterns/Makefile2
-rw-r--r--textproc/qt5-xmlpatterns/Makefile1
-rw-r--r--textproc/qt5-xmlpatterns/pkg-plist1
6 files changed, 45 insertions, 3 deletions
diff --git a/textproc/goldendict/files/patch-sptr.hh b/textproc/goldendict/files/patch-sptr.hh
new file mode 100644
index 000000000000..23dcb67ba623
--- /dev/null
+++ b/textproc/goldendict/files/patch-sptr.hh
@@ -0,0 +1,12 @@
+--- sptr.hh.orig 2020-11-23 20:39:45 UTC
++++ sptr.hh
+@@ -67,9 +67,6 @@ class sptr_base (public)
+ }
+ }
+
+- unsigned use_count() const
+- { return count; }
+-
+ sptr_base & operator = ( sptr_base const & other )
+ { if ( &other != this ) { reset(); p = other.p; count = other.count; increment(); }
+ return * this; }
diff --git a/textproc/kompare/files/patch-git-68d3eee3.diff b/textproc/kompare/files/patch-git-68d3eee3.diff
new file mode 100644
index 000000000000..16e22396d8ee
--- /dev/null
+++ b/textproc/kompare/files/patch-git-68d3eee3.diff
@@ -0,0 +1,30 @@
+diff --git komparepart/kompare_part.cpp komparepart/kompare_part.cpp
+index 42d3120..88346d6 100644
+--- komparepart/kompare_part.cpp
++++ komparepart/kompare_part.cpp
+@@ -26,6 +26,7 @@
+ #include <QMenu>
+ #include <QPainter>
+ #include <QPrinter>
++#include <QPageLayout>
+ #include <QPrintDialog>
+ #include <QPrintPreviewDialog>
+ #include <QTemporaryDir>
+@@ -610,7 +611,7 @@ void KomparePart::saveDiff()
+ void KomparePart::slotFilePrint()
+ {
+ QPrinter printer;
+- printer.setOrientation(QPrinter::Landscape);
++ printer.setPageOrientation(QPageLayout::Landscape);
+ QPrintDialog* dlg = new QPrintDialog(&printer, nullptr);
+
+ if (dlg->exec() == QDialog::Accepted)
+@@ -625,7 +626,7 @@ void KomparePart::slotFilePrint()
+ void KomparePart::slotFilePrintPreview()
+ {
+ QPrinter printer;
+- printer.setOrientation(QPrinter::Landscape);
++ printer.setPageOrientation(QPageLayout::Landscape);
+ QPrintPreviewDialog dlg(&printer);
+
+ connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested);
diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index c775269eb93e..c8bc2cd92692 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtXml
PYQT_DIST= yes
-USES= python pyqt:5 qt:5
+USES= python:3.5+ pyqt:5 qt:5
USE_PYQT= sip_build core_run
USE_PYTHON= concurrent flavors py3kplist
USE_QT= core xml buildtools_build qmake_build
diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index 79468ffafb26..e6552b79d1b4 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtXmlPatterns
PYQT_DIST= yes
-USES= python pyqt:5 qt:5
+USES= python:3.5+ pyqt:5 qt:5
USE_PYQT= sip_build core_run network_run
USE_PYTHON= concurrent flavors py3kplist
USE_QT= core network xmlpatterns qmake_build
diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile
index 9376973aaf65..6385a86ef184 100644
--- a/textproc/qt5-xmlpatterns/Makefile
+++ b/textproc/qt5-xmlpatterns/Makefile
@@ -2,7 +2,6 @@
PORTNAME= xmlpatterns
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 2
CATEGORIES= textproc
PKGNAMEPREFIX= qt5-
diff --git a/textproc/qt5-xmlpatterns/pkg-plist b/textproc/qt5-xmlpatterns/pkg-plist
index cd1aaaa5a779..36ae97115646 100644
--- a/textproc/qt5-xmlpatterns/pkg-plist
+++ b/textproc/qt5-xmlpatterns/pkg-plist
@@ -418,6 +418,7 @@
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri
%%QT_QMLDIR%%/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so
+%%DEBUG%%%%QT_QMLDIR%%/QtQuick/XmlListModel/libqmlxmllistmodelplugin.so.debug
%%QT_QMLDIR%%/QtQuick/XmlListModel/plugins.qmltypes
%%QT_QMLDIR%%/QtQuick/XmlListModel/qmldir
libdata/pkgconfig/Qt5XmlPatterns.pc