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.

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

Fix issues with 2.4.2 deployment #3247

Merged
merged 2 commits into from Jun 11, 2019

Conversation

2 participants
@droidmonkey
Copy link
Member

commented Jun 9, 2019

Type of change

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

Description and Context

  • Fix missing library from snap release

  • Fixes #3203

  • Fix linking libsodium in keepassxc-proxy under macOS

  • Fixes #3209

Testing strategy

Tested on snap release and macOS

Checklist:

  • I have read the CONTRIBUTING document. [REQUIRED]
  • My code follows the code style of this project. [REQUIRED]
  • All new and existing tests passed. [REQUIRED]
  • I have compiled and verified my code with -DWITH_ASAN=ON. [REQUIRED]
  • My change requires a change to the documentation, and I have updated it accordingly.
  • I have added tests to cover my changes.

droidmonkey added some commits Jun 1, 2019

@droidmonkey droidmonkey added this to the v2.4.3 milestone Jun 9, 2019

@droidmonkey droidmonkey requested a review from phoerious Jun 9, 2019

@droidmonkey droidmonkey force-pushed the hotfix/deployment-woes branch from 417dfaa to 39dadcc Jun 10, 2019

@@ -44,6 +44,8 @@ if(WITH_XC_BROWSER)
"@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
-change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork
"@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
-change /usr/local/opt/libsodium/lib/libsodium.23.dylib
"@executable_path/../Frameworks/libsodium.23.dylib"

This comment has been minimized.

Copy link
@phoerious

phoerious Jun 11, 2019

Member

This is so annoying and should be handled automatically by make package. 🤦‍♂

@phoerious phoerious merged commit fbf8cb3 into release/2.4.3 Jun 11, 2019

3 checks passed

MacOS (KeepassXC) TeamCity build finished
Details
Ubuntu Linux (KeepassXC) TeamCity build finished
Details
Windows 10 (KeepassXC) TeamCity build finished
Details

@phoerious phoerious deleted the hotfix/deployment-woes branch Jun 11, 2019

phoerious added a commit that referenced this pull request Jun 11, 2019

Release 2.4.3
- Fix library loading issues in the Snap and macOS releases [#3247]
- Fix various keyboard navigation issues [#3248]
- Fix main window toggling regression when clicking the tray icon on KDE [#3258]
- Add documentation for keyboard shortcuts to source code distribution [#3215]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.