<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/61144e4c19a733de536baa221d0474d1b4446d49">https://github.com/macports/macports-ports/commit/61144e4c19a733de536baa221d0474d1b4446d49</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 61144e4c19a zettlr: update to 1.7.0
</span>61144e4c19a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 61144e4c19a733de536baa221d0474d1b4446d49
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Fri Jul 3 06:45:57 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> zettlr: update to 1.7.0
</span>---
aqua/zettlr/Portfile | 20 +++++------
aqua/zettlr/files/patch-make.sh.diff | 60 -------------------------------
aqua/zettlr/files/patch-package.json.diff | 11 ------
3 files changed, 8 insertions(+), 83 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/zettlr/Portfile b/aqua/zettlr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f488df2695..8e79450a3f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/zettlr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/zettlr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup Zettlr Zettlr 1.6.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Zettlr Zettlr 1.7.0 v
</span> name zettlr
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,36 +32,32 @@ maintainers {gmail.com:herby.gillot @herbygillot} \
</span> openmaintainer
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 d9a8ee7f46caa6d90e45e3f9f792d05bbb4cec43 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2a3322e490d3b13e36b6b4db599816161ca9b32e81407bbb0cc36a8b657ab093 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 31024746
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 52f17677702b834a1fc4fd71fc46d0fb10156126 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 34fb05612994d5778075cde8b046b08fea7adb14174b4d2e702a3fa49742bca0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 28025781
</span>
set ab_bin_commit b85740334fec875f5dd8dcd22eb1f729599109db
depends_build port:go \
port:yarn
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append CSC_IDENTITY_AUTO_DISCOVERY=false
</span> use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-make.sh.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-package.json.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> build {
set gopath ${workpath}/go
# Fetch and build JS dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "yarn"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${build.env} yarn install --frozen-lockfile"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/source "${build.env} yarn install --frozen-lockfile"
</span>
# Build app-builder-bin locally using Go from ports and insert it into node_modules
system "GOPATH=${gopath} GO111MODULE=on go get -v github.com/develar/app-builder@${ab_bin_commit}"
file delete ${worksrcpath}/node_modules/app-builder-bin/mac/app-builder
file link ${worksrcpath}/node_modules/app-builder-bin/mac/app-builder ${gopath}/bin/app-builder
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build project source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "scripts/make.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Build electron app
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "CSC_IDENTITY_AUTO_DISCOVERY=false yarn release:mac"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${build.env} yarn run release:mac --dir"
</span> }
destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/zettlr/files/patch-make.sh.diff b/aqua/zettlr/files/patch-make.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8f95958fd1a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/zettlr/files/patch-make.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,60 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/make.sh 2020-06-07 15:45:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/make.sh 2020-06-07 15:41:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Package version is: $pkgver"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--read -p "Press enter to continue (Ctrl+C to abort)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# read -p "Press enter to continue (Ctrl+C to abort)"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,34 +58,34 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yarn lang:refresh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build NSIS EXE installer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--yarn release:win
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# yarn release:win
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build DMG installer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--yarn release:mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# yarn release:mac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build .deb + .rpm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--yarn release:linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# yarn release:linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build an AppImage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--yarn release:app-image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# yarn release:app-image
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Switch working directory to the release folder.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cd ./release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# cd ./release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Generate the checksums
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Generating SHA 256 checksums for all installers ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shasum -a 256 "Zettlr-$pkgver.exe" > "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shasum -a 256 "Zettlr-$pkgver.dmg" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shasum -a 256 "Zettlr-$pkgver-amd64.deb" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shasum -a 256 "Zettlr-$pkgver-x86_64.rpm" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shasum -a 256 "Zettlr-$pkgver-i386.AppImage" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shasum -a 256 "Zettlr-$pkgver-x86_64.AppImage" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# echo "Generating SHA 256 checksums for all installers ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# shasum -a 256 "Zettlr-$pkgver.exe" > "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# shasum -a 256 "Zettlr-$pkgver.dmg" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# shasum -a 256 "Zettlr-$pkgver-amd64.deb" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# shasum -a 256 "Zettlr-$pkgver-x86_64.rpm" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# shasum -a 256 "Zettlr-$pkgver-i386.AppImage" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# shasum -a 256 "Zettlr-$pkgver-x86_64.AppImage" >> "SHA256SUMS.txt"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Test the checksums
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo "Testing the checksums ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--shasum -a 256 -c SHA256SUMS.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# echo "Testing the checksums ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# shasum -a 256 -c SHA256SUMS.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Done."
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/zettlr/files/patch-package.json.diff b/aqua/zettlr/files/patch-package.json.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 356c6667020..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/zettlr/files/patch-package.json.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- package.json 2020-06-07 15:44:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ package.json 2020-06-07 15:43:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "start": "electron .",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "build:quick": "node scripts/build-app.js --dir",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "release:this": "node scripts/build-app.js",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "release:mac": "node scripts/build-app.js --mac",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "release:mac": "node scripts/build-app.js --mac --dir",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "release:win": "node scripts/build-app.js --win",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "release:linux": "node scripts/build-app.js --linux",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "release:app-image": "node scripts/build-app.js --app-image",
</span></pre><pre style='margin:0'>
</pre>