From patchwork Fri Jul 25 17:34:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43266 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CF3A327BC4B; Fri, 25 Jul 2025 18:43:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0546E27BC49 for ; Fri, 25 Jul 2025 18:43:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufMS1-0002Ao-96; Fri, 25 Jul 2025 13:43:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufMRk-0001yF-0x for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufMRj-0006Hn-Or for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=umOCI0VajetMiwC/VyYKtBiqVyRsY2DN1VaciV5md00=; b=MSKsyRoF9MoXKHI4m9VISDLs2Fmn+JZPVKOUQzW16vd1ED0EMGYsXzBi/i55JV9mjHNcPF2nquTSVujHNyirtrGmhoK8D4EVLF+DYH9Xbb1V0qwxngT61esEU3rmTu7565/CLZXlbX2BddfBZbh00MQNMoZXkHiovuebRUpARj6O51stIiVdhKpV/Bxwg3knwSVibqLHKBkmjfFYKghnkkdLQp9GPLKd6puedsAW2Cah4VP9NcjVuDVrqMZ6/AaoMtKXrp8v4vqgF4vmBis3zrzEGoCVXTKXqTIvCbVw+YohCPgFt8MKkqAXWb2moaAPLdjRFmCfKysUj3VTtHqodQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufMRj-0000gP-HF for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 1/5] gnu: libmygpo-qt: Update to 1.2.0. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jul 2025 17:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75720@debbugs.gnu.org Cc: Sughosha Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.17534653342484 (code B ref 75720); Fri, 25 Jul 2025 17:43:03 +0000 Received: (at 75720) by debbugs.gnu.org; 25 Jul 2025 17:42:14 +0000 Received: from localhost ([127.0.0.1]:35961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufMQv-0000dp-Jy for submit@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:14 -0400 Received: from layka.disroot.org ([178.21.23.139]:43088) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ufMQl-0000cO-7z for 75720@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:07 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E2B7622F48; Fri, 25 Jul 2025 19:42:00 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id WNGPPJzJyUq1; Fri, 25 Jul 2025 19:41:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1753465319; bh=ClX2SDQVN1NtwpiJjo96/DFEc+dn0q6AbmswoD7mcAo=; h=From:To:Cc:Subject:Date; b=WpQnt9Ug446hXFjlO8YmAaAkBT8ROlivRQu2WLdL0YkTK6JaIQ3T/yg5lIoddVkh2 oDOEJ8C9P01Yk7BGqj1uQLOyMtXC/GQqXyCqQHy54NlllY5opNtwmdNjfds1emCYQj mrZThIlVxjYC+5slVYt68YAmE/7EcCe0MwxTSK0U2sPy30+x1XzIfkHWuXS5aVtlV9 5R3CuUf6oEYwrdWYXc+B3LM6WDhcdQec1T0zqzRXUMPDPl305kyvcMa3QTAW9M67ie A05efBbDQWZVto65yzb4v7Rqaw05TxFlpZX2JAO2h1KOfiwsMcHoNKKNBSaYAJqhcT C1uYZ74M7Pq4Q== Date: Fri, 25 Jul 2025 23:04:58 +0530 Message-ID: <20250725173502.14568-1-sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gpodder.scm (libmygpo-qt): Update to 1.2.0. [source]: Remove the patches. [inputs]: Replace qtbase-5 with qtbase. [arguments]: Switch to gexp. <#:configure-flags>: Remove "-DMYGPO_BUILD_TESTS=ON"; add "-DBUILD_WITH_QT6=ON". <#:phases>: Replace 'check phase. * gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch: Delete file. * gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch: Delete file. * gnu/local.mk: Deregister the deleted patches. Change-Id: I3afb30499477ec2d756f7010afcf901cb0646bde --- gnu/local.mk | 2 - gnu/packages/gpodder.scm | 22 +++--- .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 ------------------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------------ 4 files changed, 13 insertions(+), 140 deletions(-) delete mode 100644 gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch delete mode 100644 gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6e4664ac35..407edabdb8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1775,8 +1775,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmpeg2-arm-private-symbols.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ - %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ - %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index c3e1c9b496..bd2c7271ae 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -129,26 +129,30 @@ (define-public gpodder (define-public libmygpo-qt (package (name "libmygpo-qt") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "http://stefan.derkits.at/files/" "libmygpo-qt/libmygpo-qt." version ".tar.gz")) (sha256 (base32 - "1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2")) - (patches (search-patches "libmygpo-qt-fix-qt-5.11.patch" - "libmygpo-qt-missing-qt5-modules.patch")))) + "1rpallrgfdpvdw2npjizw0gj7lidb8hxs7ak16jkryq2yijpzkjh")))) (build-system cmake-build-system) (native-inputs (list pkg-config)) (inputs - (list qtbase-5)) + (list qtbase)) (arguments - '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") - ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 - ;; is fixed. - #:tests? #f)) + (list #:configure-flags + #~(list "-DBUILD_WITH_QT6=ON") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; TODO: Enable JsonCreatorTest-test when + ;; https://github.com/gpodder/gpodder/issues/446 is fixed. + (invoke "ctest" "-E" "JsonCreatorTest-test"))))))) (home-page "https://gpodder.github.io") (synopsis "Qt/C++ library wrapping the gpodder web service") (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the diff --git a/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch b/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch deleted file mode 100644 index 69673c90ee..0000000000 --- a/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 15 Apr 2018 22:29:33 +0200 -Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) - ---- - CMakeLists.txt | 3 --- - src/CMakeLists.txt | 8 ++++++-- - tests/CMakeLists.txt | 12 +++++++++--- - 3 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb006d9..fa4b0cb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,9 +34,6 @@ else() - set( QT_DONT_USE_QTGUI TRUE ) - include( ${QT_USE_FILE} ) - -- macro(qt5_use_modules) -- endmacro() -- - macro(qt_wrap_cpp) - qt4_wrap_cpp(${ARGN}) - endmacro() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 802125b..253e81e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) - - add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) - --target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) - set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) --qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network ) -+ -+if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network) -+else() -+ target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES}) -+endif() - - install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index a3e3223..4f77158 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU - - # UrlBuilder library - add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) --qt5_use_modules( UrlBuilder Core ) -+if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries( UrlBuilder Qt5::Core ) -+endif() - # JSONCreator library - QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h ) - add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC}) --qt5_use_modules( JsonCreator Core Network ) -+if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) -+endif() - - set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) - -@@ -25,7 +29,9 @@ macro(add_libmygpo_test _source) - add_executable(${_name} ${_source} ${${_name}_MOC_SRC}) - target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name}) -- qt5_use_modules(${_name} Network Test) -+ if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries(${_name} Qt5::Network Qt5::Test) -+ endif() - endmacro(add_libmygpo_test) - - add_libmygpo_test( UrlBuilderTest.cpp ) diff --git a/gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch b/gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch deleted file mode 100644 index aa9ed2c0f7..0000000000 --- a/gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 15 Apr 2018 22:20:34 +0200 -Subject: [PATCH] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more - strict - ---- - CMakeLists.txt | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a1f652..eb006d9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,25 +5,25 @@ project( libmygpo-qt ) - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) - --option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) -+option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) - - if( NOT BUILD_WITH_QT4 ) -- find_package(Qt5Core QUIET) -- if( Qt5Core_DIR ) -- set(MYGPO_QT_VERSION_SUFFIX 5) -- -- macro(qt_wrap_cpp) -- qt5_wrap_cpp(${ARGN}) -- endmacro() -+ if( MYGPO_BUILD_TESTS ) -+ find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) -+ else() -+ find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG) - endif() -+ set(MYGPO_QT_VERSION_SUFFIX 5) -+ -+ macro(qt_wrap_cpp) -+ qt5_wrap_cpp(${ARGN}) -+ endmacro() - - # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for - # Qt5 - set(MYGPO_QT_MAJOR_VERSION "5") - set(MYGPO_QT4_QJSON_DEP "") --endif() -- --if( NOT Qt5Core_DIR ) -+else() - message(STATUS "Could not find Qt5, searching for Qt4 instead...") - message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") - if( MYGPO_BUILD_TESTS ) From patchwork Fri Jul 25 17:34:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43268 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9B2B527BC4B; Fri, 25 Jul 2025 18:43:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6C6AA27BC49 for ; Fri, 25 Jul 2025 18:43:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufMRz-00023n-Iu; Fri, 25 Jul 2025 13:43:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufMRi-0001xO-VC for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufMRi-0006H7-Ll for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=OFF8HucmGdYGjzp4Uxtjkw/f3ypHrZOI6vD+lG0PmUk=; b=HeZRI7X/Opab1Rr53ecnW59iHtoqNek+LXjXn+h5rJi1URpsLWd+U+T4fD6/sGRgPMJHTieSo7cQVSzpMqA0hVqAvK0qKXc5mGxcnaJ8awcur5qrMdGISlHx9VGMys0wl0NoUzx+Sa77Y3c6Un8d+IT3bWepdEQJaBVNLpU8pYdQhdnDy6v0pGGw4cCVV61zi5FmVDEn5qjJZG4ci+g5FrtAO37P0VQbJCAP8jPppog0QewB1q1EDcvp+fgtRbtTUkuJxeNsTnchmwkytSMJG3MdqG8F+YzgfcCRamb0PR/PIJJrWHSyG7zhvISADWAqx5MzlE3FTYczNqH3wt/gbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufMRi-0000g8-GL for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 2/5] gnu: libmygpo-qt5: New variable. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jul 2025 17:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75720@debbugs.gnu.org Cc: Sughosha Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.17534653282452 (code B ref 75720); Fri, 25 Jul 2025 17:43:02 +0000 Received: (at 75720) by debbugs.gnu.org; 25 Jul 2025 17:42:08 +0000 Received: from localhost ([127.0.0.1]:35957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufMQp-0000dO-NV for submit@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:08 -0400 Received: from layka.disroot.org ([178.21.23.139]:43102) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ufMQl-0000cU-9A for 75720@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:05 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 403452524A; Fri, 25 Jul 2025 19:42:01 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 89L85j41Fjuy; Fri, 25 Jul 2025 19:42:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1753465320; bh=jcu7umY62UcSBraei9Rc5ZeQdTSdKEiUlN4/Vr5Hf30=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fJCqD9/gJLpuJ6SGxBb4OZ67VMLe+bl9wNASH3rIuNiLS6OeW/6TSFJOSg7+i7515 eGE/sOBIR8/uKAJmg/lzvg8FrSK69sLAiiUF6yuKwHOz3MzWwp7nOI3fMs8H7QIyAn RriwjGbrPkN3iEu+JKXcUDd0wRyopPifOB8tbkzpyFm3ol9Djxy7zi5W7TN+T4kl87 6pPNsxT6vXIgizLaonMCJHBNdZbv6+NQGmYFcsLSrM4nFrxuVVBmQzuVf0jxw2o78f ZaTV/VfU5Z8C0FFYyTRWZzIyMNAWQjzy6yZWxogJzaxg9RJnRO8IBljB5VrZlf9Xyk LaQjvXc4JZ2XA== Date: Fri, 25 Jul 2025 23:04:59 +0530 Message-ID: <20250725173502.14568-2-sughosha@disroot.org> In-Reply-To: <20250725173502.14568-1-sughosha@disroot.org> References: <20250725173502.14568-1-sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gpodder.scm (libmygpo-qt5): New variable. Change-Id: Id36fe3aa89c506496c0bbf162cbe28409fdc593f --- gnu/packages/gpodder.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index bd2c7271ae..d44ede0d31 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -160,6 +160,16 @@ (define-public libmygpo-qt and track podcasts.") (license license:lgpl2.1+))) +(define-public libmygpo-qt5 + (package/inherit libmygpo-qt + (name "libmygpo-qt5") + (inputs + (modify-inputs (package-inputs libmygpo-qt) + (replace "qtbase" qtbase-5))) + (arguments + (substitute-keyword-arguments (package-arguments libmygpo-qt) + ((#:configure-flags _) #~'()))))) + (define-public python-mygpoclient (package (name "python-mygpoclient") From patchwork Fri Jul 25 17:35:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43264 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B6B9F27BC4B; Fri, 25 Jul 2025 18:43:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 525DB27BC49 for ; Fri, 25 Jul 2025 18:43:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufMRm-0001zB-Kc; Fri, 25 Jul 2025 13:43:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufMRi-0001xE-MU for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufMRi-0006Gh-Bl for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=/GypMDwQIwvRXcJFv18U4MJRbLh0i7yzwvNwqRA6k0E=; b=R0c2ghzsRGpsddSdjq+xbPeWzOWIxfRvy2Y+8dtoudDBe0F36C422w2vLROO/MUengBVPm0qbENpwYrKlcp0IAMN1VczehMnX3IxR3eP45uFkmScaL7a2GCtTLTGDKUHUIn5jUAq/oJ4Plr0QBKyVfoh+gkd5b1gFOOkilG31uHoR4tn6ten6aqCm0xJvuNjuqHLGmV0INTz/3Sc6rmzKz7E58OTZta16Bphzi7IVMwb8zluvcOMei6BTMOqsbaT4QDUYF2FEStP1F/3snQDx2YJ9ce/IVI0yli1gep/8KidAieMKGVHzKFxDD6FrysN7alwlm0KiWXA85ea8JsEVQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufMRh-0000g1-V2 for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 3/5] gnu: clementine: Replace libmygpo-qt with libmygpo-qt5. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jul 2025 17:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75720@debbugs.gnu.org Cc: Sughosha Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.17534653272445 (code B ref 75720); Fri, 25 Jul 2025 17:43:01 +0000 Received: (at 75720) by debbugs.gnu.org; 25 Jul 2025 17:42:07 +0000 Received: from localhost ([127.0.0.1]:35955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufMQp-0000dM-EK for submit@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:07 -0400 Received: from layka.disroot.org ([178.21.23.139]:43116) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ufMQl-0000ci-Ur for 75720@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:05 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BFBA825F2D; Fri, 25 Jul 2025 19:42:02 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LKKHlSeGNZNo; Fri, 25 Jul 2025 19:42:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1753465321; bh=NWxWs2FLSv7W4mSK2smzdVguLUQ/Ox98wiulde3MFhA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=grbIDGGv4Y6XB0k8gt+CtFRnJZJ23Y5SX6mvU6ZLahEWxLBRhLVslWQjsmJYb38QX LYRDV7Q73W8/2r0BeE90u+SpbowGwpqyeg228xY2ET9jZlU1TWbQN9dwpw77coWZqF TM4v7tipl8cRMpPiHDKWu1nc5dz7CqdAaorpaO+nydSCVxGgHdkLe6Cu9w9KW6dRs9 BKxagBHDPuZZ6XE71ivpe2CresjVPzXfDPFh9Y5WdXXADmJhhJN/7aunWPoapji+sG TKjlBqYmcrjqKeItpTRvZPVLuT49/YBwboV3ouVdXIuG2FatT3wW6V271pUFABtJzQ xzRUqj6WSA8Eg== Date: Fri, 25 Jul 2025 23:05:00 +0530 Message-ID: <20250725173502.14568-3-sughosha@disroot.org> In-Reply-To: <20250725173502.14568-1-sughosha@disroot.org> References: <20250725173502.14568-1-sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/music.scm (clementine)[inputs]: Replace libmygpo-qt with libmygpo-qt5. Change-Id: Icf03ea42b1ac13d534eb5421248b4f77d304f581 --- gnu/packages/music.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index d11099d0c5..ffdfefe333 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -573,7 +573,7 @@ (define-public clementine gst-plugins-good gst-libav libcdio - libmygpo-qt + libmygpo-qt5 libgpod libmtp libxml2 From patchwork Fri Jul 25 17:35:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43265 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D0A9D27BC49; Fri, 25 Jul 2025 18:43:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9524F27BC49 for ; Fri, 25 Jul 2025 18:43:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufMRp-0001zh-JM; Fri, 25 Jul 2025 13:43:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufMRj-0001xq-EW for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufMRj-0006HV-5I for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4Xa4nyoZsH5tTpy0zhijW5VWEgWn93JYLEIrUCwdjbU=; b=MQ4+fKmxGFY7e58F1XlOTv3iOgubefpleD1PxF+LATYWjwEqmbkEvY7d9vaH4k7adImva7VKJyfFSahqyWsNKffSjhxpRhR8tfXcXdyd5r8cKqqjfEVKk+ZIaNBTXNWdp5bYnSIzCmLoW4FrwEaYOGUTUuSyCCIJ9P2xRheWkA6T5UotQc4IUxayEtMKJ1P8bwzRdl0MW3b5+VCA8HUxNTQH5zh4erQrp9MJtHeFZ/O3XR6GIOcBtwEWOOzTyu42xDVufxSOYrYDZ/7qIZPcEYyFKw0MfRAx9+nhABHnCMKSdS+NNSMYTYYFyNBYQjYCdbENojY8haISHuas8AqAdA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufMRi-0000gI-Vg for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 4/5] gnu: mariadb: Enable embedded server. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jul 2025 17:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75720@debbugs.gnu.org Cc: Sughosha Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.17534653332472 (code B ref 75720); Fri, 25 Jul 2025 17:43:02 +0000 Received: (at 75720) by debbugs.gnu.org; 25 Jul 2025 17:42:13 +0000 Received: from localhost ([127.0.0.1]:35959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufMQv-0000dl-78 for submit@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:13 -0400 Received: from layka.disroot.org ([178.21.23.139]:43126) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ufMQm-0000cn-S7 for 75720@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:06 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id AE66425F3C; Fri, 25 Jul 2025 19:42:03 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id kQSsq46kBzUo; Fri, 25 Jul 2025 19:42:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1753465322; bh=IVEQjl8Am0OrbXXEuNmINpsxPPvOKgwT8kAZqfj5WO0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MLsnuz8wnUTnDntNDm78bLlLQCI3hghm3TtL56m1P6mPL3+N/HIiLJnhRWFtSiled 2KybZOUr9/gSiPdbP3+lsn7ZXH+KIJKUse5Cf6HTAGfJ2DRyBMvqp9AzdkdiWPvWIS SkaoI1pUk3z7DesVyp51CTMbZauDcVwQYa9xkp0VpWztpyTXMu676ZVBcfgiSiMR98 rGIlDIo5bXkyxLT8VjNSe9yofR1qx/7iAtbmfDTfPZm0HdArsVK+xLtYmNSxU6Z7uD YiOxbLDENREj/lbJqama2ZlREMmxrrbi821dYNk94bG7cePU78J6YRgukIxTymZ2aZ EK0fHSkGOkzYA== Date: Fri, 25 Jul 2025 23:05:01 +0530 Message-ID: <20250725173502.14568-4-sughosha@disroot.org> In-Reply-To: <20250725173502.14568-1-sughosha@disroot.org> References: <20250725173502.14568-1-sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/databases.scm (mariadb)[arguments]<#:configure-flags>: Add "-DWITH_EMBEDDED_SERVER=ON". Change-Id: Iac091d06407b3a86b19e7241c93f9c38e451188d --- gnu/packages/databases.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 5deb363095..71c536bb3f 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1102,6 +1102,9 @@ (define-public mariadb "-DWITH_SSL=system" "-DWITH_ZLIB=system" + ;; Enable embedded server. + "-DWITH_EMBEDDED_SERVER=ON" + "-DDEFAULT_CHARSET=utf8" "-DDEFAULT_COLLATION=utf8_general_ci" "-DMYSQL_DATADIR=/var/lib/mysql" From patchwork Fri Jul 25 17:35:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43267 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DC21E27BC4B; Fri, 25 Jul 2025 18:43:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 40C4527BC49 for ; Fri, 25 Jul 2025 18:43:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufMRz-00023j-IF; Fri, 25 Jul 2025 13:43:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufMRl-0001yn-7G for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufMRk-0006I2-8A for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=2BMi5aJOCGrxb2jY432K7cm3ks61FAMuagslgV/JLzE=; b=Ldh5jqGOKct4PJLhH0Nx7UBpyxvl9nJS+2WUA1fWqSt+sAoyWH8rRCII2Rp4x2JC5QSax9TSAPzwM+CGn6SfBuVG8fqU/dKFDVIhRExQkBgoXfl21QW0umfqNze1nKx+zTPcnDQq4QCvmsobxyzdbDDDlAhiEp5i6DERUU88CYePXvlEENllBWU/Rp2NOWcdpU7M6A7smd3mjzmITS43VG3nQtXFG9bcdhgmygWpYCQoM0BdK5dsyC1pDSzBX4psO6Hpknem7VJ0job5yJGoDZ3ZQikjhJfCVFfl3M4s0PiUP99ZEMx9UDJbUuxJKdtDyosRbFKJFdTf/mK+cHrHMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufMRk-0000gX-1a for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 5/5] gnu: Add amarok. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jul 2025 17:43:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75720@debbugs.gnu.org Cc: Sughosha Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.17534653352495 (code B ref 75720); Fri, 25 Jul 2025 17:43:04 +0000 Received: (at 75720) by debbugs.gnu.org; 25 Jul 2025 17:42:15 +0000 Received: from localhost ([127.0.0.1]:35963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufMQw-0000e1-Lg for submit@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:15 -0400 Received: from layka.disroot.org ([178.21.23.139]:52688) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ufMQo-0000cr-FO for 75720@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:07 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 55AF420EA2; Fri, 25 Jul 2025 19:42:05 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9YsOC4vrAKFm; Fri, 25 Jul 2025 19:42:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1753465323; bh=UoLlVCYX8proPHqKYi8byNgX85MK0lMAhTnnwHjxHhw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XnMgP2IHi6ov0S4dFXYWRw84JBLNrCkHjT78jfJvQrvYymnGrDUrZFj9Zx1ePwypX HdQjb7NcscmvgPr/AH+y0GSJO645We7V2ei3oBoXxsX3LUny+ZFgOq8jwG9So82zpK 7cu+rq2DvsHQQeuL7ugVvNZbF7y1O9pImb+Jeya5Nnsf2CdAJpHZIzVyU/SgaRNmof opUiKLpgwU+T5MaGyLGCdAE1Jr9xpxQC2ScNEC17ZaYn0z9BcZNFtKyIt/hKyDxFV5 FR+rr9yvhArvOvHppjSJcupytPBqVKKp1XAKcm5b8wnLVcVt6o6zG0weUg8GV65uXz gGNhr8wrn2zFQ== Date: Fri, 25 Jul 2025 23:05:02 +0530 Message-ID: <20250725173502.14568-5-sughosha@disroot.org> In-Reply-To: <20250725173502.14568-1-sughosha@disroot.org> References: <20250725173502.14568-1-sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-multimedia.scm (amarok): New variable. Change-Id: I5e13887f744c693e06536eb0c683a4fd473212c6 --- gnu/packages/kde-multimedia.scm | 115 ++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 600a868238..d23c6fa1fd 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -32,14 +32,19 @@ (define-module (gnu packages kde-multimedia) #:use-module (guix utils) #:use-module (guix gexp) #:use-module (gnu packages) + #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) + #:use-module (gnu packages check) + #:use-module (gnu packages crypto) + #:use-module (gnu packages databases) #:use-module (gnu packages docbook) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages gpodder) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) @@ -47,6 +52,7 @@ (define-module (gnu packages kde-multimedia) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) #:use-module (gnu packages music) @@ -55,6 +61,7 @@ (define-module (gnu packages kde-multimedia) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages tls) #:use-module (gnu packages video) #:use-module (gnu packages vulkan) #:use-module (gnu packages xiph) @@ -101,6 +108,114 @@ (define-public audiocd-kio (license ;; GPL for programs, FDL for documentation (list license:gpl2+ license:fdl1.2+)))) +(define-public amarok + (package + (name "amarok") + (version "3.3.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/amarok/" version + "/amarok-" version ".tar.xz")) + (sha256 + (base32 + "1b7i9zqkrr6izj07453h8m1zqx5r9sb7d46qlh795gql7ixmikid")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:configure-flags + #~(list "-DBUILD_WITH_QT6=ON") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'check-setup + (lambda _ + ;; Set home directory. + (setenv "HOME" "/tmp") + ;; testplaylistlayout looks for "amarok/data" directory in + ;; $XDG_DATA_DIRS. Maybe it is for testing after installing. + ;; As a workaround, set XDG_DATA_DIRS pointing to $TMPDIR + ;; which contains "amarok/data" directory. + (let ((linktarget (string-append (dirname (getcwd)) + "/amarok"))) + (if (not (equal? (basename (getcwd)) "amarok")) + (symlink (getcwd) linktarget)) + (setenv "XDG_DATA_DIRS" + (string-append (getenv "XDG_DATA_DIRS") ":" + (dirname linktarget)))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; testsqlscanmanager fails, even when run manually. + (invoke "ctest" "-E" "testsqlscanmanager"))))))) + (native-inputs + (list extra-cmake-modules + googletest kdoctools + `(,mariadb "dev") + pkg-config + qttools)) + (inputs + ;; TODO: Add packages containing "gstreamer-cdda-1.0" and + ;; "gstreamer-netbuffer-1.0" modules. + (list ffmpeg + fftw + glib + gstreamer + gst-plugins-bad + gst-plugins-base + gst-plugins-good + gst-plugins-ugly + gst-libav + karchive + kcodecs + kcolorscheme + kconfig + kconfigwidgets + kcoreaddons + kcmutils + kcrash + kdbusaddons + kdnssd + kglobalaccel + kguiaddons + ki18n + kiconthemes + kio + kirigami + knotifications + kpackage + kstatusnotifieritem + ktexteditor + ktextwidgets + kwallet + kwidgetsaddons + kwindowsystem + libofa + libmtp + libmygpo-qt + libxcrypt + `(,mariadb "lib") + openssl + python + qt5compat + qtsvg + qtwebengine + solid + taglib + threadweaver)) + (home-page "https://amarok.kde.org/") + (synopsis "Audio player for KDE") + (description + "Amarok is a music player and collection manager. It features: +@itemize +@item dynamic playlists matching different criteria, +@item collection managing with rating support, +@item support for basic MTP and UMS music player devices, +@item integrated internet services such as Magnatune, Ampache and more, +@item scripting support, +@item cover manager and +@item replay gain support +@end itemize") + (license license:gpl2+))) + (define-public dragon (package (name "dragon")