diff --git a/CMakeLists.txt b/CMakeLists.txt index 4022c383b..3202b8b69 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,7 @@ pkg_check_modules(LIBPULSE libpulse) pkg_check_modules(LIBXML libxml-2.0) pkg_check_modules(SPOTIFY libspotify>=12.1.45) pkg_check_modules(TAGLIB REQUIRED taglib>=1.6) +pkg_check_modules(OPENSSL REQUIRED openssl) if (WIN32) find_package(ZLIB REQUIRED) @@ -381,20 +382,6 @@ if(GMOCK_INCLUDE_DIRS) endif(GTEST_INCLUDE_DIRS) endif(GMOCK_INCLUDE_DIRS) -# Use the system's sha2 if it's available. -find_path(SHA2_INCLUDE_DIRS sha2.h) -find_library(SHA2_LIBRARIES sha2) -if(SHA2_LIBRARIES AND SHA2_INCLUDE_DIRS) - message(STATUS "Using system sha2 library") - set(USE_SYSTEM_SHA2 ON) -else() - message(STATUS "Using builtin sha2 library") - set(USE_SYSTEM_SHA2 OFF) - add_subdirectory(3rdparty/sha2) - set(SHA2_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/sha2) - set(SHA2_LIBRARIES sha2) -endif() - # Use the system libmygpo-qt5 if a recent enough version was found if(LIBMYGPO_QT5_FOUND) set(MYGPOQT5_LIBRARIES ${LIBMYGPO_QT5_LIBRARIES}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6e24c9726..104d044d9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,7 +29,6 @@ include_directories(${LIBPROJECTM_INCLUDE_DIRS}) include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) include_directories(${QXT_INCLUDE_DIRS}) -include_directories(${SHA2_INCLUDE_DIRS}) include_directories(${CHROMAPRINT_INCLUDE_DIRS}) include_directories(${MYGPOQT5_INCLUDE_DIRS}) @@ -1223,7 +1222,7 @@ target_link_libraries(clementine_lib libclementine-common libclementine-tagreader libclementine-remote - ${SHA2_LIBRARIES} + ${OPENSSL_LIBRARIES} ${TAGLIB_LIBRARIES} ${MYGPOQT5_LIBRARIES} ${CHROMAPRINT_LIBRARIES} diff --git a/src/core/utilities.cpp b/src/core/utilities.cpp index ce76f22da..80bf623fb 100644 --- a/src/core/utilities.cpp +++ b/src/core/utilities.cpp @@ -52,7 +52,7 @@ #include "config.h" #include "timeconstants.h" -#include "sha2.h" +#include #if defined(Q_OS_UNIX) #include ild-aux/test-env.in
AgeCommit message (Expand)Author
2021-12-22tests: Move keys into ./tests/keys/ and add a third ed25519 key....The third key will be used in an upcoming commit. Rename public keys to .pub. * guix/tests/gnupg.scm (%ed25519-3-public-key-file): New variable. (%ed25519-3-secret-key-file): New variable. (%ed25519-2-public-key-file): Renamed from %ed25519bis-public-key-file. (%ed25519-2-secret-key-file): Renamed from %ed25519bis-secret-key-file. * tests/keys/ed25519-3.key: New file. * tests/keys/ed25519-3.sec: New file. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> Attila Lendvai
2021-04-20import: Remove Nix importer....This importer has suffered from bitrot and no longer works with current Nix and Nixpkgs. See <https://bugs.gnu.org/32339> and <https://bugs.gnu.org/36255>. * guix/import/snix.scm, guix/scripts/import/nix.scm, tests/snix.scm: Remove. * Makefile.am (MODULES, SCM_TESTS): Remove them. * guix/scripts/import.scm (importers): Remove "nix". * build-aux/test-env.in: Remove NIXPKGS variable. * configure.ac: Remove '--with-nixpkgs' option. * doc/guix.texi (Invoking guix import): Remove bit about "guix import nix". * etc/completion/fish/guix.fish: Likewise. Ludovic Courtès