<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7cabf2f17688af72097dfd7f041b3b51534fa1b0">https://github.com/macports/macports-ports/commit/7cabf2f17688af72097dfd7f041b3b51534fa1b0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7cabf2f17688af72097dfd7f041b3b51534fa1b0
</span>Author: Aaron Madlon-Kay <amake@macports.org>
AuthorDate: Sat Jan 30 21:11:53 2021 +0900

<span style='display:block; white-space:pre;color:#404040;'>    qutebrowser: improve import patch
</span>---
 www/qutebrowser/Portfile                              |  2 +-
 .../0001-Fix-import-for-PyQt-v5.11-and-newer.patch    | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/qutebrowser/Portfile b/www/qutebrowser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec03f8d145a..b6116990535 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/qutebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/qutebrowser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup           python 1.0
</span> PortGroup           github 1.0
 
 github.setup        qutebrowser qutebrowser 2.0.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> description         A keyboard-driven, vim-like browser based on PyQt5
 long_description    ${description}
 platforms           darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/qutebrowser/files/0001-Fix-import-for-PyQt-v5.11-and-newer.patch b/www/qutebrowser/files/0001-Fix-import-for-PyQt-v5.11-and-newer.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d0a0fa5d09..1b913e63fd1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/qutebrowser/files/0001-Fix-import-for-PyQt-v5.11-and-newer.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/qutebrowser/files/0001-Fix-import-for-PyQt-v5.11-and-newer.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 00a731e58c6f40098da2dc1d5f7294a2df7edd5e Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Aaron Madlon-Kay <aaron@wovn.io>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Fri, 29 Jan 2021 21:41:11 +0900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 837c855fad2276341af8eb88200ba65732b71ff6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Aaron Madlon-Kay <aaron@madlon-kay.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 29 Jan 2021 21:49:09 +0900
</span> Subject: [PATCH] Fix import for PyQt v5.11 and newer
 
 https://www.riverbankcomputing.com/static/Docs/PyQt5/incompatibilities.html#pyqt-v5-11
 ---
<span style='display:block; white-space:pre;background:#ffe0e0;'>- qutebrowser/qt.py | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qutebrowser/qt.py | 5 ++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+), 1 deletion(-)
</span> 
 diff --git a/qutebrowser/qt.py b/qutebrowser/qt.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 9f665be49..ab9244c33 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9f665be49..6c4e24bf4 100644
</span> --- a/qutebrowser/qt.py
 +++ b/qutebrowser/qt.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,4 +20,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,4 +20,7 @@
</span>  """Wrappers around Qt/PyQt code."""
  
  # pylint: disable=unused-import
 -from PyQt5 import sip
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+import sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    from PyQt5 import sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    import sip
</span> -- 
 2.30.0
 
</pre><pre style='margin:0'>

</pre>