Skip to content

Fix compilation on macOS#6598

Merged
droidmonkey merged 1 commit intodevelopfrom
hotfix/macos-appkit-compilation
Jun 8, 2021
Merged

Fix compilation on macOS#6598
droidmonkey merged 1 commit intodevelopfrom
hotfix/macos-appkit-compilation

Conversation

@phoerious
Copy link
Copy Markdown
Member

@phoerious phoerious commented Jun 8, 2021

Even though #6575 apparently passed the CI, it broke compilation on my Mac machines, because NSApp wasn't declared.

Type of change

  • ✅ Bug fix (non-breaking change that fixes an issue)

@phoerious phoerious added this to the v2.7.0 milestone Jun 8, 2021
@phoerious phoerious requested a review from droidmonkey June 8, 2021 08:26
@phoerious phoerious force-pushed the hotfix/macos-appkit-compilation branch from 70bf90f to 4915d5f Compare June 8, 2021 09:06
@michaelk83
Copy link
Copy Markdown

michaelk83 commented Jun 8, 2021 •
edited
Loading

#6575 was 2.6.5, so this should be too.
edit: or is it released already?

@droidmonkey
Copy link
Copy Markdown
Member

droidmonkey commented Jun 8, 2021 •
edited
Loading

I disagree, there must be something off with your build env. These are the most basic AppKit calls of the api and the docs make no mention of depreciation or incompatibility.

@phoerious
Copy link
Copy Markdown
Member Author

phoerious commented Jun 8, 2021 •
edited
Loading

I had this on two independently maintained installations of macOS.

#6575 was 2.6.5, so this should be too.

2.6.5 is done. No more changes for that release.

@phoerious
Copy link
Copy Markdown
Member Author

phoerious commented Jun 8, 2021 •
edited
Loading

NSApp is defined in AppKit/NSApplication.h, which isn't directly included here. It is a transitive include of AppKit/AppKit.h (not to be confused with AppKit.h, which is our own header), but that one isn't included either. I browsed through the previous includes and the only one that seems to include AppKit/NSApplication.h is AppKit/NSWindow.h, but then I also tried adding AppKit/NSApplication.h directly and that alone didn't fix it. Including Cocoa/Cocoa.h does the job and gets rid of all the other specific includes as well.

@michaelk83
Copy link
Copy Markdown

michaelk83 commented Jun 8, 2021

2.6.5 is done. No more changes for that release.

Yeah, I didn't see it until after I posted here. This doesn't affect users directly, so as long as the release compiled ok, that's fine.
(I can see at least the x64 dmg's on the release page, so I guess it compiled.)

@droidmonkey droidmonkey modified the milestones: v2.7.0, v2.6.6 Jun 8, 2021
@droidmonkey droidmonkey merged commit 25a34a6 into develop Jun 8, 2021
@droidmonkey droidmonkey deleted the hotfix/macos-appkit-compilation branch June 8, 2021 22:56
droidmonkey added a commit that referenced this pull request Jun 12, 2021
@droidmonkey
Release 2.6.6
9c108b9 
Fixed

- Fix focusing search when pressing hotkey [#6603]
- Trim whitespace from TOTP key input prior to processing [#6604]
- Fix building on macOS [#6598]
- Resolve compiler warnings for unused return values [#6607]
aswild added a commit to aswild/keepassxc that referenced this pull request Jun 15, 2021
@aswild
Merge tag '2.6.6' into unlock-dialog-2.6
a9b70e0 
Release 2.6.5

Added

- Show search bar when toolbar is hidden or in overflow [keepassxreboot#6279]
- Show countdown for clipboard clearing in status bar [keepassxreboot#6333]
- Command line option to lock all open databases [keepassxreboot#6511]
- Allow CSV import of bare TOTP secrets [keepassxreboot#6211]
- Retain file creation time when saving database [keepassxreboot#6576]
- Set permissions of saved attachments to be private to the current user [keepassxreboot#6363]
- OPVault: Use Text instead of Name for attribute names [keepassxreboot#6334]

Changed

- Reports: Allow resizing of reports columns [keepassxreboot#6435]
- Reports: Toggle showing expired entries [keepassxreboot#6534]
- Save Always on Top setting [keepassxreboot#6236]
- Password generator can exclude additional lookalike characters (6/G, 8/B) [keepassxreboot#6196]

Fixed

- Allow setting MSI properties in unattended install [keepassxreboot#6196]
- Update MainWindow minimum size to enable smaller verticle space [keepassxreboot#6196]
- Use application font size when setting default or monospace fonts [keepassxreboot#6332]
- Fix notes not clearing in entry preview panel in some cases [keepassxreboot#6481]
- macOS: Correct window activation when restoring from tray [keepassxreboot#6575]
- macOS: Better handling of minimize after unlock when using browser integration [keepassxreboot#6338]
- Linux: Start after the system tray is available on LXQt [keepassxreboot#6216]
- Linux: Allow selection of modal dialogs on X11 in Auto-Type [keepassxreboot#6204]
- KeeShare: prevent crash when file extension is missing [keepassxreboot#6174]

Release 2.6.6

Fixed

- Fix focusing search when pressing hotkey [keepassxreboot#6603]
- Trim whitespace from TOTP key input prior to processing [keepassxreboot#6604]
- Fix building on macOS [keepassxreboot#6598]
- Resolve compiler warnings for unused return values [keepassxreboot#6607]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@droidmonkey droidmonkey droidmonkey approved these changes

Assignees

No one assigned

Labels

platform: macOS

Projects

None yet

Milestone

v2.6.6

Development

Successfully merging this pull request may close these issues.

3 participants

@phoerious @michaelk83 @droidmonkey