<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a80d096df23794d180d3086e5fe97b514a429681">https://github.com/macports/macports-ports/commit/a80d096df23794d180d3086e5fe97b514a429681</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 a80d096 QupZilla: Update to 2.2.0
</span>a80d096 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a80d096df23794d180d3086e5fe97b514a429681
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Oct 9 04:11:21 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> QupZilla: Update to 2.2.0
</span>---
www/QupZilla/Portfile | 15 ++++++++++-----
www/QupZilla/files/patch-mac-macdeploy.sh.diff | 26 ++++++++++++++++++++++----
www/QupZilla/files/patch-src-lib-lib.pro.diff | 10 +++++-----
3 files changed, 37 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/QupZilla/Portfile b/www/QupZilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5cfc125..68c4914 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/QupZilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/QupZilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span> universal_variant no
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup QupZilla qupzilla 2.1.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup QupZilla qupzilla 2.2.0 v
</span> name QupZilla
categories www
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,8 +26,9 @@ github.tarball_from releases
</span> distname ${name}-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a68eed6975580411c1821b3a140895184cfe2fa6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d8f860d8c41bbf2bf78889aef3ffed118a34b2754f7e114ad44eb2c6103ee58a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 bb075f0bddd4c7adac6f24f671773556edeab2f2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 32cb6d4e5852781146ca5f1a1cf8e77da42a71fc096272e2030d83ea865c7818 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2465576
</span>
depends_build-append \
port:qt5-qttools
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +43,11 @@ patchfiles patch-mac-macdeploy.sh.diff \
</span>
build.args-append QUPZILLA_PREFIX=${prefix}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "echo n | ./mac/macdeploy.sh true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.cmd mac/macdeploy.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.destdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span> copy ${worksrcpath}/bin/QupZilla.app ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/QupZilla/files/patch-mac-macdeploy.sh.diff b/www/QupZilla/files/patch-mac-macdeploy.sh.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8de51f4..e58a00a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/QupZilla/files/patch-mac-macdeploy.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/QupZilla/files/patch-mac-macdeploy.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- mac/macdeploy.sh.orig 2017-02-04 03:47:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ mac/macdeploy.sh 2017-02-08 09:49:33.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,6 +67,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- mac/macdeploy.sh.orig 2017-10-08 09:05:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ mac/macdeploy.sh 2017-10-09 03:41:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,24 +35,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install_name_tool -change $LIBRARY_NAME @executable_path/$LIBRARY_NAME $plugin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# copy known, missing, Qt native library plugins into bundle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# * http://code.qt.io/cgit/qt/qttools.git/tree/src/macdeployqt/shared/shared.cpp#n1044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-mkdir -p $QTPLUGINS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FILE="$QTDIR/plugins/iconengines/libqsvgicon.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if [ -f "$FILE" ]; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp $FILE $QTPLUGINS/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo "$FILE: No such file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span> # run macdeployqt
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $MACDEPLOYQT QupZilla.app
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $MACDEPLOYQT QupZilla.app -qmldir=$PWD/../src/lib/data/data
</span>
-# create final dmg image
-cd ../mac
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/QupZilla/files/patch-src-lib-lib.pro.diff b/www/QupZilla/files/patch-src-lib-lib.pro.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f32c287..bdf81e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/QupZilla/files/patch-src-lib-lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/QupZilla/files/patch-src-lib-lib.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/lib.pro.orig 2017-02-04 03:47:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/lib.pro 2017-02-08 09:49:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -482,11 +482,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/lib.pro.orig 2017-10-08 09:05:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/lib.pro 2017-10-09 03:29:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -487,11 +487,6 @@
</span> }
mac {
- # homebrew openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- BREW_OPENSSL = $$system("brew --prefix openssl")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- BREW_OPENSSL = /usr/local$$system("readlink `brew --prefix openssl` | sed 's/..//'")
</span> - INCLUDEPATH += $$BREW_OPENSSL/include
- LIBS += -L$$BREW_OPENSSL/lib
-
LIBS += -lcrypto -framework CoreServices
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ OBJECTIVE_SOURCES += tools/disablewindowtabbbing.mm
</span></pre><pre style='margin:0'>
</pre>