Instead of using the bundled qtpy use the version in ports. No issues
found on amd64.
While here take MAINTAINER.
ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/git-cola/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile 8 Sep 2018 03:55:10 -0000 1.24
+++ Makefile 15 Sep 2018 15:13:46 -0000
@@ -4,6 +4,7 @@ COMMENT = python powered git gui
MODPY_EGG_VERSION= 3.2
DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
+REVISION = 0
GH_ACCOUNT = git-cola
GH_PROJECT = git-cola
@@ -13,6 +14,8 @@ CATEGORIES = devel x11
HOMEPAGE = https://git-cola.github.io/
+MAINTAINER = Bjorn Ketelaars <[email protected]>
+
# GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
@@ -21,17 +24,21 @@ MODULES = lang/python
BUILD_DEPENDS = devel/gettext-tools \
devel/git \
textproc/xxdiff \
- x11/py-qt4
+ x11/py-qt4 \
+ x11/py-qtpy
RUN_DEPENDS = devel/desktop-file-utils \
devel/git \
textproc/xxdiff \
- x11/py-qt4
+ x11/py-qt4 \
+ x11/py-qtpy
TEST_DEPENDS = devel/py-mock \
devel/py-test
USE_GMAKE = Yes
+
+MAKE_ENV = GIT_COLA_NO_VENDOR_LIBS=1
MODPY_ADJ_FILES= share/git-cola/bin/git-xbase
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/git-cola/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 8 Sep 2018 03:55:10 -0000 1.13
+++ pkg/PLIST 15 Sep 2018 15:13:46 -0000
@@ -297,50 +297,6 @@ share/git-cola/lib/cola/widgets/toolbar.
share/git-cola/lib/cola/widgets/toolbar.pyc
share/git-cola/lib/cola/widgets/toolbarcmds.py
share/git-cola/lib/cola/widgets/toolbarcmds.pyc
-share/git-cola/lib/qtpy/
-share/git-cola/lib/qtpy/QtCore.py
-share/git-cola/lib/qtpy/QtCore.pyc
-share/git-cola/lib/qtpy/QtDesigner.py
-share/git-cola/lib/qtpy/QtDesigner.pyc
-share/git-cola/lib/qtpy/QtGui.py
-share/git-cola/lib/qtpy/QtGui.pyc
-share/git-cola/lib/qtpy/QtHelp.py
-share/git-cola/lib/qtpy/QtHelp.pyc
-share/git-cola/lib/qtpy/QtMultimedia.py
-share/git-cola/lib/qtpy/QtMultimedia.pyc
-share/git-cola/lib/qtpy/QtNetwork.py
-share/git-cola/lib/qtpy/QtNetwork.pyc
-share/git-cola/lib/qtpy/QtOpenGL.py
-share/git-cola/lib/qtpy/QtOpenGL.pyc
-share/git-cola/lib/qtpy/QtPrintSupport.py
-share/git-cola/lib/qtpy/QtPrintSupport.pyc
-share/git-cola/lib/qtpy/QtSql.py
-share/git-cola/lib/qtpy/QtSql.pyc
-share/git-cola/lib/qtpy/QtSvg.py
-share/git-cola/lib/qtpy/QtSvg.pyc
-share/git-cola/lib/qtpy/QtTest.py
-share/git-cola/lib/qtpy/QtTest.pyc
-share/git-cola/lib/qtpy/QtWebEngineWidgets.py
-share/git-cola/lib/qtpy/QtWebEngineWidgets.pyc
-share/git-cola/lib/qtpy/QtWidgets.py
-share/git-cola/lib/qtpy/QtWidgets.pyc
-share/git-cola/lib/qtpy/__init__.py
-share/git-cola/lib/qtpy/__init__.pyc
-share/git-cola/lib/qtpy/_patch/
-share/git-cola/lib/qtpy/_patch/__init__.py
-share/git-cola/lib/qtpy/_patch/__init__.pyc
-share/git-cola/lib/qtpy/_patch/qcombobox.py
-share/git-cola/lib/qtpy/_patch/qcombobox.pyc
-share/git-cola/lib/qtpy/_patch/qheaderview.py
-share/git-cola/lib/qtpy/_patch/qheaderview.pyc
-share/git-cola/lib/qtpy/_version.py
-share/git-cola/lib/qtpy/_version.pyc
-share/git-cola/lib/qtpy/compat.py
-share/git-cola/lib/qtpy/compat.pyc
-share/git-cola/lib/qtpy/py3compat.py
-share/git-cola/lib/qtpy/py3compat.pyc
-share/git-cola/lib/qtpy/uic.py
-share/git-cola/lib/qtpy/uic.pyc
share/locale/cs/LC_MESSAGES/git-cola.mo
share/locale/de/LC_MESSAGES/git-cola.mo
share/locale/es/LC_MESSAGES/git-cola.mo
