<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/8a589a69cc81767c317901e5242d9eb1aee5dee0">https://github.com/macports/macports-ports/commit/8a589a69cc81767c317901e5242d9eb1aee5dee0</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 8a589a6 git-cola: Update to version 2.11
</span>8a589a6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8a589a69cc81767c317901e5242d9eb1aee5dee0
</span>Author: Rainer Müller <raimue@macports.org>
AuthorDate: Tue May 9 17:38:55 2017 +0200
<span style='display:block; white-space:pre;color:#404040;'> git-cola: Update to version 2.11
</span>---
devel/git-cola/Portfile | 7 +++----
devel/git-cola/files/patch-pyqt-version.diff | 20 +++++++-------------
2 files changed, 10 insertions(+), 17 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 56eb382..9f0abb4 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;'>@@ -3,8 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup git-cola git-cola 2.8 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup git-cola git-cola 2.11 v
</span> platforms darwin
maintainers raimue \
openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,8 +13,8 @@ description The highly caffeinated Git GUI
</span> long_description git-cola is a powerful Git GUI with a slick and \
intuitive user interface.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a1f792e675a203a260a69b77b8425dae218c4726 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 0c8267d4557d271efcc87ba7eab3b5b800d78ff85e6a34d2a35307b4d893e231
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a54a18247fe790683dcc08b18076f332b6d8e6cf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9043d9b46c2e6caf955313f580469c6e7d2657e542809ef3406a45aadbd93d24
</span>
depends_build port:py35-sphinx
depends_lib port:git \
<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><span style='display:block; white-space:pre;color:#808080;'>index 5f35b1a..27228c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git-cola/files/patch-pyqt-version.diff
</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;'>@@ -1,18 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cola/app.py.orig 2016-11-14 22:01:45.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cola/app.py 2016-11-14 22:01:48.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,13 +10,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cola/app.py.orig 2017-04-10 05:20:15.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cola/app.py 2017-05-09 17:35:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,6 +9,9 @@
</span> Copyright (C) 2009-2016 David Aguilar and contributors
"""
+# Use this specific version of Qt
+os.environ['QT_API'] = '@@pyqt@@'
<span style='display:block; white-space:pre;background:#ffe0e0;'>--# Make homebrew work by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- from distutils import sysconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- python_version = sysconfig.get_python_version()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- homebrew_mods = '/usr/local/lib/python%s/site-packages' % python_version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if os.path.isdir(homebrew_mods):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.path.append(homebrew_mods)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /usr/include/sysexits.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # #define EX_OK 0 /* successful termination */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from . import core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from qtpy import QtCore
</span></pre><pre style='margin:0'>
</pre>