<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/58efcf61cdf91f064ed8221b58264873cd199c15">https://github.com/macports/macports-ports/commit/58efcf61cdf91f064ed8221b58264873cd199c15</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 58efcf61cdf zettlr: update to 3.2.0
</span>58efcf61cdf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58efcf61cdf91f064ed8221b58264873cd199c15
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Thu Aug 29 00:01:25 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> zettlr: update to 3.2.0
</span>---
editors/zettlr/Portfile | 25 ++++++++++------------
.../patch-disable-signing-forge.config.js.diff | 19 ++++++++++++++++
2 files changed, 30 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/zettlr/Portfile b/editors/zettlr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ec27f0f2721..8f2515e07e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/zettlr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/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 2.3.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup Zettlr Zettlr 3.2.0 v
</span> github.tarball_from archive
name zettlr
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,11 +30,13 @@ maintainers {gmail.com:herby.gillot @herbygillot} \
</span> openmaintainer
supported_archs x86_64 arm64
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3e02ad655b229515a4b28d911c79aa956d6e748e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5b9bea09d48f74f0fa8e232cee4b9022d7b9b23d16c23e1acfa7093f6f6971eb \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 28392827
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:yarn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-disable-signing-forge.config.js.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bin:git:git \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:yarn
</span>
build.env-append CSC_IDENTITY_AUTO_DISCOVERY=false
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +44,7 @@ use_configure no
</span> use_xcode yes
build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- switch $build_arch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${build_arch} {
</span> x86_64 {
set package_target {mac-x64}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,13 +54,7 @@ build {
</span> }
# Fetch and build JS dependencies
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${build.env} yarn install --frozen-lockfile"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We allow Zettlr to download its own Pandoc bin, as:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a) It seeks a more recent version than the one MacPorts provides
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # b) It will be embedded into the .app bundle and not affect the ports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # tree.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${build.env} ./scripts/get-pandoc.sh darwin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "${build.env} yarn install --immutable"
</span>
# Build electron app
system -W ${worksrcpath} "${build.env} yarn package:${package_target}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +70,8 @@ destroot {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/out/Zettlr-darwin-${outdir_suffix}/Zettlr.app \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/out/Zettlr-darwin-${outdir_suffix}/Zettlr.app \
</span> ${destroot}${applications_dir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/zettlr/files/patch-disable-signing-forge.config.js.diff b/editors/zettlr/files/patch-disable-signing-forge.config.js.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..514dbb0dba7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/zettlr/files/patch-disable-signing-forge.config.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- forge.config.js 2024-08-28 23:44:48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ forge.config.js 2024-08-28 23:45:12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,16 +177,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // with capital Z) we have to explicitly set executableName on the Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // target.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name: 'Zettlr',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // The certificate is written to the default keychain during CI build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // See ./scripts/add-osx-cert.sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- osxSign: {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- identity: 'Developer ID Application: Hendrik Erz (QS52BN8W68)',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'hardened-runtime': true,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'gatekeeper-assess': false,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- entitlements: 'scripts/assets/entitlements.plist',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'entitlements-inherit': 'scripts/assets/entitlements.plist',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 'signature-flags': 'library'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- },
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Since electron-notarize 1.1.0 it will throw instead of simply print a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // warning to the console, so we have to actively check if we should
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // notarize or not. We do so by checking for the necessary environment
</span></pre><pre style='margin:0'>
</pre>