Merge 2.22.2-beta.3 into trunk
#3248
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also updates the call to comply with the new API.
Co-authored-by: Kat Hagan <[email protected]> Co-authored-by: Olivier Halligon <[email protected]>
Co-authored-by: Gio Lodi <[email protected]>
* Don't pass a variable to require, it makes webpack mad * remove get-config.js because only webpack can use fs * update electron-updater due to security vulnerability * keep target set as default * add release notes assuming this is going to constitute a new 2.22.1 version
Otherwise, `package.json` would have been considered the source of the configurations.
See docs at https://www.electron.build/configuration/mac#:~:text=mergeASARs%20%3D%20true,for%20%E2%80%9Cuniversal%E2%80%9D%20arch. and discussion at electron-userland/electron-builder#6735 Apparently, the option needs to be disabled at this time when building for universal Mac.
This reverts commit 987d565.
This is an attempt to fix the issue reported by users who cannot install Simplenote on various Linux systems because the `gconf2` dependency cannot be satisfied. See #3241 The [`electron-builder` docs](https://www.electron.build/configuration/linux.html) mention that `gconf2` can give issues if one wants to support [KDE](https://kde.org/). > If need to support KDE, `gconf2` and `gconf-service` should be removed > as it’s no longer used > [by GNOME](https://packages.debian.org/bullseye/gconf2). Moreover, [the `gconf2` entry in the Debian packages repository](https://packages.debian.org/bullseye/gconf2) states: > This package is for legacy applications and no longer used by GNOME. Given the above, this PR is an attempt to see what the app would do without the dependency. My guess is that everything should run fine in most modern systems, because all information points to `gconf2` not being in use there.
roundhill
approved these changes
Aug 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Routine PR to ensure
trunk's version reflects the latest available (beta) version.All changes have already gone through code review, see #3239. Also notice that the change for beta 3, #3048, was accidentally merged into
trunkinstead ofrelease/2.22.2, which is why it's not in the diff.Finally, ignore the commits list, it appears like that because we use "Squash and merge".