diff options
author | Pierre Langlois <pierre.langlois@gmx.com> | 2021-02-02 08:16:22 +0000 |
---|---|---|
committer | Guillaume Le Vaillant <glv@posteo.net> | 2021-02-08 11:14:42 +0100 |
commit | 7b207e08492998bb91ac99f703f193d32dfee31e (patch) | |
tree | 6380e2160d1c6a39686d480d3ef647a4c6ec4903 /gnu/packages/patches | |
parent | a31b72655d1127dfd67508ab2625fe518b83d009 (diff) | |
download | guix-7b207e08492998bb91ac99f703f193d32dfee31e.tar.gz |
gnu: clementine: Update to 1.4.0rc1-450.
* gnu/packages/music.scm (clementine): Update to 1.4.0rc1-450. [source]: Adapt snippet to list bundled directories to keep rather than ones to delete. Unbundled gmock. Remove patches no longer needed. [arguments]: Set -DUSE_SYSTEM_TAGLIB=TRUE. [native-inputs]: Add googletest. [inputs]: Remove openssl. [license]: Remove gmock license. * gnu/packages/patches/clementine-fix-sqlite.patch: Remove. * gnu/packages/patches/clementine-remove-crypto++-dependency.patch: Remvoe * gnu/packages/patches/clementine-use-openssl.patch: Remove. * gnu/local.mk (dist_patch_DATA): Remove them. Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r-- | gnu/packages/patches/clementine-fix-sqlite.patch | 23 | ||||
-rw-r--r-- | gnu/packages/patches/clementine-remove-crypto++-dependency.patch | 19 | ||||
-rw-r--r-- | gnu/packages/patches/clementine-use-openssl.patch | 67 |
3 files changed, 0 insertions, 109 deletions
diff --git a/gnu/packages/patches/clementine-fix-sqlite.patch b/gnu/packages/patches/clementine-fix-sqlite.patch deleted file mode 100644 index f9d44f9074..0000000000 --- a/gnu/packages/patches/clementine-fix-sqlite.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch downloaded from https://github.com/clementine-player/Clementine/pull/5669 . - -diff -ruN clementine-1.3.1.565.gd20c2244a.orig/src/core/database.cpp clementine-1.3.1.565.gd20c2244a/src/core/database.cpp ---- clementine-1.3.1.565.gd20c2244a.orig/src/core/database.cpp 2018-07-07 23:59:24.018540126 +0200 -+++ clementine-1.3.1.565.gd20c2244a/src/core/database.cpp 2018-07-08 00:04:47.991551728 +0200 -@@ -265,6 +265,17 @@ - StaticInit(); - - { -+ -+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER -+ // In case sqlite>=3.12 is compiled without -DSQLITE_ENABLE_FTS3_TOKENIZER -+ // (generally a good idea due to security reasons) the fts3 support should be enabled explicitly. -+ QVariant v = db.driver()->handle(); -+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { -+ sqlite3 *handle = *static_cast<sqlite3**>(v.data()); -+ if (handle) sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER, 1, NULL); -+ } -+#endif -+ - QSqlQuery set_fts_tokenizer(db); - set_fts_tokenizer.prepare("SELECT fts3_tokenizer(:name, :pointer)"); - set_fts_tokenizer.bindValue(":name", "unicode"); diff --git a/gnu/packages/patches/clementine-remove-crypto++-dependency.patch b/gnu/packages/patches/clementine-remove-crypto++-dependency.patch deleted file mode 100644 index e7cf80ddee..0000000000 --- a/gnu/packages/patches/clementine-remove-crypto++-dependency.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3202b8b..473ecb9 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -279,14 +279,6 @@ optional_component(LIBPULSE ON "Pulse audio integration" - - optional_component(VISUALISATIONS ON "Visualisations") - --if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) -- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL Spotify " -- "code must be compiled in") --elseif(CRYPTOPP_FOUND) -- set(HAVE_CRYPTOPP ON) -- set(HAVE_SPOTIFY_DOWNLOADER ON) --endif() -- - # Find DBus if it's enabled - if (HAVE_DBUS) - find_package(Qt5 COMPONENTS DBus) diff --git a/gnu/packages/patches/clementine-use-openssl.patch b/gnu/packages/patches/clementine-use-openssl.patch deleted file mode 100644 index 1fbf3d2b8a..0000000000 --- a/gnu/packages/patches/clementine-use-openssl.patch +++ /dev/null @@ -1,67 +0,0 @@ -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 <openssl/sha.h> - - #if defined(Q_OS_UNIX) - #include <sys/statvfs.h> |