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

Jump to bottom

Fix issues with 2.4.2 deployment #3247

Merged
merged 2 commits into from
Jun 11, 2019
Merged

Fix issues with 2.4.2 deployment #3247

merged 2 commits into from
Jun 11, 2019

Conversation

droidmonkey
Copy link
Member

Type of change

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

Description and Context

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 droidmonkey added this to the v2.4.3 milestone Jun 9, 2019
phoerious
phoerious reviewed Jun 11, 2019
View reviewed changes
src/proxy/CMakeLists.txt
@@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
@phoerious phoerious deleted the hotfix/deployment-woes branch June 11, 2019 07:28
phoerious added a commit that referenced this pull request Jun 11, 2019
@phoerious
Release 2.4.3
5d6ef0c 
- 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
Reviewers

@phoerious phoerious phoerious approved these changes

Assignees
No one assigned
Labels
distribution: Snap high priority 🚨 platform: macOS
Projects
None yet
Milestone
v2.4.3
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@droidmonkey @phoerious