Fix issues with 2.4.2 deployment (#3247)

* Fix macOS proxy dependency on libsodium (fixes #3203) * Fix missing library in snap release (fixes #3209)
keepassxreboot · Jun 11, 2019 · fbf8cb3 · fbf8cb3
1 parent d5e544a
commit fbf8cb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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")