Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

zettlr: update to 3.2.0 #25516

Merged
merged 1 commit into from
Aug 29, 2024
Merged

zettlr: update to 3.2.0 #25516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions editors/zettlr/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in editors/zettlr/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port test zettlr:
Warning: zettlr is configured to build for the architecture(s) 'arm64', but installed Mach-O files built for the following archs:
Warning: arm64,x86_64:
Warning:   /Applications/MacPorts/Zettlr.app/Contents/Resources/app.asar.unpacked/.webpack/main/native_modules/fsevents.node
Warning:

Check warning on line 1 in editors/zettlr/Portfile

View workflow job for this annotation

GitHub Actions / macos-12 

port test zettlr:
Warning: zettlr is configured to build for the architecture(s) 'x86_64', but installed Mach-O files built for the following archs:
Warning: arm64,x86_64:
Warning:   /Applications/MacPorts/Zettlr.app/Contents/Resources/app.asar.unpacked/.webpack/main/native_modules/fsevents.node
Warning:

Check warning on line 1 in editors/zettlr/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port test zettlr:
Warning: zettlr is configured to build for the architecture(s) 'x86_64', but installed Mach-O files built for the following archs:
Warning: arm64,x86_64:
Warning:   /Applications/MacPorts/Zettlr.app/Contents/Resources/app.asar.unpacked/.webpack/main/native_modules/fsevents.node
Warning:

PortSystem 1.0
PortGroup github 1.0

github.setup Zettlr Zettlr 2.3.0 v
github.setup Zettlr Zettlr 3.2.0 v
github.tarball_from archive
name zettlr
revision 0
Expand All @@ -30,19 +30,21 @@
openmaintainer
supported_archs x86_64 arm64

checksums rmd160 3e02ad655b229515a4b28d911c79aa956d6e748e \
sha256 5b9bea09d48f74f0fa8e232cee4b9022d7b9b23d16c23e1acfa7093f6f6971eb \
size 28392827
fetch.type git

depends_build port:yarn
patchfiles-append patch-disable-signing-forge.config.js.diff

depends_build-append \
bin:git:git \
port:yarn

build.env-append CSC_IDENTITY_AUTO_DISCOVERY=false

use_configure no
use_xcode yes

build {
switch $build_arch {
switch ${build_arch} {
x86_64 {
set package_target {mac-x64}
}
Expand All @@ -52,13 +54,7 @@
}

# Fetch and build JS dependencies
system -W ${worksrcpath} "${build.env} yarn install --frozen-lockfile"

# We allow Zettlr to download its own Pandoc bin, as:
# a) It seeks a more recent version than the one MacPorts provides
# b) It will be embedded into the .app bundle and not affect the ports
# tree.
system -W ${worksrcpath} "${build.env} ./scripts/get-pandoc.sh darwin"
system -W ${worksrcpath} "${build.env} yarn install --immutable"

# Build electron app
system -W ${worksrcpath} "${build.env} yarn package:${package_target}"
Expand All @@ -74,7 +70,8 @@
}
}

copy ${worksrcpath}/out/Zettlr-darwin-${outdir_suffix}/Zettlr.app \
copy \
${worksrcpath}/out/Zettlr-darwin-${outdir_suffix}/Zettlr.app \
${destroot}${applications_dir}
}

Expand Down
19 changes: 19 additions & 0 deletions editors/zettlr/files/patch-disable-signing-forge.config.js.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- forge.config.js 2024-08-28 23:44:48
+++ forge.config.js 2024-08-28 23:45:12
@@ -177,16 +177,6 @@
// with capital Z) we have to explicitly set executableName on the Linux
// target.
name: 'Zettlr',
- // The certificate is written to the default keychain during CI build.
- // See ./scripts/add-osx-cert.sh
- osxSign: {
- identity: 'Developer ID Application: Hendrik Erz (QS52BN8W68)',
- 'hardened-runtime': true,
- 'gatekeeper-assess': false,
- entitlements: 'scripts/assets/entitlements.plist',
- 'entitlements-inherit': 'scripts/assets/entitlements.plist',
- 'signature-flags': 'library'
- },
// Since electron-notarize 1.1.0 it will throw instead of simply print a
// warning to the console, so we have to actively check if we should
// notarize or not. We do so by checking for the necessary environment