Commit graph

24 commits

Author SHA1 Message Date
Mynacol
b5ea455c1f
Fix release build on x86 mac (#5926)
Some checks are pending
CI / Test (shard 1) (push) Waiting to run
CI / Test (shard 2) (push) Waiting to run
CI / Test (shard 3) (push) Waiting to run
CI / Test (shard 4) (push) Waiting to run
CI / Utilities Tests (push) Waiting to run
CI / Build, Upload (push) Waiting to run
While trying to [fix](https://github.com/NixOS/nixpkgs/pull/519431) another issue in the Zotero package for nixpkgs, I discovered a new bug. When setting a non-`source` update channel, the build fails on MacOS with x86 architectures.

The build fails with:
```
source not found twice in ChannelPrefs

source

stringWithCString:encoding:
```
Which definitely means it is caused by the `strings` command [here](https://github.com/zotero/zotero/blob/main/app/mac/set-channel-prefs-channel#L29).

When manually executing the strings command on the file, I can repeat getting only one `source` result on x86 mac, while getting two on arm64 or linux. After digging around, I tried with the flag `-arch all`, and both `source` values are found on x86 mac. Full command: `strings -n 3 -arch all $binary`.
2026-07-31 13:41:33 -04:00
Dan Stillman
91d7e73d26 Strip com.apple.FinderInfo xattrs from files in Mac disk images
Some checks are pending
CI / Test (shard 1) (push) Waiting to run
CI / Test (shard 2) (push) Waiting to run
CI / Test (shard 3) (push) Waiting to run
CI / Test (shard 4) (push) Waiting to run
CI / Utilities Tests (push) Waiting to run
CI / Build, Upload (push) Waiting to run
hdiutil makehybrid gives every file on the image non-empty Finder info
(it sets an icon location), which appears as a com.apple.FinderInfo
extended attribute. codesign --verify --strict rejects FinderInfo as
detritus, and it can cause Safari to fail to load the web extension.
(Reported by a user with Safari 17.6 on macOS 12. No other reports from
the beta, so maybe not universal.) The Safari App Extension apparently
wasn't affected, since it shipped with the same attributes for years.

Convert the hybrid image to a read-write image, mount it, strip the
attributes from its files, and compress from that. The volume header is
untouched, so the open-folder flag that makes Finder open the volume
window on mount is preserved.

Only fresh installs from the DMG were affected. The updater writes fresh
files without the attributes, so copies updated in place were clean.
(Notably, this is the reverse of the post-update extension breakage for
which the standard advice has always been to delete Zotero.app and
redownload. Following that advice is exactly what resulted in a broken
copy here.)

https://forums.zotero.org/discussion/132925/
2026-07-27 15:31:18 -04:00
Dan Stillman
e3ab296a72 Updated Liquid Glass icon that fixes glitch in dark/tinted/clear modes 2025-09-13 02:29:17 -04:00
Dan Stillman
c67e35c5ae Add Liquid Glass icon for macOS Tahoe
And preserve icon for previous macOS versions using
https://github.com/vslavik/TahoeIconsTests
2025-09-11 04:42:01 -04:00
Dan Stillman
e1a595d78d Update macOS SDK for fx140 build in mozconfig 2025-07-30 22:30:51 -04:00
Dan Stillman
f6f920350d Update Mac updater to 140.0esr
This allows updates from Firefox builds past 115.23esr/128.10esr/138.0,
which change the command line arguments passed to the updater.

https://bugzilla.mozilla.org/show_bug.cgi?id=1923376
2025-07-30 22:30:32 -04:00
Dan Stillman
cbefe513c2 Update Mac build to 140.0esr 2025-07-30 22:30:32 -04:00
Dan Stillman
c634273fe1 Update build scripts with new default Firefox source folder
After the git transition
2025-07-30 22:30:32 -04:00
Dan Stillman
0152769201 Handle dev channel properly in set-channel-prefs-channel 2024-12-14 01:16:04 -05:00
Dan Stillman
f341341012 Use custom ChannelPrefs.framework to set Mac update channel
Mac Firefox builds now specify the update channel via a custom macOS
framework:

https://bugzilla.mozilla.org/show_bug.cgi?id=1799332

We set the update channel in the build script, so bundle a custom
ChannelPrefs framework set to "source" and then patch the binary as
necessary for non-source channels. What could go wrong?
2024-12-14 01:16:01 -05:00
Dan Stillman
5c4a0c3b30 Disable copying of XUL for Mac builds 2024-12-14 01:16:01 -05:00
Dan Stillman
3fde2a3e43 Update Mac build to 128.5.0esr 2024-12-14 01:16:00 -05:00
Dan Stillman
b18b15fc08 Update Mozilla patch and mozconfig for fx128 on macOS 2024-12-14 01:16:00 -05:00
Sean Takats
a3b1558f00
Updated icon file with corrected shade of white (#4135) 2024-05-17 05:49:28 -04:00
Dan Stillman
dfaa0ce129
Use custom XUL binary on macOS (#4010)
Backports the following Mozilla fixes:

https://bugzilla.mozilla.org/show_bug.cgi?id=1858409
(AutoFill/Services menus; fixes #3927)

https://bugzilla.mozilla.org/show_bug.cgi?id=1884631
(sheets → dialogs; fixes #3936)

https://bugzilla.mozilla.org/show_bug.cgi?id=148624
(ghost tooltips, because why not)
2024-04-19 07:04:42 -04:00
Dan Stillman
95f6d2aa72 Update builds to Firefox 115.9.1esr
This fixes the Mac launcher, which had been ARM-only. (This launcher is
built from 115.9.0esr, because 115.9.1esr, a recent security fix,
doesn't seem to have a public tag yet.)

The Windows build seems to work without updating the launcher from
115.4.0esr.
2024-03-31 05:25:03 -04:00
Dan Stillman
f86d1e1d07 Update Firefox patch and mozconfig for Firefox 115 2024-03-31 05:22:11 -04:00
Dan Stillman
1cd01e8dc0 fx115: Update macOS build to 115.4.0esr 2024-03-30 00:58:53 -04:00
Dan Stillman
1d8baa635a New app icons 2024-01-24 23:32:22 -05:00
Dan Stillman
f803c0cc4e Update Mac build to 102.15.1esr 2023-09-29 18:20:46 -04:00
Dan Stillman
6261640a92 Update Mac updater for Zotero 7
We were previously using an old version of the Mozilla updater before they
added Mozilla signature verification, but it's Intel-only, so we need to build
our own version of the current updater with signature verification disabled.
2023-05-17 04:35:40 -04:00
Dan Stillman
725e5ac0f0 Mac: Update to Firefox 102.10.0 and don't create default-esr profile 2023-05-09 01:30:34 -04:00
Dan Stillman
c326a6c971 Fix more files for combined repos 2023-04-29 07:50:54 -04:00
Dan Stillman
a3d7b58b83 Add zotero-standalone-build repo as app folder
Minus obsolete 4.0 files
2023-04-26 04:40:22 -04:00