<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e215228a4a18d51ae099e63ad1b416757af64150">https://github.com/macports/macports-ports/commit/e215228a4a18d51ae099e63ad1b416757af64150</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e215228 git-cola: switch to pyqt4 by default, add +qt5
</span>e215228 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e215228a4a18d51ae099e63ad1b416757af64150
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Mon Nov 14 22:13:27 2016 +0100
<span style='display:block; white-space:pre;color:#404040;'> git-cola: switch to pyqt4 by default, add +qt5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Running git-cola with Qt5 exposes some artifacts, which was at least
</span><span style='display:block; white-space:pre;color:#404040;'> verified for 10.12 Sierra and 10.11 El Capitan. Switch to Qt4 as default
</span><span style='display:block; white-space:pre;color:#404040;'> instead. The Qt5 version can still be enabled with the +qt5 variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> In the same patch selecting a fixed pyqt version, remove a custom
</span><span style='display:block; white-space:pre;color:#404040;'> addition to sys.path specific to Homebrew which is likely to mess up
</span><span style='display:block; white-space:pre;color:#404040;'> running git-cola when it is installed in /usr/local.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52868
</span>---
devel/git-cola/Portfile | 26 +++++++++++++++++++++++---
devel/git-cola/files/patch-pyqt-version.diff | 18 ++++++++++++++++++
2 files changed, 41 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-cola/Portfile b/devel/git-cola/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1bc3b5..010ad81 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-cola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-cola/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup git-cola git-cola 2.8 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
maintainers raimue \
openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,12 +20,32 @@ checksums rmd160 a1f792e675a203a260a69b77b8425dae218c4726 \
</span>
depends_build port:py35-sphinx
depends_lib port:python35 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py35-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py35-pyqt4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py35-qtpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-pyqt-version.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyqt "pyqt4"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyqt "pyqt5"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -W ${worksrcpath} -E "s/@@pyqt@@/${pyqt}/" cola/app.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
use_configure no
build.args prefix=${prefix} \
PYTHON=${prefix}/bin/python3.5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SPHINXBUILD=${prefix}/bin/sphinx-build-3.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SPHINXBUILD=${prefix}/bin/sphinx-build-3.5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NO_VENDOR_LIBS=1
</span>
destroot.args ${build.args}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 description (Use qt5 instead of qt4} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This variant is meant to match py35-qtpy +qt5, which also depends on
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # py35-qtpy5. However, all variants of py35-qtpy support all Qt versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Always add the dependency in this port to ensure the selected Qt version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # is available.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace port:py35-pyqt4 port:py35-pyqt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git-cola/files/patch-pyqt-version.diff b/devel/git-cola/files/patch-pyqt-version.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5f35b1a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git-cola/files/patch-pyqt-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cola/app.py.orig 2016-11-14 22:01:45.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cola/app.py 2016-11-14 22:01:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,13 +10,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Copyright (C) 2009-2016 David Aguilar and contributors
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ """
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Use this specific version of Qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++os.environ['QT_API'] = '@@pyqt@@'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Make homebrew work by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- from distutils import sysconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- python_version = sysconfig.get_python_version()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- homebrew_mods = '/usr/local/lib/python%s/site-packages' % python_version
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if os.path.isdir(homebrew_mods):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sys.path.append(homebrew_mods)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /usr/include/sysexits.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # #define EX_OK 0 /* successful termination */
</span></pre><pre style='margin:0'>
</pre>