From fbf8cb3d6f82abb9ee8a195c623426cef039cdd0 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Tue, 11 Jun 2019 03:28:47 -0400 Subject: [PATCH] Fix issues with 2.4.2 deployment (#3247) * Fix macOS proxy dependency on libsodium (fixes #3203) * Fix missing library in snap release (fixes #3209) --- snap/snapcraft.yaml | 2 ++ src/proxy/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c509d4c55..fbc8365cf 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -86,6 +86,7 @@ parts: - libusb-1.0-0 - qtwayland5 - qt5-gtk-platformtheme # for theming, font settings, cursor and to use gtk3 file chooser + - libqrencode3 override-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 @@ -121,6 +122,7 @@ parts: - shared-mime-info - libqt5gui5 - libgdk-pixbuf2.0-0 + - libgtk2.0-0 - libqt5svg5 # for loading icon themes which are svg - try: [appmenu-qt5] # not available on core18 - locales-all diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt index bdbfa3b74..61dfd1b25 100755 --- a/src/proxy/CMakeLists.txt +++ b/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" keepassxc-proxy COMMENT "Changing linking of keepassxc-proxy")