From unknown Sat Aug 16 22:00:51 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#46254 <46254@debbugs.gnu.org> To: bug#46254 <46254@debbugs.gnu.org> Subject: Status: [PATCH 0/2] gnu: clementine: Update to 1.4.0rc1-450. Reply-To: bug#46254 <46254@debbugs.gnu.org> Date: Sun, 17 Aug 2025 05:00:51 +0000 retitle 46254 [PATCH 0/2] gnu: clementine: Update to 1.4.0rc1-450. reassign 46254 guix-patches submitter 46254 Pierre Langlois severity 46254 normal tag 46254 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 02 04:38:12 2021 Received: (at submit) by debbugs.gnu.org; 2 Feb 2021 09:38:12 +0000 Received: from localhost ([127.0.0.1]:34131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6s8K-0006u2-Vg for submit@debbugs.gnu.org; Tue, 02 Feb 2021 04:38:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:59216) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l6s8F-0006ta-TW for submit@debbugs.gnu.org; Tue, 02 Feb 2021 04:38:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39998) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6s8F-0002gk-A4 for guix-patches@gnu.org; Tue, 02 Feb 2021 04:37:59 -0500 Received: from mout.gmx.net ([212.227.17.20]:57647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6s8B-0005Im-5b for guix-patches@gnu.org; Tue, 02 Feb 2021 04:37:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1612258671; bh=7FdXzBCK/NTVvbAtOxER8dNbRB81KzE0a4yckkPV+7s=; h=X-UI-Sender-Class:From:To:Subject:Date; b=EJZAI04EtvXncbxTc7S7mGbSDhHPYmbrkhkctOilqxNZMgs9ueBT7rrGA7kJN0VVK D3ekY4s0vMt0KJo8Rw7mmAFtp+TyCo9ozPmlgnf1y9RV4aVpBTZZY8FPdVeNEexGxy Cjy+NoovFUsmRbFutcD8UBMhk6BIW+Z9PfJutEjY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MK3Rm-1lNyjp2W3a-00LUdv for ; Tue, 02 Feb 2021 10:37:51 +0100 User-agent: mu4e 1.4.14; emacs 27.1 From: Pierre Langlois To: Guix-patches Subject: [PATCH 0/2] gnu: clementine: Update to 1.4.0rc1-450. Date: Tue, 02 Feb 2021 09:37:50 +0000 Message-ID: <87o8h2q07l.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Provags-ID: V03:K1:/GGGeBAmZi1+5THag+ChWet4t5ZMKJBL/8BT3xxTvHR0zmh6LMp 6rsHFHvQBYzDbF802a3W8oe8ytG7cqosK5sr1q2PrMBzYStArM3MxNM/i9xhEehDfcfnj1a M5zinUV56vql2e+1MbANc/qnID811S2mR7pCP10sAVMg4eWuaOYxBjq03VcjV4BhT1Bttfk bztO5+GJfuvD/QbTgcdDw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:2DoiklAkTKk=:PjWzgq5plvACfO3r/6wVij hGbkinS/andptOBmtCtZnFKuzEq8kcVq9dZDvDOa+Q0EpTCyaYjPM1hZL5W7wg0A26rxp5iGX X422MTMmdUFx6g9+GGbCmRxlQI5xMm02gw7Nx/kIhe4B0B0axlYd9GWa1stMjfNdHeSlmPbYR lOMj0HEV3Z0EL57vweZbUZAdc/CsTdr2uHtfY5rtG4ibNxDPwcHix5c/hVrRxCoLEPTARRYXa tX2XmwlDYW+Tb1dWIz2nvorlq+qtQLuqcBikJim0quQuD87NMzII7c1/rrwR3s4YtgqoNP9Ge b4wtuwH8/O4meTZMTHwGM9YtGhreh3VDefQEvj+ez26Tt897/G81eT4HM0mh7hpy7/FPmqfBo 3gOdfgbBx5351drCUZboiHFseknmcYyySPgc7G8qC+hEwlte3dQ8B9G46MpV1UQ/Kq6FRIWrv I8UDc1zyPJdMfkRRhdrwySDCYItwcWTWrQMb1xkIGTNkFrIzvJbiLoJjusVVg86/kxvkY6TVE B5+eqaKSTQzVWXJQ30XWg95zX6wbdfW0GMzkyXdNiUboePyYcD3S4fyNMQyU4mxmykcwxkq4s f5aR+wh09Jxj50RTKX0dgchCVOPFTtCqFqvsTpMJBND4Zr9WV9plPdd5fJAHd/AMHTCi7UVog W7qnztIbTtLqme7iCjdcQBDwwZuJ/CmzgF0ynqxhnEbDM+1JY6q4LFfAUr+NN1dE6ypBGuseL p5NERk24xLNcRT+qwUoBxQQcXc7VZRekuHirOi5SwcOux0V6svqF7bQmox0Msg62PVF0ozXLI FICjp5b9SIAPysyxSg0xqWSJa4ZYeTHb+e7acIpeZWcCMR1OvAV0gMsHDn9OYGSRWxbU/nEUU L3eIqAr1U/LRRDhWmYjg== Received-SPF: pass client-ip=212.227.17.20; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_SBL_A=0.1 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi Guix! I've been sitting on this patch to update Clementine to 1.4 for quite a while, patiently waiting for upstream to do their final release. However since it appears to be broken on staging, I thought we [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.17 listed in list.dnswl.org] 0.9 SPF_FAIL SPF: sender does not match SPF record (fail) [SPF failed: Please see http://www.openspf.org/Why?s=mfrom; id=pierre.langlois%40gmx.com; ip=209.51.188.17; r=debbugs.gnu.org] 0.1 URIBL_SBL_A Contains URL's A record listed in the Spamhaus SBL blocklist [URIs: clementine-player.org] 0.6 URIBL_SBL Contains an URL's NS IP listed in the Spamhaus SBL blocklist [URIs: clementine-player.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (pierre.langlois[at]gmx.com) 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [209.51.188.17 listed in wl.mailspike.net] 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 1.9 SPOOFED_FREEMAIL No description available. X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.7 (/) --=-=-= Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" --==-=-= Content-Type: text/plain Hi Guix! I've been sitting on this patch to update Clementine to 1.4 for quite a while, patiently waiting for upstream to do their final release. However since it appears to be broken on staging, I thought we should update it anyway, so here it is! I've picked the first pre-release that includes a fix for https://github.com/clementine-player/Clementine/issues/6701, which is the reason for the current breakable. I've split the re-indentation of the package definition in another commit, otherwise the diff is impossible to review :-). Let me know what you think! --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmAZHW4YHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UdhkIAMNK5gjNV4dfpYsfLAQJkefR JzunHEQvQeh8Aa2EP+bjUFDBDop8ERMAm+UkXsRGGFzOrY6fqlXSxYJOqhHXw8d7 J0K56tRFBqSsEK6KjfSN2/4Hku8pcyQKncgmRbkQEahUsvG/7xTKh/Z4e/Zuwgv1 8R8GIraQgyOwuThrZiJ0HIUz9WTvPTqvhChBwlzf3oyxvDDva4HZuzkaii8UB8cj logeScY8/FNzeNeldjTGsjuG7+Dwx5liOSOwiNjiKrWXbHays6iDmuKopf52wHzC IM42VcNtH2EVkzhrqCj439iTAIQ712KvdsiJJcLOTGqdxhU7B+bOMX4KvBf+PKA= =/2Xf -----END PGP SIGNATURE----- --==-=-=-- --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-clementine-Update-to-1.4.0rc1-450.patch Content-Transfer-Encoding: quoted-printable >From d60e1e1e5aa1deea70dda3f031a63b5ad8550723 Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 2 Feb 2021 08:16:22 +0000 Subject: [PATCH 1/2] 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=3DTRUE. [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. --- gnu/local.mk | 3 - gnu/packages/music.scm | 72 +++++++++---------- .../patches/clementine-fix-sqlite.patch | 23 ------ ...lementine-remove-crypto++-dependency.patch | 19 ----- .../patches/clementine-use-openssl.patch | 67 ----------------- 5 files changed, 34 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/clementine-fix-sqlite.patch delete mode 100644 gnu/packages/patches/clementine-remove-crypto++-depende= ncy.patch delete mode 100644 gnu/packages/patches/clementine-use-openssl.patch diff --git a/gnu/local.mk b/gnu/local.mk index d53ed440f9..40d48f83d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -894,9 +894,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \ %D%/packages/patches/classpath-aarch64-support.patch \ - %D%/packages/patches/clementine-fix-sqlite.patch \ - %D%/packages/patches/clementine-remove-crypto++-dependency.patch \ - %D%/packages/patches/clementine-use-openssl.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates.patch \ %D%/packages/patches/coda-use-system-libs.patch \ diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f8b93ae41a..6d298746e8 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -11,7 +11,7 @@ ;;; Copyright =C2=A9 2017 nikita ;;; Copyright =C2=A9 2017 Rodger Fox ;;; Copyright =C2=A9 2017, 2018, 2019, 2020, 2021 Nicolas Goaziou -;;; Copyright =C2=A9 2017, 2018, 2019 Pierre Langlois +;;; Copyright =C2=A9 2017, 2018, 2019, 2021 Pierre Langlois ;;; Copyright =C2=A9 2017 Arun Isaac ;;; Copyright =C2=A9 2017=E2=80=932021 Tobias Geerinckx-Rice ;;; Copyright =C2=A9 2018 nee @@ -337,53 +337,48 @@ and play MIDI files with a few clicks in a user-frien= dly interface offering score, keyboard, guitar, drum and controller views.") (license license:gpl3+))) =20 -;; We don't use the latest release because it depends on Qt4. Instead we -;; download the sources from the tip of the "qt5" branch. (define-public clementine - (let ((commit "4619a4c1ab3b17b13d4b2327ad477912917eaf36") - (revision "2")) + (let ((version "1.4.0rc1-450-g2725ef99d")) (package (name "clementine") - (version (git-version "1.3.1" revision commit)) + (version version) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/clementine-player/Clementin= e") - (commit commit))) + (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "1hximk3q0p8nw8is5w7215xgkb7k4flnfyr0pdz9svfwvcm05w1i")) - (modules '((guix build utils))) + "1pcwwi9b2qcfjn748577gqx6d1hgg7cisw2dn43npwafdvvkdb90")) + (modules '((guix build utils) + (ice-9 regex))) (snippet '(begin + (use-modules ((ice-9 regex))) (for-each (lambda (dir) - (delete-file-recursively - (string-append "3rdparty/" dir))) - (list - ;; TODO: The following dependencies are still bundle= d: - ;; - "qxt": Appears to be unmaintained upstream. - ;; - "qsqlite" - ;; - "qtsingleapplication" - ;; - "qocoa" - ;; - "qtiocompressor" - ;; - "gmock": The tests crash when using our googlet= est - ;; package instead of the bundled gmock. - "SPMediaKeyTap" - "fancytabwidget" - "google-breakpad" - "libmygpo-qt" - "libmygpo-qt5" - "libprojectm" - "qtwin" - "sha2" ;; Replaced by openssl. - "taglib" - "tinysvcmdns")) - #t)) - (patches (search-patches "clementine-use-openssl.patch" - "clementine-remove-crypto++-depen= dency.patch" - "clementine-fix-sqlite.patch")))) + ;; TODO: The following dependencies are still bundl= ed: + ;; - "qxt": Appears to be unmaintained upstream. + ;; - "qsqlite" + ;; - "qtsingleapplication" + ;; - "qocoa" + ;; - "qtiocompressor" + (let ((bundled '("qsqlite" + "qtsingleapplication" + "qxt" + "qocoa" + "qtiocompressor"))) + (if (not + (string-match + (string-append ".?*(" (string-join bundled= "|") ")") + dir)) + (delete-file-recursively dir)))) + (find-files "3rdparty" + (lambda (file stat) + (string-match "^3rdparty/[^/]*$" file)) + #:directories? #t)) + #t)))) (build-system cmake-build-system) (arguments '(#:test-target "clementine_test" @@ -394,7 +389,10 @@ score, keyboard, guitar, drum and controller views.") ;; TODO In an origin snippet, remove the code that performs= the ;; download. "-DHAVE_SPOTIFY_DOWNLOADER=3DFALSE" - "-DUSE_SYSTEM_SHA2=3DTRUE") + ;; Clementine checks that the taglib version is higher than= 1.11, + ;; because of https://github.com/taglib/taglib/issues/864. = Remove + ;; this flag when 1.12 is released. + "-DUSE_SYSTEM_TAGLIB=3DTRUE") #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program @@ -406,6 +404,7 @@ score, keyboard, guitar, drum and controller views.") #t)))))) (native-inputs `(("gettext" ,gettext-minimal) + ("googletest" ,googletest) ("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) (inputs @@ -423,7 +422,6 @@ score, keyboard, guitar, drum and controller views.") ;; TODO: Package libgpod. ("libmtp" ,libmtp) ("libxml2" ,libxml2) - ("openssl" ,openssl) ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase) @@ -439,8 +437,6 @@ playing your music.") (license (list ;; clementine and qtiocompressor are under GPLv3. license:gpl3+ - ;; gmock is under BSD-3. - license:bsd-3 ;; qxt is under CPL1.0. license:cpl1.0 ;; qsqlite and qtsingleapplication are under LGPL2.1+. diff --git a/gnu/packages/patches/clementine-fix-sqlite.patch b/gnu/package= s/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 cleme= ntine-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(); -=20 - { -+ -+#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER -+ // In case sqlite>=3D3.12 is compiled without -DSQLITE_ENABLE_FTS3_TO= KENIZER -+ // (generally a good idea due to security reasons) the fts3 support = should be enabled explicitly. -+ QVariant v =3D db.driver()->handle(); -+ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") =3D=3D 0) { -+ sqlite3 *handle =3D *static_cast(v.data()); -+ if (handle) sqlite3_db_config(handle, SQLITE_DBCONFIG_ENABLE_FTS3_T= OKENIZER, 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.pat= ch 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 integrati= on" -=20 - optional_component(VISUALISATIONS ON "Visualisations") -=20 --if(NOT HAVE_SPOTIFY_BLOB AND NOT CRYPTOPP_FOUND) -- message(FATAL_ERROR "Either crypto++ must be available or the non-GPL S= potify " -- "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/packag= es/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>=3D12.1.45) - pkg_check_modules(TAGLIB REQUIRED taglib>=3D1.6) -+pkg_check_modules(OPENSSL REQUIRED openssl) -=20 - if (WIN32) - find_package(ZLIB REQUIRED) -@@ -381,20 +382,6 @@ if(GMOCK_INCLUDE_DIRS) - endif(GTEST_INCLUDE_DIRS) - endif(GMOCK_INCLUDE_DIRS) -=20 --# 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}) -=20 -@@ -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" -=20 --#include "sha2.h" -+#include -=20 - #if defined(Q_OS_UNIX) - #include --=20 2.30.0 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-clementine-Indent.patch Content-Transfer-Encoding: quoted-printable =46rom 02c3550bbf11a9d6a5f58265e95826085c92941d Mon Sep 17 00:00:00 2001 From: Pierre Langlois Date: Tue, 2 Feb 2021 08:40:33 +0000 Subject: [PATCH 2/2] gnu: clementine: Indent. * gnu/packages/music.scm (clementine): Remove 'version' variable and one l= evel of indentation. =2D-- gnu/packages/music.scm | 205 ++++++++++++++++++++--------------------- 1 file changed, 102 insertions(+), 103 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6d298746e8..89fa147150 100644 =2D-- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -338,111 +338,110 @@ score, keyboard, guitar, drum and controller views= .") (license license:gpl3+))) (define-public clementine - (let ((version "1.4.0rc1-450-g2725ef99d")) - (package - (name "clementine") - (version version) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/clementine-player/Clementi= ne") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pcwwi9b2qcfjn748577gqx6d1hgg7cisw2dn43npwafdvvkdb90")= ) - (modules '((guix build utils) - (ice-9 regex))) - (snippet - '(begin - (use-modules ((ice-9 regex))) - (for-each - (lambda (dir) - ;; TODO: The following dependencies are still bund= led: - ;; - "qxt": Appears to be unmaintained upstream. - ;; - "qsqlite" - ;; - "qtsingleapplication" - ;; - "qocoa" - ;; - "qtiocompressor" - (let ((bundled '("qsqlite" - "qtsingleapplication" - "qxt" - "qocoa" - "qtiocompressor"))) - (if (not - (string-match - (string-append ".?*(" (string-join bundle= d "|") ")") - dir)) - (delete-file-recursively dir)))) - (find-files "3rdparty" - (lambda (file stat) - (string-match "^3rdparty/[^/]*$" file)= ) - #:directories? #t)) - #t)))) - (build-system cmake-build-system) - (arguments - '(#:test-target "clementine_test" - #:configure-flags - (list ;; Requires unpackaged "projectm" - "-DENABLE_VISUALISATIONS=3DOFF" - ;; Otherwise it may try to download a non-free library at = run-time. - ;; TODO In an origin snippet, remove the code that perform= s the - ;; download. - "-DHAVE_SPOTIFY_DOWNLOADER=3DFALSE" - ;; Clementine checks that the taglib version is higher tha= n 1.11, - ;; because of https://github.com/taglib/taglib/issues/864.= Remove - ;; this flag when 1.12 is released. - "-DUSE_SYSTEM_TAGLIB=3DTRUE") - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) - (wrap-program (string-append out "/bin/clementine") - `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-pat= h))) - #t)))))) - (native-inputs - `(("gettext" ,gettext-minimal) - ("googletest" ,googletest) - ("pkg-config" ,pkg-config) - ("qtlinguist" ,qttools))) - (inputs - `(("boost" ,boost) - ("chromaprint" ,chromaprint) - ("fftw" ,fftw) - ("glib" ,glib) - ("glu" ,glu) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("gst-plugins-good" ,gst-plugins-good) - ("gst-libav" ,gst-libav) - ("libcdio" ,libcdio) - ("libmygpo-qt" ,libmygpo-qt) - ;; TODO: Package libgpod. - ("libmtp" ,libmtp) - ("libxml2" ,libxml2) - ("protobuf" ,protobuf) - ("pulseaudio" ,pulseaudio) - ("qtbase" ,qtbase) - ("qtx11extras" ,qtx11extras) - ("sqlite" ,sqlite) - ("sparsehash" ,sparsehash) - ("taglib" ,taglib))) - (home-page "https://clementine-player.org") - (synopsis "Music player and library organizer") - (description "Clementine is a multiplatform music player. It is in= spired + (package + (name "clementine") + (version "1.4.0rc1-450-g2725ef99d") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/clementine-player/Clementine= ") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1pcwwi9b2qcfjn748577gqx6d1hgg7cisw2dn43npwafdvvkdb90")) + (modules '((guix build utils) + (ice-9 regex))) + (snippet + '(begin + (use-modules ((ice-9 regex))) + (for-each + (lambda (dir) + ;; TODO: The following dependencies are still bundle= d: + ;; - "qxt": Appears to be unmaintained upstream. + ;; - "qsqlite" + ;; - "qtsingleapplication" + ;; - "qocoa" + ;; - "qtiocompressor" + (let ((bundled '("qsqlite" + "qtsingleapplication" + "qxt" + "qocoa" + "qtiocompressor"))) + (if (not + (string-match + (string-append ".?*(" (string-join bundled = "|") ")") + dir)) + (delete-file-recursively dir)))) + (find-files "3rdparty" + (lambda (file stat) + (string-match "^3rdparty/[^/]*$" file)) + #:directories? #t)) + #t)))) + (build-system cmake-build-system) + (arguments + '(#:test-target "clementine_test" + #:configure-flags + (list ;; Requires unpackaged "projectm" + "-DENABLE_VISUALISATIONS=3DOFF" + ;; Otherwise it may try to download a non-free library at ru= n-time. + ;; TODO In an origin snippet, remove the code that performs = the + ;; download. + "-DHAVE_SPOTIFY_DOWNLOADER=3DFALSE" + ;; Clementine checks that the taglib version is higher than = 1.11, + ;; because of https://github.com/taglib/taglib/issues/864. R= emove + ;; this flag when 1.12 is released. + "-DUSE_SYSTEM_TAGLIB=3DTRUE") + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/clementine") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)= )) + #t)))))) + (native-inputs + `(("gettext" ,gettext-minimal) + ("googletest" ,googletest) + ("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools))) + (inputs + `(("boost" ,boost) + ("chromaprint" ,chromaprint) + ("fftw" ,fftw) + ("glib" ,glib) + ("glu" ,glu) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gst-libav" ,gst-libav) + ("libcdio" ,libcdio) + ("libmygpo-qt" ,libmygpo-qt) + ;; TODO: Package libgpod. + ("libmtp" ,libmtp) + ("libxml2" ,libxml2) + ("protobuf" ,protobuf) + ("pulseaudio" ,pulseaudio) + ("qtbase" ,qtbase) + ("qtx11extras" ,qtx11extras) + ("sqlite" ,sqlite) + ("sparsehash" ,sparsehash) + ("taglib" ,taglib))) + (home-page "https://clementine-player.org") + (synopsis "Music player and library organizer") + (description "Clementine is a multiplatform music player. It is insp= ired by Amarok 1.4, focusing on a fast and easy-to-use interface for searching= and playing your music.") - (license (list - ;; clementine and qtiocompressor are under GPLv3. - license:gpl3+ - ;; qxt is under CPL1.0. - license:cpl1.0 - ;; qsqlite and qtsingleapplication are under LGPL2.1+. - license:lgpl2.1+ - ;; qocoa is under MIT and CC by-sa for the icons. - license:cc-by-sa3.0))))) + (license (list + ;; clementine and qtiocompressor are under GPLv3. + license:gpl3+ + ;; qxt is under CPL1.0. + license:cpl1.0 + ;; qsqlite and qtsingleapplication are under LGPL2.1+. + license:lgpl2.1+ + ;; qocoa is under MIT and CC by-sa for the icons. + license:cc-by-sa3.0)))) (define-public cmus (package =2D- 2.30.0 --=-=-= Content-Type: text/plain Thanks, Pierre --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 08 06:04:40 2021 Received: (at 46254-done) by debbugs.gnu.org; 8 Feb 2021 11:04:40 +0000 Received: from localhost ([127.0.0.1]:49927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l94LQ-0001SK-1b for submit@debbugs.gnu.org; Mon, 08 Feb 2021 06:04:40 -0500 Received: from mout01.posteo.de ([185.67.36.65]:46298) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l94LN-0001S4-Bd for 46254-done@debbugs.gnu.org; Mon, 08 Feb 2021 06:04:38 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5D06416006F for <46254-done@debbugs.gnu.org>; Mon, 8 Feb 2021 12:04:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1612782270; bh=RwD22ScDjZtiqK44JvzA9giU5kpvLMsLngw9kWVBajc=; h=From:To:Cc:Subject:Date:From; b=mULQ8ahA8ahCvgxQ80P84LFc8owMXV1g/QXm+2GLDU/AU2H23oO642zeJ0+qVojOE y2l/qFUEdiNJlcsU3P/6+ZqIQqNHEE8FcUViTZqrWth8bEovAfQxsupMQzlTi459cJ 8MfrsY2PswsVbqBbQ2/i/w5a4Un/U0KKgY2y7ialgdi70P1RXpQFd2SnskiclnTcjw uyF5IbT6Sy3U+g1N9hbx0HBBCw3UKL6V0CJqxYM8vNVfh2fiUVJd4ql9LfeR7IhOEY kz7Ij63xdlvacrVC9WCFPDneajee6HfGX14yOup2HS5Y8Z45Y85KTNRfuX9k+BGnbR XHisOSEefo4Zw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4DZ37c33mYz6tmx; Mon, 8 Feb 2021 12:04:28 +0100 (CET) References: <87o8h2q07l.fsf@gmx.com> User-agent: mu4e 1.4.14; emacs 27.1 From: Guillaume Le Vaillant To: Pierre Langlois Subject: Re: [bug#46254] [PATCH 0/2] gnu: clementine: Update to 1.4.0rc1-450. In-reply-to: <87o8h2q07l.fsf@gmx.com> Date: Mon, 08 Feb 2021 12:04:26 +0100 Message-ID: <87tuqmstvp.fsf@yamatai> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 46254-done Cc: 46254-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Patches pushed as 7b207e08492998bb91ac99f703f193d32dfee31e and following. Thanks. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCYCEaug8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j+qwQD/RAJRa3qr3ZT8izoxS15RgK8uwe7EICldz6IA dtqobcoA/0El1L94+qslKl/pQ/QyvaUgrnT85HQ+VhmOHoxp3l6j =8FLh -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Aug 16 22:00:51 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 08 Mar 2021 12:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator