From patchwork Sat Aug 23 07:30:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43400 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 A0A3027BC4A; Sat, 23 Aug 2025 08:32:32 +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,URIBL_BLOCKED autolearn=unavailable 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 33C4927BC49 for ; Sat, 23 Aug 2025 08:32:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upijN-0001Vq-RQ; Sat, 23 Aug 2025 03:32:05 -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 1upijL-0001V6-TC for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32: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 1upijL-0000jj-KB for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32: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=9gL+6oMyzkfN3vW63ZjWrVG8Hp/B4+kec8WJX9hY6ak=; b=ZekKELiwRLz3G0Xg0GJbaOo4LdsXJk2IGFS6PLSeBbjgJ0kSXXekByc/ghjXDpgI71mnaqgSxOEdfaUwzDtaGpJawjvHKfAjyzoz/dQLrjk9zz8nmFgVM+/CG8300YkV5EHERegylFvL8Xj5AQ2VZU2Yzpxx+NJbmAjj1pqGnNL5kELARJvJaJQ3vZ2rnv5D3hW0Bhd0OGl+Ph9klOzZqrjoFZwhr1tSl3YnrZl7ztwZr3yp5nomXmD4yy9m6HxDB7l8hrU2lOuJ0bRX/oZb6+H04NyYMsnFrDFgcWERh7KtrzT0+QtRLDmBJkpnwRNfdoTjN4qs2ijJIJtnTs8FRg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1upijL-0005EV-Gj for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v7 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: Sat, 23 Aug 2025 07:32: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.175593429920019 (code B ref 75720); Sat, 23 Aug 2025 07:32:03 +0000 Received: (at 75720) by debbugs.gnu.org; 23 Aug 2025 07:31:39 +0000 Received: from localhost ([127.0.0.1]:38580 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upiiw-0005Cn-QI for submit@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:39 -0400 Received: from layka.disroot.org ([178.21.23.139]:50482) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upiit-0005CQ-Ep for 75720@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:36 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 57A8525C0F; Sat, 23 Aug 2025 09:31:34 +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 hCLgU6oaP4cg; Sat, 23 Aug 2025 09:31:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1755934293; bh=xUEyMUGparbL/13XioclTSLOA87oqMENemuajJu3Mtc=; h=From:To:Cc:Subject:Date; b=JOT/jPJCXcvom5fIOyDo9/4THENigFpNXjQRjWhbacCwSFKJ+93VaviBCcW5UZ8FU cUqA0qRpzLgbMShMKfsCmNEYPISSOqvlhQ70DyrdNy7Gz0pe+IslXiYTzdRzzej0IC gbAxNxEYP43firehiZiiDEfI8wlIb0wL2sUBFuDej8/cmva5lUfrXDpB/6zwBKuB23 E/aldf8MUb2KfSB4vShFqW+Azb99ZofgYptc4/V0h5neqLUA4+2QKS6FTZNiIJNe3A dQeXw7NOR6FxTcUiPDBJUfHR/gXJ35k565jt5b5t+lDfh3uSX67SMOZuDWMoC1gcmT YYs4cplcGai2w== Date: Sat, 23 Aug 2025 13:00:59 +0530 Message-ID: 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]: Use HTTPS. : Remove field. [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 | 24 +++--- .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 ------------------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------------ 4 files changed, 14 insertions(+), 141 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 base-commit: 48fea09d68d575e82c986c93785786165bd95f82 diff --git a/gnu/local.mk b/gnu/local.mk index 0bc9365199..7f490ad819 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1766,8 +1766,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..f4f2e124e6 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/" + (uri (string-append "https://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 Sat Aug 23 07:31:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43403 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 67B8C27BC4B; Sat, 23 Aug 2025 08:32:47 +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,URIBL_BLOCKED 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 358C127BC49 for ; Sat, 23 Aug 2025 08:32:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upijN-0001VU-EL; Sat, 23 Aug 2025 03:32:05 -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 1upijM-0001VF-DO for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32: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 1upijM-0000jr-3a for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32: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=t+OlK4TytMLsAINyuH/U9FlOh4wxf6FK/yh2xbWRq7c=; b=dE2SyX/C450WCk8PGRzxQDpVUPykc0VS6DqN4nabE78wmwGXjntE68mBJFStz9coDNMFRE9U35AUAjZtexWPB/9lsCql+eSElOSzlAL3ClI1cpOkImlHTnLYtGYVrMC2/Uouo//2M2bDmZ0YemVEsZ9TZ44D9OwHN6vv9yLpfU4TP1qo1KKkduVImxmLc/Barbso0AgBL8WDd/6YYT2ML1tXWyglvg7rg2N6o/Mc7M3gp0nCatD6a+v0w/ctkgzxTJhChktT5zdrSdccqbrVUZNwidjvDt/G2GLvlIMMRhPAiLQbloGnEFa3CG6ifJart1HxWlbGP/07LzEj86QJJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1upijL-0005Ed-Ul for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v7 2/5] gnu: libmygpo-qt5: New variable. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Aug 2025 07:32: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.175593430020026 (code B ref 75720); Sat, 23 Aug 2025 07:32:03 +0000 Received: (at 75720) by debbugs.gnu.org; 23 Aug 2025 07:31:40 +0000 Received: from localhost ([127.0.0.1]:38583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upiix-0005Cq-Os for submit@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:40 -0400 Received: from layka.disroot.org ([178.21.23.139]:50496) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upiiu-0005CS-HN for 75720@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:36 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7FFBC24E32; Sat, 23 Aug 2025 09:31:35 +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 aBK8V10Tthqm; Sat, 23 Aug 2025 09:31:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1755934294; bh=lZsEYbvwb1Boir2QDZ9hKm9kLNG0yChWRwnqVt1D7lI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bmn9eMsoY60spl+HvCn8+ng9qBSYLYot7C9Vacrssg3uSGWY7CMOaxPUDBm0V314A n3bZK0B9lQKrMDd3xSRLDyLyBAuTLFJDV1HytejJxn6IVQwPAje0OgirAojbrpUxSc +F9s40NmzTQyX9voArFiz+cEe2jbwdymkwfqn/JP06kY5CuAhAcGI/ImVX/EXmRS14 CodRaabfIdRIm9ZmcKZpt2DkGM7rXOGHhk3sGyj5w3c4Nq6YmYa7tWO/A/ChDURVj4 TBqpFv9HP0f7YDM+yhs1fPRqHRoeENnKCwJ6M2ut6OXbyWVIzWTBhKh40mg9l2uRmz JglHRQNI3Fl7Q== Date: Sat, 23 Aug 2025 13:01:00 +0530 Message-ID: In-Reply-To: References: 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 f4f2e124e6..2d81265d08 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 Sat Aug 23 07:31:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43401 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 9952927BC4B; Sat, 23 Aug 2025 08:32:42 +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,URIBL_BLOCKED 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 6A74127BC49 for ; Sat, 23 Aug 2025 08:32:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upijQ-0001Xk-81; Sat, 23 Aug 2025 03:32:08 -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 1upijN-0001VQ-V1 for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32: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 1upijM-0000jw-LS for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32: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=UQvmbe9y9TfB9LjTsWU72CKFaJ1TibTCjtlPJX+Z3+U=; b=BhYSID17P1znFR+rxClKh1cyxQd4rz6yb0e3k1LAL59JYgjKouD+ajAPND0zWtFrzTYhf6CBOk1x0mbOWr68AgNQSXtuCuGL9me+vbHMwqvqdUfgmnSKYBMewEWCSPxg2w9PvcDzGqBmS3WYIpLu8aWhH7tAFchfbGBZmOiM9RXpBtQLrnpOW3zZTIE84S4HjXw9fjeouZQCVJGyOFTHkqFtPM0BHrhnx93qqWW1NADodtUUxUrMpMnf7YzcJhcL8AzSB657hs6m1fH0lVQBQzUc63M+O5Gx84Rys3/BOeFBsecOoKaveQuItpkeWfev7358A+CEWjwkER5Dar2cjA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1upijM-0005Ek-HK for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v7 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: Sat, 23 Aug 2025 07:32: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.175593430320048 (code B ref 75720); Sat, 23 Aug 2025 07:32:04 +0000 Received: (at 75720) by debbugs.gnu.org; 23 Aug 2025 07:31:43 +0000 Received: from localhost ([127.0.0.1]:38586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upij1-0005DI-58 for submit@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:43 -0400 Received: from layka.disroot.org ([178.21.23.139]:50502) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upiiv-0005Cf-Vy for 75720@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:38 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1D31525EC4; Sat, 23 Aug 2025 09:31:37 +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 QOWHZnluQ-xX; Sat, 23 Aug 2025 09:31:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1755934296; bh=ET7CAA7fEorUSZOjsSjguS5P2/01kpEXiLWT123FW4k=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ayWdk9MuvNNypJglmmEXwbq3dni3894S5aPrR6Jq7/TLtt2DGVrISSj2EjuZ0gmJM vWFwAjoCc21lLBPXkEFjHVA7osal4lgk6kIik/PN3im5OJTLvsWUFWeFPUL81L13uC xEcVeiRc8Y/8APX+Hf00fNdiVjmHsnvflIaLyQ2G0XUqGo6rTBSgK0Qrkt080G/Ec/ pP7eHYRO/Hndof2gJnlv6vfnGP83m7Bkv8M5qc+ckxu/tPicw6nmMQ8/Xm/3yPOdxM dy/EQ7+pLqcjdyJm1WswWYw5wavVHno7dANMqzfVUUablYkSG8E/uPR1QvtB6wlpgo xF3+cIJQdif+w== Date: Sat, 23 Aug 2025 13:01:01 +0530 Message-ID: <71ac6626b8ac312bb14358be765c98a60cdc35a7.1755934262.git.sughosha@disroot.org> In-Reply-To: References: 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 7190dfcd57..60ac2d29ef 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -582,7 +582,7 @@ (define-public clementine gst-plugins-good gst-libav libcdio - libmygpo-qt + libmygpo-qt5 libgpod libmtp libxml2 From patchwork Sat Aug 23 07:31:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43399 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 BE15427BC4A; Sat, 23 Aug 2025 08:32:31 +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,URIBL_BLOCKED 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 3F59527BC4B for ; Sat, 23 Aug 2025 08:32:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upijO-0001XA-UL; Sat, 23 Aug 2025 03:32:06 -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 1upijN-0001Va-F5 for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32: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 1upijN-0000k2-67 for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32:05 -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=LlAAkfdHxPjBVr3N5rBkrrDyuhgAmboZFyGfZeUhYGc=; b=SuFqr+5DAENyt8w61cj//3IjHCHmTftxKDYcqC4829ETbLMTL1d0VyionlTlJHkLx1/DVgEg3+hdKAzlNWcY1oCuZfD/MVV6W+075dvkY1GF+MdCMueXAsX1PeB2Xsq3pMTa7Btu0moWWpeUJmy4ZrceMoLGhjpFAUf1bpg2mKHXDmtTtF7eX7c786KjZMpsEgZGF260CIDdzdnk+LZcyrmr5URKLWy+qi/3/Tpt7z1KmOpKDKkKoDJ7vioMdUglmzg3bvUim8RAVOJV1CwEmqPkmtrqvGG2TbNSbOLeqh3SWJXKYb1vuK/nsTalSUtyevJhm9srxy+eE36YsDdAXw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1upijN-0005Es-2A; Sat, 23 Aug 2025 03:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v7 4/5] gnu: Add mariadb-embedded. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 23 Aug 2025 07:32:05 +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 , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.175593430620060 (code B ref 75720); Sat, 23 Aug 2025 07:32:05 +0000 Received: (at 75720) by debbugs.gnu.org; 23 Aug 2025 07:31:46 +0000 Received: from localhost ([127.0.0.1]:38588 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upij3-0005DT-Jz for submit@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:45 -0400 Received: from layka.disroot.org ([178.21.23.139]:50506) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upiix-0005Ch-4E for 75720@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:41 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2AFD125C0F; Sat, 23 Aug 2025 09:31:38 +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 m32JLFHiYWQ7; Sat, 23 Aug 2025 09:31:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1755934297; bh=803CmMAk33KTZP9HlWy70eh1b0/IHtOawxQMW2Z4Gu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QGuLlsNPu/FcwEJiYvmfCfBza3B+RLdQ6otFnpeB7Z4zhKgZlwUgPvBSgdmUDMLTv A0HoaEuY1KDHNouUxnI30+WSSH8+0W6PrJqRE37EBlfWY7HkZCBwf9q0H0lcwLZyoo JgJ0rpVFdu+v/LM+HqI9uC9X70Uj+xbLCdUjxxQhHOiAJOome5Bmo/Cg6GlcoqAw8s iJjsT0Xs0WURsVnIXbow5URLY+IJCUZcOJlMaU0ta9PZk9XjbYG7rUnoQiXfKBtJ1a gzVRUFYolvjoToI41wbnSZig3kcBZagIJxcJH4M7Q4wJPTzz7MdzEk5x+whfTWU91r Yd27Ic5CJInrg== Date: Sat, 23 Aug 2025 13:01:02 +0530 Message-ID: <0ebf2a456588ed269477226d58c3e279e10e11da.1755934262.git.sughosha@disroot.org> In-Reply-To: References: 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-embedded): New variable. Change-Id: I0ba6c8110dea449d38594b4e8c76a7eeb5e0d76d --- gnu/packages/databases.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 1500fbe145..de42e23ae4 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1403,6 +1403,13 @@ (define-public mariadb as a drop-in replacement of MySQL.") (license license:gpl2))) +(define-public mariadb-embedded + (package/inherit mariadb + (arguments + (substitute-keyword-arguments (package-arguments mariadb) + ((#:configure-flags flags) + #~(append '("-DWITH_EMBEDDED_SERVER=ON") #$flags)))))) + (define-public mariadb-connector-c (package (name "mariadb-connector-c") From patchwork Sat Aug 23 07:31:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43402 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 48FD327BC4B; Sat, 23 Aug 2025 08:32:46 +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,URIBL_BLOCKED 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 8CE3927BC49 for ; Sat, 23 Aug 2025 08:32:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1upijP-0001XE-Ef; Sat, 23 Aug 2025 03:32: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 1upijO-0001WO-4y for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32:06 -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 1upijN-0000kB-RV for guix-patches@gnu.org; Sat, 23 Aug 2025 03:32:05 -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=04CjqzQazEbfW2OYAndsSbiH4d4JuWgCewbXmPRQrTI=; b=LtE+7A37w5pab7pm1KRw5MZXUZ3eV3MAZ2r1egabZmLA94ee5HkLV1CdxawSyCDjHFSQw3PRFKNqbDLMZiy7+8NPjWizvL0y7pU0DXaRl0HiILeERWLEjVio3jvhOtSE5tdYB+quXfRn8RkTWdOBCSoketCfrBTLWmS7m3mYz246UczboirM+s+VRoeKjPq0N23SnUaAlb0zmnnPDfhbrzJHAKtzrVVwaNt6HdRzvzo44rMM7IXIjeeiHRcbiFZwBoRT4w0aByJME+SnqN84c1rt9gT38y0O5LdM4NBkIAvyQ34u506uSzhZYIPQEoohSmwQpffuikgJwUSTM0v/jg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1upijN-0005F0-He; Sat, 23 Aug 2025 03:32:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v7 5/5] gnu: Add amarok. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: sughosha@disroot.org, z572@z572.online, guix-patches@gnu.org Resent-Date: Sat, 23 Aug 2025 07:32:05 +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 , Sughosha , Zheng Junjie X-Debbugs-Original-Xcc: Sughosha , Zheng Junjie Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.175593430620067 (code B ref 75720); Sat, 23 Aug 2025 07:32:05 +0000 Received: (at 75720) by debbugs.gnu.org; 23 Aug 2025 07:31:46 +0000 Received: from localhost ([127.0.0.1]:38590 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upij3-0005DW-UT for submit@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:46 -0400 Received: from layka.disroot.org ([178.21.23.139]:50508) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upij0-0005D4-0Y for 75720@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:42 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E216325FC2; Sat, 23 Aug 2025 09:31:40 +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 jrxFcA34s6WB; Sat, 23 Aug 2025 09:31:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1755934299; bh=kzslFxEoePhwC48AOTbMAOBj7t4AdCqtU1Qwq7RMfdY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Nt0jsVLyOSviCMqHxsu8ZJfXDbU12dgfk2bGxq00ZD8Hhq/vp9X/8UjdOnUVLLVQd wlsEkuNiJsVuJwfbg2x6RKgVS+V7Op/JiyhZPbjZUm+2qwt1qkh3JXLVUrmhtTAaBF Ihw9nGrYEUr8RntQA0YAz/HFu+/6Rmv4m04vEmZesn7KWf2973JSU+hnL5CqundGgV R3rRKvyjJHaI58u1f4w1P3JcKnkjv+FflVvZtOw+4wKtmMEHgE5hS1CGycGOquXuHk DBM1iI1GoQ7wTxwRvIoqObzrzvmPbOYwxo1ERW529V33nNHuzlEe/puHa4JAUiQEU6 COyfqNqJgeMEA== Date: Sat, 23 Aug 2025 13:01:03 +0530 Message-ID: <54855fa0ca08d6f5d5323da4879ddec6d13736d7.1755934263.git.sughosha@disroot.org> In-Reply-To: References: 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: I9e32dfde4c15eba6452e5c5275bd1b1779fe296c --- gnu/packages/kde-multimedia.scm | 116 ++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 10d652012b..6191099733 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) @@ -103,6 +110,115 @@ (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.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/amarok/" version + "/amarok-" version ".tar.xz")) + (sha256 + (base32 + "00cw6gk1vhc5ch2jri90lma5jbkah3bq1dmyzg49bnq77aljwvrr")))) + (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-embedded "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-embedded "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")