Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix issues with 2.4.2 deployment (#3247)

Browse Source 
* Fix macOS proxy dependency on libsodium (fixes #3203)
* Fix missing library in snap release (fixes #3209)
This commit is contained in:
Jonathan White 2019-06-11 03:28:47 -04:00 committed by Janek Bevendorff
parent d5e544ab32
commit fbf8cb3d6f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snap/snapcraft.yaml
View File

@ -86,6 +86,7 @@ parts:
- libusb-1.0-0 - libusb-1.0-0
- qtwayland5 - qtwayland5
- qt5-gtk-platformtheme # for theming, font settings, cursor and to use gtk3 file chooser - qt5-gtk-platformtheme # for theming, font settings, cursor and to use gtk3 file chooser
- libqrencode3
override-build: | override-build: |
snapcraftctl build snapcraftctl build
sed -i 's|Icon=keepassxc|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/keepassxc.png|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.keepassxc.KeePassXC.desktop sed -i 's|Icon=keepassxc|Icon=${SNAP}/usr/share/icons/hicolor/256x256/apps/keepassxc.png|g' $SNAPCRAFT_PART_INSTALL/usr/share/applications/org.keepassxc.KeePassXC.desktop
@ -121,6 +122,7 @@ parts:
- shared-mime-info - shared-mime-info
- libqt5gui5 - libqt5gui5
- libgdk-pixbuf2.0-0 - libgdk-pixbuf2.0-0
- libgtk2.0-0
- libqt5svg5 # for loading icon themes which are svg - libqt5svg5 # for loading icon themes which are svg
- try: [appmenu-qt5] # not available on core18 - try: [appmenu-qt5] # not available on core18
- locales-all - locales-all

2
src/proxy/CMakeLists.txt
View File

@ -44,6 +44,8 @@ if(WITH_XC_BROWSER)
"@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork" "@executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork"
-change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork -change /usr/local/opt/qt/lib/QtNetwork.framework/Versions/5/QtNetwork
"@executable_path/../Frameworks/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"
keepassxc-proxy keepassxc-proxy
COMMENT "Changing linking of keepassxc-proxy") COMMENT "Changing linking of keepassxc-proxy")