summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff13
-rw-r--r--graphics/py-python-poppler-qt5/Makefile16
-rw-r--r--graphics/py-python-poppler-qt5/files/patch-poppler-qt5.sip13
-rw-r--r--graphics/py-python-poppler-qt5/files/patch-project.py94
-rw-r--r--graphics/py-python-poppler-qt5/files/patch-pyproject.toml42
-rw-r--r--graphics/py-python-poppler-qt5/files/patch-types.sip60
-rw-r--r--graphics/py-python-poppler-qt5/files/patch-version.sip.in26
-rw-r--r--graphics/py-python-poppler-qt5/pkg-plist26
-rw-r--r--graphics/py-qt5-svg/Makefile2
-rw-r--r--graphics/qgis-ltr/Makefile8
-rw-r--r--graphics/qgis-ltr/distinfo6
-rw-r--r--graphics/qgis/Makefile11
-rw-r--r--graphics/qgis/files/patch-cmake_FindPyQt5.py11
-rw-r--r--graphics/qgis/files/patch-cmake_FindSIP.py9
-rw-r--r--graphics/qt5-3d/pkg-plist3
-rw-r--r--graphics/qt5-pixeltool/files/patch-src__src.pro9
16 files changed, 307 insertions, 42 deletions
diff --git a/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff b/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff
new file mode 100644
index 000000000000..383eafc23723
--- /dev/null
+++ b/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff
@@ -0,0 +1,13 @@
+diff --git src/fractalgenerator.cc src/fractalgenerator.cc
+index dc8fb31..8f5d399 100644
+--- src/fractalgenerator.cc
++++ src/fractalgenerator.cc
+@@ -128,7 +128,7 @@ FractalGeneratorApp::FractalGeneratorApp(QWidget* parent, const QString& fileNam
+ helpMenu->addAction(tr("&About"), this, SLOT(slotHelpAbout()));
+
+ Printer.setColorMode(QPrinter::Color);
+- Printer.setOrientation(QPrinter::Landscape);
++ Printer.setPageOrientation(QPageLayout::Landscape);
+ Printer.setOutputFileName(tr("Fractal.pdf"));
+
+ statusBar()->showMessage(tr("Welcome to FractGen!"), 3000);
diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile
index 6bcf05cf66bb..02003ef02a7f 100644
--- a/graphics/py-python-poppler-qt5/Makefile
+++ b/graphics/py-python-poppler-qt5/Makefile
@@ -13,18 +13,22 @@ COMMENT= Python bindings for the Poppler-Qt PDF rendering library
LICENSE= LGPL21 LGPL3
LICENSE_COMB= dual
+BUILD_DEPENDS= qmake:devel/qt5-qmake
LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
-USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.4+ qmake qt:5
+USES= compiler:c++11-lang pkgconfig pyqt:5 python:3.5+ qt:5
USE_GITHUB= yes
GH_ACCOUNT= frescobaldi
-USE_PYQT= gui xml sip_build
-USE_PYTHON= autoplist distutils
+USE_PYQT= gui xml sip_build qtbuilder
-PYDISTUTILS_BUILD_TARGET= build_ext
-PYDISTUTILS_BUILDARGS+= --pyqt-sip-dir=${PYQT_SIPDIR}
+do-build:
+ (cd ${WRKSRC} ; sip-build --verbose --no-make --build-dir build ; ${MAKE} -C ./build )
+
+do-install:
+ (cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} )
post-install:
- @${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
+ ${RLN} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/popplerqt5.so
+ @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/popplerqt5.cpython-${PYTHON_SUFFIX}m.so
.include <bsd.port.mk>
diff --git a/graphics/py-python-poppler-qt5/files/patch-poppler-qt5.sip b/graphics/py-python-poppler-qt5/files/patch-poppler-qt5.sip
new file mode 100644
index 000000000000..8ba76f442ddf
--- /dev/null
+++ b/graphics/py-python-poppler-qt5/files/patch-poppler-qt5.sip
@@ -0,0 +1,13 @@
+From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
+
+--- poppler-qt5.sip.orig 2019-11-22 05:56:45 UTC
++++ poppler-qt5.sip
+@@ -19,7 +19,7 @@
+ #include <qt5/poppler-qt5.h>
+ %End
+
+-%Include version.sip // auto-generated by the setup.py script
++%Include version.sip // auto-generated by the project.py script
+ %Include types.sip
+
+ %Include poppler-annotation.sip
diff --git a/graphics/py-python-poppler-qt5/files/patch-project.py b/graphics/py-python-poppler-qt5/files/patch-project.py
new file mode 100644
index 000000000000..dc3e0ad077dd
--- /dev/null
+++ b/graphics/py-python-poppler-qt5/files/patch-project.py
@@ -0,0 +1,94 @@
+From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
+
+--- project.py.orig 2020-10-11 18:59:42 UTC
++++ project.py
+@@ -0,0 +1,89 @@
++"""The build configuration file for Python-Poppler-Qt5, used by sip."""
++
++from os.path import join
++import re
++import subprocess
++from pyqtbuild import PyQtBindings, PyQtProject
++from sipbuild import Option
++import PyQt5
++
++
++class PythonPopplerQt5(PyQtProject):
++ """The Project class."""
++
++ def __init__(self):
++ super().__init__()
++ self.bindings_factories = [PopplerQt5Bindings]
++
++ def update(self, tool):
++ """Allows SIP to find PyQt5 .sip files."""
++ super().update(tool)
++ self.sip_include_dirs.append(join(PyQt5.__path__[0], 'bindings'))
++
++
++class PopplerQt5Bindings(PyQtBindings):
++ """The Poppler-Qt5 Bindings class."""
++
++ def __init__(self, project):
++ super().__init__(project, name='Poppler-Qt5',
++ sip_file='poppler-qt5.sip',
++ qmake_QT=['xml'])
++
++ def get_options(self):
++ """Our custom options that a user can pass to sip-build."""
++ options = super().get_options()
++ options.append(
++ Option('poppler_version',
++ help='version of the poppler library',
++ metavar='VERSION'))
++ return options
++
++ @staticmethod
++ def run_pkg_config(option):
++ output = subprocess.check_output(
++ ['pkg-config', option, 'poppler-qt5'],
++ text=True)
++ return output.rstrip()
++
++ def apply_user_defaults(self, tool):
++ # Set include_dirs, library_dirs and libraries based on pkg-config data
++ cflags = self.run_pkg_config('--cflags-only-I').split()
++ libs = self.run_pkg_config('--libs').split()
++ self.include_dirs.extend(
++ flag[2:] for flag in cflags if flag.startswith('-I'))
++ self.library_dirs.extend(
++ flag[2:] for flag in libs if flag.startswith('-L'))
++ self.libraries.extend(
++ flag[2:] for flag in libs if flag.startswith('-l'))
++
++ # Generate version.sip file
++ if self.poppler_version is not None:
++ poppler_qt5_version = self.poppler_version
++ else:
++ poppler_qt5_version = self.run_pkg_config('--modversion')
++ poppler_qt5_version = tuple(map(int, poppler_qt5_version.split('.')))
++ python_poppler_qt5_version = self.project.version_str.split('.')
++ format_dict = {
++ 'vlen': 'i' * len(python_poppler_qt5_version),
++ 'vargs': ', '.join(python_poppler_qt5_version),
++ 'pvlen': 'i' * len(poppler_qt5_version),
++ 'pvargs': ', '.join(map(str, poppler_qt5_version)),
++ }
++ with open('version.sip.in') as template_file:
++ version_sip_template = template_file.read()
++ with open('version.sip', 'w') as version_file:
++ version_file.write(version_sip_template.format(**format_dict))
++
++ # Add Poppler version tag
++ if poppler_qt5_version:
++ with open('timeline.sip') as timeline_file:
++ timeline = timeline_file.read()
++ for match in re.finditer(r'POPPLER_V(\d+)_(\d+)_(\d+)', timeline):
++ if poppler_qt5_version < tuple(map(int, match.group(1, 2, 3))):
++ break
++ tag = match.group()
++ else:
++ tag = 'POPPLER_V0_20_0'
++ self.tags.append(tag)
++ self.tags.append("WS_X11")
++ super().apply_user_defaults(tool)
diff --git a/graphics/py-python-poppler-qt5/files/patch-pyproject.toml b/graphics/py-python-poppler-qt5/files/patch-pyproject.toml
new file mode 100644
index 000000000000..7ef45522bdba
--- /dev/null
+++ b/graphics/py-python-poppler-qt5/files/patch-pyproject.toml
@@ -0,0 +1,42 @@
+From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
+
+--- pyproject.toml.orig 2020-10-11 18:59:42 UTC
++++ pyproject.toml
+@@ -0,0 +1,37 @@
++[build-system]
++requires = ["sip >=5", "PyQt-builder", "PyQt5"]
++build-backend = "sipbuild.api"
++
++[tool.sip.metadata]
++name = "python-poppler-qt5"
++version = "0.75.0"
++summary = "A Python binding to Poppler-Qt5"
++description-file = "README.rst"
++home-page = "https://github.com/frescobaldi/python-poppler-qt5"
++maintainer = "Wilbert Berendsen"
++maintainer-email = "wbsoft@xs4all.nl"
++license = "LGPL"
++classifier = [
++ "Development Status :: 5 - Production/Stable",
++ "Intended Audience :: Developers",
++ "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
++ "Operating System :: MacOS :: MacOS X",
++ "Operating System :: Microsoft :: Windows",
++ "Operating System :: POSIX",
++ "Programming Language :: Python :: 3",
++ "Topic :: Multimedia :: Graphics :: Viewers"
++]
++requires-dist = "PyQt5"
++
++[tool.sip.project]
++sip-files-dir = "."
++sdist-excludes = [
++ "version.sip",
++ ".git/*",
++ ".git/*/*",
++ ".git/*/*/*",
++ ".git/*/*/*/*",
++ ".git/*/*/*/*/*",
++ ".git/*/*/*/*/*/*",
++ ".git/*/*/*/*/*/*/*"
++]
diff --git a/graphics/py-python-poppler-qt5/files/patch-types.sip b/graphics/py-python-poppler-qt5/files/patch-types.sip
new file mode 100644
index 000000000000..736b40fad956
--- /dev/null
+++ b/graphics/py-python-poppler-qt5/files/patch-types.sip
@@ -0,0 +1,60 @@
+From https://github.com/frescobaldi/python-poppler-qt5/pull/33/commits/6cc4d83b172ffb2d206e696ce508e508cd46b7c3
+
+--- types.sip.orig 2019-11-22 05:56:45 UTC
++++ types.sip
+@@ -182,7 +182,7 @@ template <TYPE>
+ if ((l = PyList_New(sipCpp->size())) == NULL)
+ return NULL;
+
+- const sipMappedType* qlinkedlist_type = sipFindMappedType("QLinkedList<TYPE>");
++ const sipTypeDef* qlinkedlist_type = sipFindType("QLinkedList<TYPE>");
+
+ // Set the list elements.
+ for (int i = 0; i < sipCpp->size(); ++i)
+@@ -190,7 +190,7 @@ template <TYPE>
+ QLinkedList<TYPE>* t = new QLinkedList<TYPE>(sipCpp->at(i));
+ PyObject *tobj;
+
+- if ((tobj = sipConvertFromMappedType(t, qlinkedlist_type, sipTransferObj)) == NULL)
++ if ((tobj = sipConvertFromType(t, qlinkedlist_type, sipTransferObj)) == NULL)
+ {
+ Py_DECREF(l);
+ delete t;
+@@ -203,7 +203,7 @@ template <TYPE>
+ %End
+
+ %ConvertToTypeCode
+- const sipMappedType* qlinkedlist_type = sipFindMappedType("QLinkedList<TYPE>");
++ const sipTypeDef* qlinkedlist_type = sipFindType("QLinkedList<TYPE>");
+
+ // Check the type if that is all that is required.
+ if (sipIsErr == NULL)
+@@ -212,7 +212,7 @@ template <TYPE>
+ return 0;
+
+ for (int i = 0; i < PySequence_Size(sipPy); ++i)
+- if (!sipCanConvertToMappedType(PySequence_ITEM(sipPy, i), qlinkedlist_type, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PySequence_ITEM(sipPy, i), qlinkedlist_type, SIP_NOT_NONE))
+ return 0;
+
+ return 1;
+@@ -224,16 +224,16 @@ template <TYPE>
+ for (int i = 0; i < PySequence_Size(sipPy); ++i)
+ {
+ int state;
+- QLinkedList<TYPE> * t = reinterpret_cast< QLinkedList<TYPE> * >(sipConvertToMappedType(PySequence_ITEM(sipPy, i), qlinkedlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ QLinkedList<TYPE> * t = reinterpret_cast< QLinkedList<TYPE> * >(sipConvertToType(PySequence_ITEM(sipPy, i), qlinkedlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_TYPE, state);
++ sipReleaseType(t, qlinkedlist_type, state);
+ delete ql;
+ return 0;
+ }
+ ql->append(*t);
+- sipReleaseInstance(t, sipClass_TYPE, state);
++ sipReleaseType(t, qlinkedlist_type, state);
+ }
+
+ *sipCppPtr = ql;
diff --git a/graphics/py-python-poppler-qt5/files/patch-version.sip.in b/graphics/py-python-poppler-qt5/files/patch-version.sip.in
new file mode 100644
index 000000000000..e09774be5c66
--- /dev/null
+++ b/graphics/py-python-poppler-qt5/files/patch-version.sip.in
@@ -0,0 +1,26 @@
+From https://github.com/frescobaldi/python-poppler-qt5/pull/41/commits/4ee58b6ee02772db915fdc5e70e336e0e5b2f34c
+
+--- version.sip.in.orig 2020-10-11 18:59:42 UTC
++++ version.sip.in
+@@ -0,0 +1,21 @@
++// Generated by project.py -- Do not edit
++
++PyObject *version();
++%Docstring
++The version of the popplerqt5 python module.
++%End
++
++PyObject *poppler_version();
++%Docstring
++The version of the Poppler library it was built with.
++%End
++
++%ModuleCode
++
++PyObject *version()
++{{ return Py_BuildValue("({vlen})", {vargs}); }};
++
++PyObject *poppler_version()
++{{ return Py_BuildValue("({pvlen})", {pvargs}); }};
++
++%End
diff --git a/graphics/py-python-poppler-qt5/pkg-plist b/graphics/py-python-poppler-qt5/pkg-plist
new file mode 100644
index 000000000000..8c4c89d42cfa
--- /dev/null
+++ b/graphics/py-python-poppler-qt5/pkg-plist
@@ -0,0 +1,26 @@
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-annotation.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-convert.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-document.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-embedded-file.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-info.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-font-iterator.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-form.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link-destination.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-link.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-media.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-movie-object.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-opt-content-model.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page-transition.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-page.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-qt5.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-sound-object.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/poppler-text-box.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/popplerqt5.toml
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/timeline.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/types.sip
+%%PYTHON_SITELIBDIR%%/PyQt5/bindings/popplerqt5/version.sip
+%%PYTHON_SITELIBDIR%%/popplerqt5.cpython-%%PYTHON_SUFFIX%%m.so
+%%PYTHON_SITELIBDIR%%/popplerqt5.so
+%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/INSTALLER
+%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/METADATA
+%%PYTHON_SITELIBDIR%%/python_poppler_qt5-0.75.0.dist-info/RECORD
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index 971ccb720ac6..ea9afe9ce1f7 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -12,7 +12,7 @@ RUN_DEPENDS= ${PY_ENUM34}
CONFIGURE_ARGS= --enable QtSvg
PYQT_DIST= yes
-USES= gl python pyqt:5 qt:5
+USES= gl python:3.5+ pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run gui_run widgets_run
USE_PYTHON= concurrent flavors py3kplist
diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile
index ee2321acb845..b0688de69493 100644
--- a/graphics/qgis-ltr/Makefile
+++ b/graphics/qgis-ltr/Makefile
@@ -8,6 +8,11 @@ PORTREVISION= 1
CATEGORIES= graphics geography
PKGNAMESUFFIX= -ltr
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES= 33192f38bc7d.patch:-p1 \
+ 12203f0ce527.patch:-p1 \
+ 6e9d42d70099.patch:-p1
+
MAINTAINER= rhurlin@FreeBSD.org
COMMENT= Free and Open Source Geographic Information System
@@ -86,7 +91,6 @@ RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
@@ -109,7 +113,7 @@ USE_QT= 3d buildtools_build core concurrent dbus declarative \
network printsupport qmake_build script serialport \
sql sql-pgsql sql-sqlite3 svg testlib uitools \
webengine widgets webkit xml
-USE_PYQT= core gui network qml quickwidgets qscintilla2 \
+USE_PYQT= core gui network qml quick quickwidgets qscintilla2 \
sip sql svg webkit_run webkitwidgets_run xml
CONFLICTS_INSTALL= qgis
diff --git a/graphics/qgis-ltr/distinfo b/graphics/qgis-ltr/distinfo
index c526c2679816..11b086d10b31 100644
--- a/graphics/qgis-ltr/distinfo
+++ b/graphics/qgis-ltr/distinfo
@@ -1,3 +1,9 @@
TIMESTAMP = 1606668510
SHA256 (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 2ccd292588246c2ce00739d378028f7d859b9b8bd44ef0216d9846c9854ef130
SIZE (qgis-QGIS-final-3_10_12_GH0.tar.gz) = 122038716
+SHA256 (33192f38bc7d.patch) = 97d3f882bea11c5342ddf53f6c055f9f38c5af18edb2d52c116f1dab4a49189b
+SIZE (33192f38bc7d.patch) = 12604
+SHA256 (12203f0ce527.patch) = bb30342fbf19f1a9150abd97fb1b5d6bbe3f3062bb217a7179332d0b02168235
+SIZE (12203f0ce527.patch) = 2452
+SHA256 (6e9d42d70099.patch) = 44c3ecc27c839492d9eae2d352e0ea9f37c11a419fb3f8862350b1e52cb359a6
+SIZE (6e9d42d70099.patch) = 1513
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index 82650b201952..a2538aaab8dd 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -7,6 +7,8 @@ DISTVERSION= 3_16_1
PORTREVISION= 1
CATEGORIES= graphics geography
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+
MAINTAINER= rhurlin@FreeBSD.org
COMMENT= Free and Open Source Geographic Information System
@@ -85,7 +87,6 @@ RUN_DEPENDS= astyle:devel/astyle \
${PYTHON_PKGNAMEPREFIX}pyproj>=2.1.3:graphics/py-pyproj@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyrsgis>=0.2.6:graphics/py-pyrsgis@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pytz>=2020.1:devel/py-pytz@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}qt5-quick>=5.13.1:x11-toolkits/py-qt5-quick@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}requests>=2.22.0:www/py-requests@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}scikit-image>=0.14.3:graphics/py-scikit-image@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}Shapely>=1.6.4:devel/py-shapely@${PY_FLAVOR} \
@@ -108,8 +109,9 @@ USE_QT= 3d buildtools_build core concurrent dbus declarative \
network printsupport qmake_build script serialport \
sql sql-pgsql sql-sqlite3 svg testlib uitools \
webengine widgets webkit xml
-USE_PYQT= core gui network qml quickwidgets qscintilla2 \
- sip sql svg webkit_run webkitwidgets_run xml
+USE_PYQT= core gui network qml quick quickwidgets qscintilla2 \
+ pysip sip sql svg webkit_run webkitwidgets_run xml
+
CONFLICTS_INSTALL= qgis-ltr
@@ -160,9 +162,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|"-mllvm -inline-threshold=128"|"-O1"|g' \
${WRKSRC}/src/core/CMakeLists.txt
.endif
- @${REINPLACE_CMD} -e 's|%%PYQT_SIPDIR%%|${PYQT_SIPDIR}|' \
- ${WRKSRC}/cmake/FindPyQt5.py \
- ${WRKSRC}/cmake/FindSIP.py
pre-configure:
${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python3
diff --git a/graphics/qgis/files/patch-cmake_FindPyQt5.py b/graphics/qgis/files/patch-cmake_FindPyQt5.py
deleted file mode 100644
index 265f439b546c..000000000000
--- a/graphics/qgis/files/patch-cmake_FindPyQt5.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake/FindPyQt5.py.orig 2020-08-20 07:52:34 UTC
-+++ cmake/FindPyQt5.py
-@@ -61,7 +61,7 @@ else: # Code for SIP v5
- import shutil
- cfg = {
- 'pyqt_mod_dir': os.path.dirname(PyQt5.__file__),
-- 'pyqt_sip_dir': os.path.join(get_python_lib(plat_specific=1), "PyQt5", "bindings"),
-+ 'pyqt_sip_dir': "%%PYQT_SIPDIR%%",
- 'pyqt_bin_dir': os.path.dirname(shutil.which("pyuic5")),
- }
-
diff --git a/graphics/qgis/files/patch-cmake_FindSIP.py b/graphics/qgis/files/patch-cmake_FindSIP.py
deleted file mode 100644
index 9458efe06dee..000000000000
--- a/graphics/qgis/files/patch-cmake_FindSIP.py
+++ /dev/null
@@ -1,9 +0,0 @@
---- cmake/FindSIP.py.orig 2020-08-20 07:34:51 UTC
-+++ cmake/FindSIP.py
-@@ -56,5 +56,5 @@ else: # Code for SIP v5
- print("sip_bin:%s" % shutil.which("sip5"))
-
- from distutils.sysconfig import get_python_lib
-- python_modules_dir = get_python_lib(plat_specific=1)
-+ python_modules_dir = "%%PYQT_SIPDIR%%"
- print("default_sip_dir:%s" % python_modules_dir)
diff --git a/graphics/qt5-3d/pkg-plist b/graphics/qt5-3d/pkg-plist
index ec2c0e8ec825..029e54a305c0 100644
--- a/graphics/qt5-3d/pkg-plist
+++ b/graphics/qt5-3d/pkg-plist
@@ -1185,7 +1185,6 @@
%%QT_CMAKEDIR%%/Qt53DQuickScene2D/Qt53DQuickScene2DConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfig.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRenderConfigVersion.cmake
-%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_AssimpSceneImportPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_DefaultGeometryLoaderPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
@@ -1298,8 +1297,6 @@
%%DEBUG%%%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so.debug
%%QT_PLUGINDIR%%/renderplugins/libscene2d.so
%%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug
-%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so
-%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so
%%DEBUG%%%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneexport.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libgltfsceneimport.so
diff --git a/graphics/qt5-pixeltool/files/patch-src__src.pro b/graphics/qt5-pixeltool/files/patch-src__src.pro
index 52bbe73d50c7..df23ac966765 100644
--- a/graphics/qt5-pixeltool/files/patch-src__src.pro
+++ b/graphics/qt5-pixeltool/files/patch-src__src.pro
@@ -1,9 +1,9 @@
Only enter the directories we want to build, otherwise we might fail due to
missing dependencies.
---- src/src.pro.orig 2019-02-14 20:02:42 UTC
+--- src/src.pro.orig 2020-11-20 20:03:15 UTC
+++ src/src.pro
-@@ -1,54 +1,3 @@
+@@ -1,55 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
@@ -12,10 +12,11 @@ missing dependencies.
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
-- SUBDIRS = assistant \
-- designer \
+- SUBDIRS = designer \
- pixeltool
-
+- !static|contains(QT_PLUGINS, qsqlite): SUBDIRS += assistant
+-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-29 21:47:59 +0000