From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH 0/4] gnu: Add amarok. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 02:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 75720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75720@debbugs.gnu.org Cc: Sughosha X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.173742652417567 (code B ref -1); Tue, 21 Jan 2025 02:29:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Jan 2025 02:28:44 +0000 Received: from localhost ([127.0.0.1]:52681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta40R-0004ZG-Tu for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:28:44 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58458) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta40N-0004Yo-3Z for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:28:41 -0500 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 1ta40H-0006AO-2Q for guix-patches@gnu.org; Mon, 20 Jan 2025 21:28:33 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ta40F-0004Bz-3L for guix-patches@gnu.org; Mon, 20 Jan 2025 21:28:32 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6783525C5C; Tue, 21 Jan 2025 03:28:27 +0100 (CET) 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 HRECy5YhZSGH; Tue, 21 Jan 2025 03:28:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737426503; bh=KBfxv/T3bZmMxF105tC8RGpJWxOrCICnfxYb1GFLYBU=; h=From:To:Cc:Subject:Date; b=JEBzLCF8ysW1YoF9wPwbsxmgORv/LvccGOQM6Yf+luDs158Iya9K+kiKDiQYhcGnY 74zAK5aQNhapFR2a5OgmFzPn9/vIxHlH+pkt3ElE9kiWkJFJ2tJM6YFqPgORp3t7TL KlM7P9+R1LKfH/3HWcLUSQja4XaRQ9mZGFrw5oQC5XiaHZMF+DentOKkO/VlfaAXG7 zQitBPliT9ezvvwaiwClVYMxOnh3qBADS+Yw2/RDl6PlURD9ExYKpk57tvob52iOnT xvA/U9VQIb+gVlM1PY0vUS4kuL4uFqB8pLIGgm853YgvhLVBVqc4D5hyy0JyykwRw2 utbeOKw9sV9cw== From: Sughosha Date: Tue, 21 Jan 2025 07:57:39 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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.1 (/) This series adds amarok. Sughosha (4): gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. gnu: Add libmygpo-qt6. gnu: Add taglib-extras. gnu: Add amarok. gnu/local.mk | 4 +- gnu/packages/gpodder.scm | 70 ++++---- gnu/packages/kde-multimedia.scm | 97 +++++++++++ gnu/packages/mp3.scm | 29 ++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 +++++++++++++++++ .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 8 files changed, 472 insertions(+), 158 deletions(-) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch base-commit: 7aae0e2c159b1612b405a372b18f25fbb58f9d82 -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH 2/4] gnu: Add libmygpo-qt6. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 02:32: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.173742669829970 (code B ref 75720); Tue, 21 Jan 2025 02:32:01 +0000 Received: (at 75720) by debbugs.gnu.org; 21 Jan 2025 02:31:38 +0000 Received: from localhost ([127.0.0.1]:52704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta43F-0007nC-Ee for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:38 -0500 Received: from layka.disroot.org ([178.21.23.139]:57696) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ta43C-0007mz-Tl for 75720@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:35 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 56ED825941; Tue, 21 Jan 2025 03:31:33 +0100 (CET) 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 dyYR2o04uoUN; Tue, 21 Jan 2025 03:31:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737426692; bh=tQTPw/0e0x/5nHZJIauQAcShDxNOSEP2B1TMMHV+3s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Jige3D35dtKuXxI2T6RnQDYDmrxeizj8mtX3ZfXfP8Nkutoh87zBUhFd+M/eW1j+a v3bD2FRvikkxyb3pC7TaRkh5MajjpnuqebDISaYJAgrzzdcdOhxBwcCHzswfQtCpsa rvF8RNo+gCt9B+bFKFYYoKiekizkulehjhESWXCr0RDJJ24IGc+lMPIQU05iry+xFE 0dm6/ucPAM4KGp3S8APy7MJIb9iUsR2Ij41xbXs2H9wdmNVdqCICvJ+Czsv9DEhH4X EkVAYSZVFSvtSEUsMfl39rl+e9MpdlovhN6zYF1a5Oh6fQYCGQwN1ZroVTYaLoAPhS IY5DPZZXLfjpg== From: Sughosha Date: Tue, 21 Jan 2025 08:00:40 +0530 Message-ID: <65ed10695f1c56db5018bb40b31a3a6a7bfcc0d4.1737426135.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/gpodder.scm (libmygpo-qt6): New variable. Change-Id: Ie9c0257f570147293ec695df312982a98bc9d1a7 --- gnu/packages/gpodder.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 1baca35f06..a7fb845625 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -161,6 +161,17 @@ (define-public libmygpo-qt track podcasts.") (license license:lgpl2.1+)))) +(define-public libmygpo-qt6 + (package/inherit libmygpo-qt + (name "libmygpo-qt6") + (arguments + (substitute-keyword-arguments (package-arguments libmygpo-qt) + ((#:configure-flags flags) + #~(append '("-DBUILD_WITH_QT6=ON") #$flags)))) + (inputs + (modify-inputs (package-inputs libmygpo-qt) + (replace "qtbase" qtbase))))) + (define-public python-mygpoclient (package (name "python-mygpoclient") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH 1/4] gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 02:32: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.173742670429997 (code B ref 75720); Tue, 21 Jan 2025 02:32:02 +0000 Received: (at 75720) by debbugs.gnu.org; 21 Jan 2025 02:31:44 +0000 Received: from localhost ([127.0.0.1]:52706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta43K-0007na-Ps for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:44 -0500 Received: from layka.disroot.org ([178.21.23.139]:45594) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ta43E-0007n7-Gy for 75720@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:38 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8ACD125954; Tue, 21 Jan 2025 03:31:35 +0100 (CET) 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 gTUdA-DDLz29; Tue, 21 Jan 2025 03:31:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737426691; bh=Fjcz3kRO2yJGl4zJEDO1GZ0wtkS3gffdE1Pig3nLIbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YCGVKMagjCoX8WItrLPz32bWib9Apq6R9oq5TK+m/iFmzDLGMQMWEAk7rPtNOj/9A CLQO6aiXHFvtgP13S4oPQfA6PyPMcsrsAQ63Qowf3sUqpu2pcu3PmwazPik8ba9yAW iZrVMrppawMUzIvKmAqkYKKqr1nAZ+0viwOZYsAoY0ntmAtWGtJRm7wJM4e8sNb7kR idOCtIsN//ABAeqbRewemNPhvuJZZ5uNOaL9aFRvkF/NwP7lbqM3WfJggAnq4gMiuX qX8ZWUYMRHcPorhiJAxsxYbPBc7gL/rTCaQT0pQgu2ccL6QGZBAHnuP7cksLsatjSE F+spTHRkZtjmw== From: Sughosha Date: Tue, 21 Jan 2025 08:00:39 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) 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.3 (/) * gnu/packages/gpodder.scm (libmygpo-qt): Update to 1.1.0-0.4d1f482. [source]: Switch to git-fetch; update patches. [home-page]: Update URL. * gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch: New file. * 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 files and register the new file. Change-Id: I5cc3fbc8bfbfa7d88843448a2b5b8ef0fa5df60a --- gnu/local.mk | 3 +- gnu/packages/gpodder.scm | 61 +++---- .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 5 files changed, 187 insertions(+), 159 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5fb354caae..ccfd860b17 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1738,8 +1738,7 @@ 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/libmygpo-qt-suppot-building-with-qt6.patch \ %D%/packages/patches/libpciaccess-hurd64.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index c3e1c9b496..1baca35f06 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -127,34 +127,39 @@ (define-public gpodder (license license:gpl3+))) (define-public libmygpo-qt - (package - (name "libmygpo-qt") - (version "1.1.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")))) - (build-system cmake-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list qtbase-5)) - (arguments - '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") - ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 - ;; is fixed. - #:tests? #f)) - (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 -@url{https://gpodder.net} APIs. It allows applications to discover, manage -and track podcasts.") - (license license:lgpl2.1+))) + (let ((commit "4d1f48291791c64f029e69138e3bc7fb6a851610") + (revision "0")) + (package + (name "libmygpo-qt") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/gpodder/libmygpo-qt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bxv8blyq66600i8skxmccb1lnmliz90378kck4f6j2ynry2114b")) + (patches + (search-patches "libmygpo-qt-suppot-building-with-qt6.patch")))) + (build-system cmake-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list qtbase-5)) + (arguments + '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") + ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 + ;; is fixed. + #:tests? #f)) + (home-page "https://wiki.gpodder.org/wiki/Libmygpo-qt") + (synopsis "Qt/C++ library wrapping the gpodder web service") + (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the +@url{https://gpodder.net} APIs. It allows applications to discover, manage and +track podcasts.") + (license license:lgpl2.1+)))) (define-public python-mygpoclient (package 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 ) diff --git a/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch new file mode 100644 index 0000000000..efdbe7623d --- /dev/null +++ b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch @@ -0,0 +1,153 @@ +From 42e19dcb6b7c07460f05aa1d4586d5c76236c6d0 Mon Sep 17 00:00:00 2001 +From: Tuomas Nurmi +Date: Mon, 8 Jul 2024 17:03:32 +0300 +Subject: [PATCH] Minimal changes to make Qt6 compilation possible + +Untested. Compiles, with a bunch of deprecation warnings. +There's likely room for improvement all around. +--- + CMakeLists.txt | 24 +++++++++--------------- + libmygpo-qt.pc.in | 1 - + src/CMakeLists.txt | 4 ++-- + src/DeviceList.cpp | 2 +- + tests/CMakeLists.txt | 12 +++++++++--- + 5 files changed, 21 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a79ddc..920e841 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,10 +5,10 @@ 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" OFF) ++option(BUILD_WITH_QT6 "Build libmygpo-qt with Qt6" OFF) + option(MYGPO_BUILD_TESTS "Build all unit tests" ON) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + if( MYGPO_BUILD_TESTS ) + find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) + else() +@@ -23,27 +23,21 @@ if( NOT BUILD_WITH_QT4 ) + # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for + # Qt5 + set(MYGPO_QT_MAJOR_VERSION "5") +- set(MYGPO_QT4_QJSON_DEP "") + 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") ++ message(STATUS "Could not find Qt5, searching for Qt6 instead...") + if( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork QtTest REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network Test REQUIRED ) + else( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network REQUIRED ) + endif() +- set( QT_DONT_USE_QTGUI TRUE ) +- include( ${QT_USE_FILE} ) ++ set(MYGPO_QT_VERSION_SUFFIX 6) + + macro(qt_wrap_cpp) +- qt4_wrap_cpp(${ARGN}) ++ qt6_wrap_cpp(${ARGN}) + endmacro() + +- set(MYGPO_QT_MAJOR_VERSION "") +- set(MYGPO_QT4_QJSON_DEP "Requires.private: QJson") ++ set(MYGPO_QT_MAJOR_VERSION "6") + +- # QJson is only required for Qt4 +- find_package(QJSON REQUIRED) + endif() + + # Don't use absolute path in Mygpo-qtTargets-$buildType.cmake +@@ -51,7 +45,7 @@ endif() + # set(QT_USE_IMPORTED_TARGETS TRUE) + + set( MYGPO_QT_VERSION_MAJOR "1" ) +-set( MYGPO_QT_VERSION_MINOR "1" ) ++set( MYGPO_QT_VERSION_MINOR "2" ) + set( MYGPO_QT_VERSION_PATCH "0" ) + set( MYGPO_QT_VERSION "${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO_QT_VERSION_PATCH}" ) + +diff --git a/libmygpo-qt.pc.in b/libmygpo-qt.pc.in +index 8403e48..520bd52 100644 +--- a/libmygpo-qt.pc.in ++++ b/libmygpo-qt.pc.in +@@ -8,6 +8,5 @@ Description: libmygpo-qt is a C++/Qt Library that wraps the gpodder.net WebAPI + URL: http://wiki.gpodder.org/wiki/Libmygpo-qt + Version: @MYGPO_QT_VERSION@ + Requires: Qt@MYGPO_QT_MAJOR_VERSION@Core Qt@MYGPO_QT_MAJOR_VERSION@Network +-@MYGPO_QT4_QJSON_DEP@ + Libs: -L${libdir} -lmygpo-qt@MYGPO_QT_VERSION_SUFFIX@ + Cflags: -I${includedir} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 253e81e..9d1989c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -81,10 +81,10 @@ add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC + + set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + 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}) ++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt6::Core Qt6::Network) + endif() + + install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) +diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp +index e972318..92e29cc 100644 +--- a/src/DeviceList.cpp ++++ b/src/DeviceList.cpp +@@ -64,7 +64,7 @@ bool DeviceListPrivate::parse( const QVariant& data ) + DevicePtr ptr( new Device( var, this ) ); + m_devicesList.append( ptr ); + QVariant v; +- v.setValue( ptr ); ++ v.setValue( QSharedPointer(ptr) ); + devList.append( v ); + } + m_devices = devList; +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 4f77158..ce63689 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -11,14 +11,18 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU + + # UrlBuilder library + add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( UrlBuilder Qt5::Core ) ++else() ++ target_link_libraries( UrlBuilder Qt6::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}) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) ++else() ++ target_link_libraries( JsonCreator Qt6::Core Qt6::Network ) + endif() + + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) +@@ -29,8 +33,10 @@ 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}) +- if( NOT BUILD_WITH_QT4 ) ++ if( NOT BUILD_WITH_QT6 ) + target_link_libraries(${_name} Qt5::Network Qt5::Test) ++ else() ++ target_link_libraries(${_name} Qt6::Network Qt6::Test) + endif() + endmacro(add_libmygpo_test) + -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH 3/4] gnu: Add taglib-extras. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 02:32: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.173742670530008 (code B ref 75720); Tue, 21 Jan 2025 02:32:02 +0000 Received: (at 75720) by debbugs.gnu.org; 21 Jan 2025 02:31:45 +0000 Received: from localhost ([127.0.0.1]:52709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta43N-0007nv-6o for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:45 -0500 Received: from layka.disroot.org ([178.21.23.139]:45608) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ta43K-0007nY-UE for 75720@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:43 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 02C0225941; Tue, 21 Jan 2025 03:31:42 +0100 (CET) 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 6M7dwbNYt8DG; Tue, 21 Jan 2025 03:31:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737426697; bh=P6wMv0lEIVTl1k4yAAFzOeyzrWXSCS8fFAVs1ujdRpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lPRr7kTuFe3LyQx0CtpypjL2cR/Qs4Cfr1rM+ha6OodqkKpKI8sHDDpW1WSDNSRuB EsMAozrcwAoMc2sDF1TVSvTY2r+Xw+30mwcDYWdJ2pJ+KiPmYCJO68wjtF4WvRRPcU 8qW87Ncmd5EYgsjGVhacQ7Z743klOnSLh19XyQ4RnRoVkPo2bdAN5M453b/joUfozU juDDL+R9lCtJ/fiTDpvzdoME7SGL8lH7xMydjDCTo3di6XqjNog3GWuSWcYdyzP4A3 WbOMKPP64tV5iIkNMYbFqwldfxd+B1JWQOQDS6edpgVN3bV9j+mpemBhd3/C4YzhBA cmo/Ih3gEYDXw== From: Sughosha Date: Tue, 21 Jan 2025 08:00:41 +0530 Message-ID: <5a1471dbdc2792cbfc44aa30f57593681e16de69.1737426135.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/mp3.scm (taglib-extras): New variable. Change-Id: I6b4ad693001c89e576fadbb02d981d43f7d568ab --- gnu/packages/mp3.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 32a1ddea27..25682c5a6e 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -60,6 +60,7 @@ (define-module (gnu packages mp3) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -274,6 +275,34 @@ (define-public taglib ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1. (license (list license:lgpl2.1 license:mpl1.1)))) +(define-public taglib-extras + (package + (name "taglib-extras") + ;; 2 changes after mentioning version 1.0.2 in ChangeLog, which fixes + ;; finding taglib. + (version "1.0.2-2") + (source + (origin + (method svn-fetch) + (uri + (svn-reference + (url "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib-extras") + (revision 1444333))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1qsima3ln6j63mzdp5y1yjaijxvk3wnriwld5ijdp1xv1dx4hqjc")))) + (build-system cmake-build-system) + (inputs + (list taglib)) + (arguments + (list #:tests? #f)) ;no test suite + (home-page "https://websvn.kde.org/trunk/kdesupport/taglib-extras") + (synopsis "Additional TagLib plugins") + (description + "This package provides TagLib plugins for Audible and RealMedia tags.") + (license (list license:lgpl2.1+ license:gpl2+)))) + (define-public minimp3 ;; The latest commit is used as there is no release. (let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH 4/4] gnu: Add amarok. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Jan 2025 02: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.173742671530037 (code B ref 75720); Tue, 21 Jan 2025 02:32:03 +0000 Received: (at 75720) by debbugs.gnu.org; 21 Jan 2025 02:31:55 +0000 Received: from localhost ([127.0.0.1]:52712 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta43W-0007oN-Ke for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:55 -0500 Received: from layka.disroot.org ([178.21.23.139]:37864) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ta43N-0007nw-VM for 75720@debbugs.gnu.org; Mon, 20 Jan 2025 21:31:46 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 17DEE25C00; Tue, 21 Jan 2025 03:31:45 +0100 (CET) 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 rdRoDr0qq3aq; Tue, 21 Jan 2025 03:31:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737426700; bh=UuTh12iUzCi1+0it4Ka4X4qeERBnVuE+62eKQa9lm7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IB59gbpJSU0RAsJ+lVc1CM55M3suhSBxqwop7j7q61ym3xAGkdTMKp5YF3pNuX+9j U9n+Es9gY2paXHk2jz+ciBvjouObWhfIj/Ail6z5YoCZw3GQmTWM/GghyhvF8LWqHJ dD3MOy7DlX2H7LYJUibog/sdFZRYYfUP40EZUatJyd1c5iVKqDpuvHVo9hI19E2Edh zKAfhpfse6ARzuMIi5blHf/BpjQ6rcC4VzaWBZ9yiDfMk4Ax3pNyGBiE6iPq8etYPf JFjjX6D8/t0OJvT6rVuPZE7uuCf7ef4IoZexJYxBOIR/b7hCWusmjmENuhhsFEsP5x X7monu2049mmg== From: Sughosha Date: Tue, 21 Jan 2025 08:00:42 +0530 Message-ID: <4cd9e2f6e7d48140fb1b07466c62d8933ac6e371.1737426135.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/kde-multimedia.scm (amarok): New variable. * gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch: New file * gnu/local.mk: Register the new file. Change-Id: I6d1329fc6c2f6deb795ebd566438d1818bc19db1 --- gnu/local.mk | 1 + gnu/packages/kde-multimedia.scm | 97 ++++++++++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 ++++++++++++++++++ 3 files changed, 246 insertions(+) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index ccfd860b17..faa0e29b16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -980,6 +980,7 @@ dist_patch_DATA = \ %D%/packages/patches/ibus-anthy-fix-tests.patch \ %D%/packages/patches/ibus-table-paths.patch \ %D%/packages/patches/anki-mpv-args.patch \ + %D%/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 4b0e170b79..873b207b2a 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -31,14 +31,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) @@ -46,6 +51,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) @@ -54,6 +60,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 xiph) #:use-module (gnu packages xml) @@ -98,6 +105,96 @@ (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.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/amarok-" version + "/amarok-" version ".tar.xz")) + (sha256 + (base32 + "14r7iismx28nnh3jhkhczhrsmsap9by8p3kfhkp7d5678c7l62g4")) + (patches + (search-patches "amarok-3.2.1-fix-including-mygpo-qt6.patch")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:configure-flags + #~(list "-DBUILD_WITH_QT6=ON") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; Set home directory. + (setenv "HOME" "/tmp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Test excluding testplaylistlayout which fails. + (invoke "ctest" "-E" "testplaylistlayout"))))))) + (native-inputs + (list extra-cmake-modules googletest kdoctools pkg-config qttools)) + (inputs + (list ffmpeg + fftw + glib + 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-qt6 + libxcrypt + `(,mariadb "dev") + openssl + phonon + phonon-backend-vlc + python + qt5compat + qtsvg + qtwebengine + solid + taglib + taglib-extras + 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") diff --git a/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch new file mode 100644 index 0000000000..d23954cf80 --- /dev/null +++ b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch @@ -0,0 +1,148 @@ +This patch fixes including headers of libmygpo-qt6 when built with qt6. + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h 2025-01-21 06:40:56.069282183 +0530 +@@ -22,7 +22,14 @@ + + #include "core/playlists/PlaylistProvider.h" + #include "core/podcasts/PodcastMeta.h" ++ ++#include ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + namespace Podcasts { + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-21 05:22:06.974221089 +0530 +@@ -20,7 +20,12 @@ + #define GPODDERPODCASTREQUESTHANDLER_H_ + + #include "GpodderServiceModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-21 05:16:21.674470671 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERPODCASTTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + class GpodderPodcastTreeItem: public GpodderTreeItem + { +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h 2025-01-21 05:21:29.153812018 +0530 +@@ -23,8 +23,15 @@ + #include "core/podcasts/PodcastProvider.h" + #include "core/podcasts/PodcastReader.h" + #include "GpodderPodcastMeta.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/file/KConfigSyncRelStore.h" + #include "playlistmanager/PlaylistManager.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp +--- amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp 2025-01-21 05:17:27.675190295 +0530 +@@ -27,8 +27,15 @@ + #include "GpodderServiceModel.h" + #include "GpodderServiceView.h" + #include "GpodderSortFilterProxyModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/PlaylistManager.h" + #include "widgets/SearchWidget.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h 2025-01-21 05:20:32.517198664 +0530 +@@ -20,8 +20,15 @@ + #define GPODDERSERVICEMODEL_H_ + + #include "GpodderTreeItem.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "NetworkAccessManagerProxy.h" + + #include +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h 2025-01-21 05:18:10.983661774 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERTAGTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h 2025-01-21 06:33:35.948536483 +0530 +@@ -19,13 +19,18 @@ + #ifndef GPODDERTREEITEM_H_ + #define GPODDERTREEITEM_H_ + +-#include +-#include +- + #include + #include + #include + ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ++#include ++#include ++#else ++#include ++#include ++#endif ++ + + class GpodderTreeItem : public QObject + { -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v2 0/5] gnu: Add amarok. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 03:48: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.173751767515065 (code B ref 75720); Wed, 22 Jan 2025 03:48:01 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Jan 2025 03:47:55 +0000 Received: from localhost ([127.0.0.1]:58867 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taRic-0003uv-Jq for submit@debbugs.gnu.org; Tue, 21 Jan 2025 22:47:54 -0500 Received: from layka.disroot.org ([178.21.23.139]:40086) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taRiZ-0003uk-JG for 75720@debbugs.gnu.org; Tue, 21 Jan 2025 22:47:53 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C04C825921; Wed, 22 Jan 2025 04:47:49 +0100 (CET) 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 irEPoUEoVtu9; Wed, 22 Jan 2025 04:47:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737517657; bh=gHb0CNX0BbDpFtCAdDo0OnUEiFbdiWflSOJbTG9o72I=; h=From:To:Cc:Subject:Date; b=RDbB0q6n+ZAnSSI0eAESvAsvs+/9F/YWnNXUF7UNgW9s+YzHEccYxRmUDwMkvMcCc 1IgXEMCnLEm3mUsC/8+pmJeMFSMEHJDhtApvBN/99V6BMzPrgZmTiCTk5nWa1DOK3I 9FUQWgQmScz8nLpP6kymVebSP9kiF+mRebZ4njlqasaTABhAD4WxRbtI4QpiCWngGq gOHSPFUUrz9u6cuLDqFEae+awjlK4sO1T1+53g9YvY9sukE/kA4eEH24Dpb55rZfUO cnpQMn74jupRA8nOROJv6CQm6ixJXQ6KdCU3BI1rYx5rWIWETewOZy4mQudmL2UvbT k7/Y9E+fJdceQ== From: Sughosha Date: Wed, 22 Jan 2025 09:16:57 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) This patch series adds amarok. In this v2 series, these changes are made: * Embedded server (libmysqld) in mariadb is enabled. * testplaylistlayout test in amarok is passed. Sughosha (5): gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. gnu: Add libmygpo-qt6. gnu: Add taglib-extras. gnu: mariadb: Enable embedded server. gnu: Add amarok. gnu/local.mk | 4 +- gnu/packages/databases.scm | 3 + gnu/packages/gpodder.scm | 70 ++++---- gnu/packages/kde-multimedia.scm | 109 +++++++++++++ gnu/packages/mp3.scm | 29 ++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 +++++++++++++++++ .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 9 files changed, 487 insertions(+), 158 deletions(-) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch base-commit: 7aae0e2c159b1612b405a372b18f25fbb58f9d82 -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v2 2/5] gnu: Add libmygpo-qt6. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 03:50: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.173751775915295 (code B ref 75720); Wed, 22 Jan 2025 03:50:01 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Jan 2025 03:49:19 +0000 Received: from localhost ([127.0.0.1]:58873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taRjs-0003yM-9m for submit@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:19 -0500 Received: from layka.disroot.org ([178.21.23.139]:59166) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taRjq-0003y0-8n for 75720@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:10 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2D1C725C4D; Wed, 22 Jan 2025 04:49:08 +0100 (CET) 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 aAYcoCqB0ZuE; Wed, 22 Jan 2025 04:49:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737517743; bh=tQTPw/0e0x/5nHZJIauQAcShDxNOSEP2B1TMMHV+3s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EYsOPWWZwYBVmip7GwEqKTUqC9L5jJroJ4R0lt6A84RV99plrAQNgFgxqzLICj3qu syqPMIKhECfu4RTwFgXLdRjvLEhd14Y5e6uVjzVozeRSY0B8gLxDAdDic6ME7sGn3A 2srM2s07uCK1Q6/44O0xILypjkA/NhPg2NOKcFCgHEsTaVX7odwASXbc/zQjYKGF5I o3EN1WejtbEjarkDSO/DHQnWKTCY+H4kpyrI7/eAJF/WcYQiWWsVsYMmYPFr0shAel WvMKyqJDv8yq3lbwn3mA8AIqrDKV6oj8FWFkx3eal9YJeTRflUK+D6Yu5XrpFf/Nzb ulFtIUzeu2wiw== From: Sughosha Date: Wed, 22 Jan 2025 09:18:01 +0530 Message-ID: <65ed10695f1c56db5018bb40b31a3a6a7bfcc0d4.1737511788.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/gpodder.scm (libmygpo-qt6): New variable. Change-Id: Ie9c0257f570147293ec695df312982a98bc9d1a7 --- gnu/packages/gpodder.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 1baca35f06..a7fb845625 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -161,6 +161,17 @@ (define-public libmygpo-qt track podcasts.") (license license:lgpl2.1+)))) +(define-public libmygpo-qt6 + (package/inherit libmygpo-qt + (name "libmygpo-qt6") + (arguments + (substitute-keyword-arguments (package-arguments libmygpo-qt) + ((#:configure-flags flags) + #~(append '("-DBUILD_WITH_QT6=ON") #$flags)))) + (inputs + (modify-inputs (package-inputs libmygpo-qt) + (replace "qtbase" qtbase))))) + (define-public python-mygpoclient (package (name "python-mygpoclient") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v2 3/5] gnu: Add taglib-extras. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 03:50: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.173751775915303 (code B ref 75720); Wed, 22 Jan 2025 03:50:02 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Jan 2025 03:49:19 +0000 Received: from localhost ([127.0.0.1]:58877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taRjz-0003ye-67 for submit@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:19 -0500 Received: from layka.disroot.org ([178.21.23.139]:59180) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taRjq-0003y2-H2 for 75720@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:11 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 8D2B725D27; Wed, 22 Jan 2025 04:49:09 +0100 (CET) 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 tKphmNdBJlZq; Wed, 22 Jan 2025 04:49:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737517745; bh=P6wMv0lEIVTl1k4yAAFzOeyzrWXSCS8fFAVs1ujdRpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MgmWNAHDE16d9r+cbuotOZ9iuVJ+JpMn9O1V2xTkShEZFqNhekNG1j5xJzl4qzcgK NfR/BoWSFweXArhi434AcO8640Kum+evAlWgyKCxYTYK3n2ZkplN8eIJ9KSNuirZ5x WOjb41K2ntL4kgwabd2LtwWfOmr5WNUfTbrsFI+Vyil/K8VlZdC1A5qID5qN2q9GJn Yt5HCacoQP9ovLkAp6715kKLiYZOcdZOXElWRwdEaL9qP9p/mlKqAnlTNmFpqPCOkh /6CNF5OSP5Sl+CfANMDQHW3jzfYUJO9RAD9WUejPPoNwXrwGa8KtluUI8Gqdnew3g/ 0gQkRrAL9XpNQ== From: Sughosha Date: Wed, 22 Jan 2025 09:18:02 +0530 Message-ID: <5a1471dbdc2792cbfc44aa30f57593681e16de69.1737511788.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/mp3.scm (taglib-extras): New variable. Change-Id: I6b4ad693001c89e576fadbb02d981d43f7d568ab --- gnu/packages/mp3.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 32a1ddea27..25682c5a6e 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -60,6 +60,7 @@ (define-module (gnu packages mp3) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -274,6 +275,34 @@ (define-public taglib ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1. (license (list license:lgpl2.1 license:mpl1.1)))) +(define-public taglib-extras + (package + (name "taglib-extras") + ;; 2 changes after mentioning version 1.0.2 in ChangeLog, which fixes + ;; finding taglib. + (version "1.0.2-2") + (source + (origin + (method svn-fetch) + (uri + (svn-reference + (url "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib-extras") + (revision 1444333))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1qsima3ln6j63mzdp5y1yjaijxvk3wnriwld5ijdp1xv1dx4hqjc")))) + (build-system cmake-build-system) + (inputs + (list taglib)) + (arguments + (list #:tests? #f)) ;no test suite + (home-page "https://websvn.kde.org/trunk/kdesupport/taglib-extras") + (synopsis "Additional TagLib plugins") + (description + "This package provides TagLib plugins for Audible and RealMedia tags.") + (license (list license:lgpl2.1+ license:gpl2+)))) + (define-public minimp3 ;; The latest commit is used as there is no release. (let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v2 1/5] gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 03:50: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.173751776115313 (code B ref 75720); Wed, 22 Jan 2025 03:50:03 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Jan 2025 03:49:21 +0000 Received: from localhost ([127.0.0.1]:58879 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taRjz-0003ym-PI for submit@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:21 -0500 Received: from layka.disroot.org ([178.21.23.139]:59164) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taRjn-0003xy-Rn for 75720@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:12 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id F050225C2D; Wed, 22 Jan 2025 04:49:06 +0100 (CET) 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 aPLg6NGTGOhW; Wed, 22 Jan 2025 04:49:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737517742; bh=Fjcz3kRO2yJGl4zJEDO1GZ0wtkS3gffdE1Pig3nLIbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LwmU+FyUeHsR3FQr9YY2R41jm/EhMjoTnQTRAO2HCfL7omErLzwzmPuTwYuJDJJOD NEJjR4gPVBwvNVVIJotUVLS52m9HKDMkOaEQk+EemVjDAitVf3SaVGEJVMAqu9ydK2 kEk1i1L62Z20J0AYM25FNSI97N3hqPUTfXJrogWXe0bCfSXpWl66eCJv2LRba1QDGU +uNUWlMpeZuD76Jqm+KpH+54wXif7qlwccRNhBmcUvzhit7RH/fNtJ1TNQGYnQErh/ iO+mXzU+Ja47ChOJbpkEIz2Fh397H0Zcc8cWYHD2HvntDKwWJPW5+QdrHuiFdRXUI/ dFHkN9SN9S68A== From: Sughosha Date: Wed, 22 Jan 2025 09:18:00 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) 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.3 (/) * gnu/packages/gpodder.scm (libmygpo-qt): Update to 1.1.0-0.4d1f482. [source]: Switch to git-fetch; update patches. [home-page]: Update URL. * gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch: New file. * 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 files and register the new file. Change-Id: I5cc3fbc8bfbfa7d88843448a2b5b8ef0fa5df60a --- gnu/local.mk | 3 +- gnu/packages/gpodder.scm | 61 +++---- .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 5 files changed, 187 insertions(+), 159 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5fb354caae..ccfd860b17 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1738,8 +1738,7 @@ 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/libmygpo-qt-suppot-building-with-qt6.patch \ %D%/packages/patches/libpciaccess-hurd64.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index c3e1c9b496..1baca35f06 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -127,34 +127,39 @@ (define-public gpodder (license license:gpl3+))) (define-public libmygpo-qt - (package - (name "libmygpo-qt") - (version "1.1.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")))) - (build-system cmake-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list qtbase-5)) - (arguments - '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") - ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 - ;; is fixed. - #:tests? #f)) - (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 -@url{https://gpodder.net} APIs. It allows applications to discover, manage -and track podcasts.") - (license license:lgpl2.1+))) + (let ((commit "4d1f48291791c64f029e69138e3bc7fb6a851610") + (revision "0")) + (package + (name "libmygpo-qt") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/gpodder/libmygpo-qt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bxv8blyq66600i8skxmccb1lnmliz90378kck4f6j2ynry2114b")) + (patches + (search-patches "libmygpo-qt-suppot-building-with-qt6.patch")))) + (build-system cmake-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list qtbase-5)) + (arguments + '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") + ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 + ;; is fixed. + #:tests? #f)) + (home-page "https://wiki.gpodder.org/wiki/Libmygpo-qt") + (synopsis "Qt/C++ library wrapping the gpodder web service") + (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the +@url{https://gpodder.net} APIs. It allows applications to discover, manage and +track podcasts.") + (license license:lgpl2.1+)))) (define-public python-mygpoclient (package 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 ) diff --git a/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch new file mode 100644 index 0000000000..efdbe7623d --- /dev/null +++ b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch @@ -0,0 +1,153 @@ +From 42e19dcb6b7c07460f05aa1d4586d5c76236c6d0 Mon Sep 17 00:00:00 2001 +From: Tuomas Nurmi +Date: Mon, 8 Jul 2024 17:03:32 +0300 +Subject: [PATCH] Minimal changes to make Qt6 compilation possible + +Untested. Compiles, with a bunch of deprecation warnings. +There's likely room for improvement all around. +--- + CMakeLists.txt | 24 +++++++++--------------- + libmygpo-qt.pc.in | 1 - + src/CMakeLists.txt | 4 ++-- + src/DeviceList.cpp | 2 +- + tests/CMakeLists.txt | 12 +++++++++--- + 5 files changed, 21 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a79ddc..920e841 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,10 +5,10 @@ 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" OFF) ++option(BUILD_WITH_QT6 "Build libmygpo-qt with Qt6" OFF) + option(MYGPO_BUILD_TESTS "Build all unit tests" ON) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + if( MYGPO_BUILD_TESTS ) + find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) + else() +@@ -23,27 +23,21 @@ if( NOT BUILD_WITH_QT4 ) + # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for + # Qt5 + set(MYGPO_QT_MAJOR_VERSION "5") +- set(MYGPO_QT4_QJSON_DEP "") + 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") ++ message(STATUS "Could not find Qt5, searching for Qt6 instead...") + if( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork QtTest REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network Test REQUIRED ) + else( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network REQUIRED ) + endif() +- set( QT_DONT_USE_QTGUI TRUE ) +- include( ${QT_USE_FILE} ) ++ set(MYGPO_QT_VERSION_SUFFIX 6) + + macro(qt_wrap_cpp) +- qt4_wrap_cpp(${ARGN}) ++ qt6_wrap_cpp(${ARGN}) + endmacro() + +- set(MYGPO_QT_MAJOR_VERSION "") +- set(MYGPO_QT4_QJSON_DEP "Requires.private: QJson") ++ set(MYGPO_QT_MAJOR_VERSION "6") + +- # QJson is only required for Qt4 +- find_package(QJSON REQUIRED) + endif() + + # Don't use absolute path in Mygpo-qtTargets-$buildType.cmake +@@ -51,7 +45,7 @@ endif() + # set(QT_USE_IMPORTED_TARGETS TRUE) + + set( MYGPO_QT_VERSION_MAJOR "1" ) +-set( MYGPO_QT_VERSION_MINOR "1" ) ++set( MYGPO_QT_VERSION_MINOR "2" ) + set( MYGPO_QT_VERSION_PATCH "0" ) + set( MYGPO_QT_VERSION "${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO_QT_VERSION_PATCH}" ) + +diff --git a/libmygpo-qt.pc.in b/libmygpo-qt.pc.in +index 8403e48..520bd52 100644 +--- a/libmygpo-qt.pc.in ++++ b/libmygpo-qt.pc.in +@@ -8,6 +8,5 @@ Description: libmygpo-qt is a C++/Qt Library that wraps the gpodder.net WebAPI + URL: http://wiki.gpodder.org/wiki/Libmygpo-qt + Version: @MYGPO_QT_VERSION@ + Requires: Qt@MYGPO_QT_MAJOR_VERSION@Core Qt@MYGPO_QT_MAJOR_VERSION@Network +-@MYGPO_QT4_QJSON_DEP@ + Libs: -L${libdir} -lmygpo-qt@MYGPO_QT_VERSION_SUFFIX@ + Cflags: -I${includedir} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 253e81e..9d1989c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -81,10 +81,10 @@ add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC + + set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + 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}) ++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt6::Core Qt6::Network) + endif() + + install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) +diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp +index e972318..92e29cc 100644 +--- a/src/DeviceList.cpp ++++ b/src/DeviceList.cpp +@@ -64,7 +64,7 @@ bool DeviceListPrivate::parse( const QVariant& data ) + DevicePtr ptr( new Device( var, this ) ); + m_devicesList.append( ptr ); + QVariant v; +- v.setValue( ptr ); ++ v.setValue( QSharedPointer(ptr) ); + devList.append( v ); + } + m_devices = devList; +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 4f77158..ce63689 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -11,14 +11,18 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU + + # UrlBuilder library + add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( UrlBuilder Qt5::Core ) ++else() ++ target_link_libraries( UrlBuilder Qt6::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}) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) ++else() ++ target_link_libraries( JsonCreator Qt6::Core Qt6::Network ) + endif() + + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) +@@ -29,8 +33,10 @@ 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}) +- if( NOT BUILD_WITH_QT4 ) ++ if( NOT BUILD_WITH_QT6 ) + target_link_libraries(${_name} Qt5::Network Qt5::Test) ++ else() ++ target_link_libraries(${_name} Qt6::Network Qt6::Test) + endif() + endmacro(add_libmygpo_test) + -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v2 4/5] gnu: mariadb: Enable embedded server. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 03:50: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 , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.173751776115320 (code B ref 75720); Wed, 22 Jan 2025 03:50:04 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Jan 2025 03:49:21 +0000 Received: from localhost ([127.0.0.1]:58881 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taRk1-0003yw-37 for submit@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:21 -0500 Received: from layka.disroot.org ([178.21.23.139]:59184) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taRjt-0003yP-Pa for 75720@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:14 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C308125C4F; Wed, 22 Jan 2025 04:49:12 +0100 (CET) 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 n1FnyF22VhNl; Wed, 22 Jan 2025 04:49:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737517747; bh=wsrPGz9ux9zIOJamIdNTqFp0p0mYP+GMELQANaQf+As=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Wv0B0LQTi7Xz8TsLTiggB+j2i5TxV4v8xaSAPwjcimW7ECvhuqCnZqsx9zEGOWPx0 8lCxN1nxRPbooGNSzG4eBUiX08xS/W+YTgRuowF8GKnpLgoVJK2R7M72CArX1m1MfO e5FlpoVjdUta714g5ZM9zoZxfdyXvTul22Gg/SqhhHFR1apMPWMZs78orEF/hLSugD CVYIkG7ln99jJtGWev0nqAqdrpBAlozmlHoqH1OxpP02hMkLkcGLWFASeiLa64JVU2 bLyyO3DQfAcRaOZul1D6uXi1bqwXT8PZDn1ikp9Pwy3XmtdufMwv7veLpiC8felnV+ iYhSnQSfqGYbw== From: Sughosha Date: Wed, 22 Jan 2025 09:18:03 +0530 Message-ID: <1afb14d7dcdb9e3a17f5c449e1382a17e5dac006.1737511788.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 c0749d5b64..ec85b9eaa1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -1040,6 +1040,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" -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v2 5/5] gnu: Add amarok. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Jan 2025 03:50: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 Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.173751778015366 (code B ref 75720); Wed, 22 Jan 2025 03:50:05 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Jan 2025 03:49:40 +0000 Received: from localhost ([127.0.0.1]:58883 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1taRkG-0003zi-HG for submit@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:40 -0500 Received: from layka.disroot.org ([178.21.23.139]:36288) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1taRjy-0003yZ-3q for 75720@debbugs.gnu.org; Tue, 21 Jan 2025 22:49:22 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 39F3B25A3E; Wed, 22 Jan 2025 04:49:17 +0100 (CET) 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 4J2iXQ0-E_7Y; Wed, 22 Jan 2025 04:49:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737517752; bh=WQI5V4Ig0dZP1qjPGcD3yR4njMcgUvAK9kk2fuTlJzo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ENcBK5uA9REtJEHNUpUJTexw+UHx8Ci11NC+8jZ4IozTOtz1Kyi9SYhS41P71lakd 5Lv6pcqRv8uROo16NbpsGiT55iPaTcTfSo7+fupJhQx9AgQoZdjDVSkVD3kkw0K62m buKHuMLPmeDgvJ1rnHq1V8/ATwkDOKJ8S6lV/2IGCAmeh8IwEz9nFPZjS397gMR0R1 BZOkGz9VM3MMGHJLciOAUbK0V8oGOSWF5OmrzdkTAFgFJrC7fBZ/V27VSUHCoBtMvL turzwLN4fJ24xoojHI2bRZZvMiT4oqS/Q/5mm0zayk3Ghrn8qZmpwxn2tUE8c/emRK Fm4eH4otngvoQ== From: Sughosha Date: Wed, 22 Jan 2025 09:18:04 +0530 Message-ID: <1b332885f07bbbb7a79cb10adee0eaa65429e013.1737511788.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/kde-multimedia.scm (amarok): New variable. * gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch: New file * gnu/local.mk: Register the new file. Change-Id: I2d89102a7bb8448464e6def9f052a70b45ac1624 --- gnu/local.mk | 1 + gnu/packages/kde-multimedia.scm | 109 +++++++++++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 ++++++++++++++++++ 3 files changed, 258 insertions(+) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index ccfd860b17..faa0e29b16 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -980,6 +980,7 @@ dist_patch_DATA = \ %D%/packages/patches/ibus-anthy-fix-tests.patch \ %D%/packages/patches/ibus-table-paths.patch \ %D%/packages/patches/anki-mpv-args.patch \ + %D%/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 4b0e170b79..2e93e3483f 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -31,14 +31,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) @@ -46,6 +51,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) @@ -54,6 +60,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 xiph) #:use-module (gnu packages xml) @@ -98,6 +105,108 @@ (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.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/amarok-" version + "/amarok-" version ".tar.xz")) + (sha256 + (base32 + "14r7iismx28nnh3jhkhczhrsmsap9by8p3kfhkp7d5678c7l62g4")) + (patches + (search-patches "amarok-3.2.1-fix-including-mygpo-qt6.patch")))) + (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 pkg-config qttools)) + (inputs + (list ffmpeg + fftw + glib + 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-qt6 + libxcrypt + `(,mariadb "dev") + `(,mariadb "lib") + openssl + phonon + phonon-backend-vlc + python + qt5compat + qtsvg + qtwebengine + solid + taglib + taglib-extras + 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") diff --git a/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch new file mode 100644 index 0000000000..d23954cf80 --- /dev/null +++ b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch @@ -0,0 +1,148 @@ +This patch fixes including headers of libmygpo-qt6 when built with qt6. + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h 2025-01-21 06:40:56.069282183 +0530 +@@ -22,7 +22,14 @@ + + #include "core/playlists/PlaylistProvider.h" + #include "core/podcasts/PodcastMeta.h" ++ ++#include ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + namespace Podcasts { + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-21 05:22:06.974221089 +0530 +@@ -20,7 +20,12 @@ + #define GPODDERPODCASTREQUESTHANDLER_H_ + + #include "GpodderServiceModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-21 05:16:21.674470671 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERPODCASTTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + class GpodderPodcastTreeItem: public GpodderTreeItem + { +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h 2025-01-21 05:21:29.153812018 +0530 +@@ -23,8 +23,15 @@ + #include "core/podcasts/PodcastProvider.h" + #include "core/podcasts/PodcastReader.h" + #include "GpodderPodcastMeta.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/file/KConfigSyncRelStore.h" + #include "playlistmanager/PlaylistManager.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp +--- amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp 2025-01-21 05:17:27.675190295 +0530 +@@ -27,8 +27,15 @@ + #include "GpodderServiceModel.h" + #include "GpodderServiceView.h" + #include "GpodderSortFilterProxyModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/PlaylistManager.h" + #include "widgets/SearchWidget.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h 2025-01-21 05:20:32.517198664 +0530 +@@ -20,8 +20,15 @@ + #define GPODDERSERVICEMODEL_H_ + + #include "GpodderTreeItem.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "NetworkAccessManagerProxy.h" + + #include +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h 2025-01-21 05:18:10.983661774 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERTAGTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h 2025-01-21 06:33:35.948536483 +0530 +@@ -19,13 +19,18 @@ + #ifndef GPODDERTREEITEM_H_ + #define GPODDERTREEITEM_H_ + +-#include +-#include +- + #include + #include + #include + ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ++#include ++#include ++#else ++#include ++#include ++#endif ++ + + class GpodderTreeItem : public QObject + { -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v3 0/5] gnu: Add amarok. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Feb 2025 16:08: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.173842602316210 (code B ref 75720); Sat, 01 Feb 2025 16:08:01 +0000 Received: (at 75720) by debbugs.gnu.org; 1 Feb 2025 16:07:03 +0000 Received: from localhost ([127.0.0.1]:59698 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teG1P-0004DN-Do for submit@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:03 -0500 Received: from layka.disroot.org ([178.21.23.139]:48098) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teG1M-0004Cv-7E for 75720@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:01 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A4D8C25D7C; Sat, 1 Feb 2025 17:06:58 +0100 (CET) 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 HESBmRofmrFn; Sat, 1 Feb 2025 17:06:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738426009; bh=sUAZ2/RwfbNn7yy7zUQS0ovpPsKgJ3GCGNzehqb29+A=; h=From:To:Cc:Subject:Date; b=MDbid3YKVSSUTFijYTutC9H8Vhd9DuFiGZK+Y1yUngl3d+n1Ua+eTna97GVDYflOm LG5izPqLcz4+iML4HYzBZ2GdjdpS2zXzTMOCPwQwIg97n5eL7cfxMqd3LXKc1jF5Iz flQjuEnbcJ3c6yZujXwBmCWOt7b7AzNqydzYvfPMK4oICm1SQQt4bXQ2z91RQExSjJ 0PYYsmv62cwvLtuHIk77zq0UHZo/8Sa/UUZw9OlAgCk0z4bA6q0VtLk8zrDpuSLK9f G4Zp2GDf9fnRDQpNczfDU5gPwMa+jjlArNJjQftaBLULf6wi4dD6hfA9lZCpamLMY8 ISdJbEMCFMq9w== From: Sughosha Date: Sat, 1 Feb 2025 21:34:36 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) In this version the URL of the source is fixed. Sughosha (5): gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. gnu: Add libmygpo-qt6. gnu: Add taglib-extras. gnu: mariadb: Enable embedded server. gnu: Add amarok. gnu/local.mk | 4 +- gnu/packages/databases.scm | 3 + gnu/packages/gpodder.scm | 70 ++++---- gnu/packages/kde-multimedia.scm | 109 +++++++++++++ gnu/packages/mp3.scm | 29 ++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 +++++++++++++++++ .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 9 files changed, 487 insertions(+), 158 deletions(-) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch base-commit: 5a6c66f7919fbe79251cd425ae6952e67acbe94c -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v3 2/5] gnu: Add libmygpo-qt6. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Feb 2025 16:08: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.173842604316249 (code B ref 75720); Sat, 01 Feb 2025 16:08:02 +0000 Received: (at 75720) by debbugs.gnu.org; 1 Feb 2025 16:07:23 +0000 Received: from localhost ([127.0.0.1]:59701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teG1i-0004E1-Qc for submit@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:23 -0500 Received: from layka.disroot.org ([178.21.23.139]:33656) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teG1g-0004Dr-Ub for 75720@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:21 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id EBAE825DB4; Sat, 1 Feb 2025 17:07:19 +0100 (CET) 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 aACLlNXcpyjN; Sat, 1 Feb 2025 17:07:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738426039; bh=tQTPw/0e0x/5nHZJIauQAcShDxNOSEP2B1TMMHV+3s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ab9UnNGs8hFFzEAsxBfn274aOTD2KUTnwu7SvgozmCgLksx+dek7pRMPGYvlKwIjc 9d+H1u5zKZQXT++hwNLJEvwHDIYVwNao0kGA9YhbAXRPjnzgW6OxSSRbAVQhI6e6Dw kHB0RQsd+eDDYaZKT6pLkyB1GmPihlncEpc5Hx0GOPUX7HAueZKRNBjrWKOYkWM5Md ryStoYycgbZnodn8UVnjmomA3U04heg/RoNgY80tRHqa1hkeHUhWSav9m+AlVOkWK0 yKztsJB4WJi8/ZmHfwARn4sDjyARIGg262iqbo5058nligFN4mb0nqVDidT5OVAH66 FUOVdyuatjf9Q== From: Sughosha Date: Sat, 1 Feb 2025 21:34:38 +0530 Message-ID: <59b4ed2a335c819073c453ebde3cc35a5f0fe1b9.1738425881.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/gpodder.scm (libmygpo-qt6): New variable. Change-Id: Ie9c0257f570147293ec695df312982a98bc9d1a7 --- gnu/packages/gpodder.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 1baca35f06..a7fb845625 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -161,6 +161,17 @@ (define-public libmygpo-qt track podcasts.") (license license:lgpl2.1+)))) +(define-public libmygpo-qt6 + (package/inherit libmygpo-qt + (name "libmygpo-qt6") + (arguments + (substitute-keyword-arguments (package-arguments libmygpo-qt) + ((#:configure-flags flags) + #~(append '("-DBUILD_WITH_QT6=ON") #$flags)))) + (inputs + (modify-inputs (package-inputs libmygpo-qt) + (replace "qtbase" qtbase))))) + (define-public python-mygpoclient (package (name "python-mygpoclient") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v3 1/5] gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Feb 2025 16:08: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.173842604816276 (code B ref 75720); Sat, 01 Feb 2025 16:08:02 +0000 Received: (at 75720) by debbugs.gnu.org; 1 Feb 2025 16:07:28 +0000 Received: from localhost ([127.0.0.1]:59705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teG1n-0004EP-5Q for submit@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:28 -0500 Received: from layka.disroot.org ([178.21.23.139]:33668) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teG1j-0004E0-AF for 75720@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:24 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6314825BEE; Sat, 1 Feb 2025 17:07:22 +0100 (CET) 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 atnyI5b7AJlk; Sat, 1 Feb 2025 17:07:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738426037; bh=rLb1RXSK8l3QQUVGlMMBb80ANzwzkA4mDjtfMkGq3D0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bFDE0ESGAKzfP7m83IcPtLEaqc3TiCReQ/sHWGWb20EpMbGBlasYPSs4lB3QiPf/6 S5TRw26kYyuNQN5vra4FjFeBpGzdwey+zbdC1xxGKFjpQJbGhOQbqj83n109iF60Yr HsXgckmHU0RZUUBB3OvPMVaPTfO7BcXI3JignBaFgKzszyWqjQ4PtrwcVkHKbKo9mM D7PG8+dqT2BQk+491xTmhqVGDeBt1vhJU0lFZRQSvOE3C4DVQsUnSniJwIaWIjgz++ 5GLDehOg8IryUvoPyIRI36CJao8g/DqC3bq2lQbejvFj9ON/oKP0vtHU7w9V2dr5kj dSJRdIxFkF1Xw== From: Sughosha Date: Sat, 1 Feb 2025 21:34:37 +0530 Message-ID: <25906f9bdafd5fd97a7b15883758da700eab62a2.1738425880.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) 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.3 (/) * gnu/packages/gpodder.scm (libmygpo-qt): Update to 1.1.0-0.4d1f482. [source]: Switch to git-fetch; update patches. [home-page]: Update URL. * gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch: New file. * 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 files and register the new file. Change-Id: I5cc3fbc8bfbfa7d88843448a2b5b8ef0fa5df60a --- gnu/local.mk | 3 +- gnu/packages/gpodder.scm | 61 +++---- .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 5 files changed, 187 insertions(+), 159 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index e8c807cf63..a725e4eef2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1743,8 +1743,7 @@ 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/libmygpo-qt-suppot-building-with-qt6.patch \ %D%/packages/patches/libpciaccess-hurd64.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index c3e1c9b496..1baca35f06 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -127,34 +127,39 @@ (define-public gpodder (license license:gpl3+))) (define-public libmygpo-qt - (package - (name "libmygpo-qt") - (version "1.1.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")))) - (build-system cmake-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list qtbase-5)) - (arguments - '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") - ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 - ;; is fixed. - #:tests? #f)) - (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 -@url{https://gpodder.net} APIs. It allows applications to discover, manage -and track podcasts.") - (license license:lgpl2.1+))) + (let ((commit "4d1f48291791c64f029e69138e3bc7fb6a851610") + (revision "0")) + (package + (name "libmygpo-qt") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/gpodder/libmygpo-qt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bxv8blyq66600i8skxmccb1lnmliz90378kck4f6j2ynry2114b")) + (patches + (search-patches "libmygpo-qt-suppot-building-with-qt6.patch")))) + (build-system cmake-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list qtbase-5)) + (arguments + '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") + ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 + ;; is fixed. + #:tests? #f)) + (home-page "https://wiki.gpodder.org/wiki/Libmygpo-qt") + (synopsis "Qt/C++ library wrapping the gpodder web service") + (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the +@url{https://gpodder.net} APIs. It allows applications to discover, manage and +track podcasts.") + (license license:lgpl2.1+)))) (define-public python-mygpoclient (package 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 ) diff --git a/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch new file mode 100644 index 0000000000..efdbe7623d --- /dev/null +++ b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch @@ -0,0 +1,153 @@ +From 42e19dcb6b7c07460f05aa1d4586d5c76236c6d0 Mon Sep 17 00:00:00 2001 +From: Tuomas Nurmi +Date: Mon, 8 Jul 2024 17:03:32 +0300 +Subject: [PATCH] Minimal changes to make Qt6 compilation possible + +Untested. Compiles, with a bunch of deprecation warnings. +There's likely room for improvement all around. +--- + CMakeLists.txt | 24 +++++++++--------------- + libmygpo-qt.pc.in | 1 - + src/CMakeLists.txt | 4 ++-- + src/DeviceList.cpp | 2 +- + tests/CMakeLists.txt | 12 +++++++++--- + 5 files changed, 21 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a79ddc..920e841 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,10 +5,10 @@ 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" OFF) ++option(BUILD_WITH_QT6 "Build libmygpo-qt with Qt6" OFF) + option(MYGPO_BUILD_TESTS "Build all unit tests" ON) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + if( MYGPO_BUILD_TESTS ) + find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) + else() +@@ -23,27 +23,21 @@ if( NOT BUILD_WITH_QT4 ) + # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for + # Qt5 + set(MYGPO_QT_MAJOR_VERSION "5") +- set(MYGPO_QT4_QJSON_DEP "") + 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") ++ message(STATUS "Could not find Qt5, searching for Qt6 instead...") + if( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork QtTest REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network Test REQUIRED ) + else( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network REQUIRED ) + endif() +- set( QT_DONT_USE_QTGUI TRUE ) +- include( ${QT_USE_FILE} ) ++ set(MYGPO_QT_VERSION_SUFFIX 6) + + macro(qt_wrap_cpp) +- qt4_wrap_cpp(${ARGN}) ++ qt6_wrap_cpp(${ARGN}) + endmacro() + +- set(MYGPO_QT_MAJOR_VERSION "") +- set(MYGPO_QT4_QJSON_DEP "Requires.private: QJson") ++ set(MYGPO_QT_MAJOR_VERSION "6") + +- # QJson is only required for Qt4 +- find_package(QJSON REQUIRED) + endif() + + # Don't use absolute path in Mygpo-qtTargets-$buildType.cmake +@@ -51,7 +45,7 @@ endif() + # set(QT_USE_IMPORTED_TARGETS TRUE) + + set( MYGPO_QT_VERSION_MAJOR "1" ) +-set( MYGPO_QT_VERSION_MINOR "1" ) ++set( MYGPO_QT_VERSION_MINOR "2" ) + set( MYGPO_QT_VERSION_PATCH "0" ) + set( MYGPO_QT_VERSION "${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO_QT_VERSION_PATCH}" ) + +diff --git a/libmygpo-qt.pc.in b/libmygpo-qt.pc.in +index 8403e48..520bd52 100644 +--- a/libmygpo-qt.pc.in ++++ b/libmygpo-qt.pc.in +@@ -8,6 +8,5 @@ Description: libmygpo-qt is a C++/Qt Library that wraps the gpodder.net WebAPI + URL: http://wiki.gpodder.org/wiki/Libmygpo-qt + Version: @MYGPO_QT_VERSION@ + Requires: Qt@MYGPO_QT_MAJOR_VERSION@Core Qt@MYGPO_QT_MAJOR_VERSION@Network +-@MYGPO_QT4_QJSON_DEP@ + Libs: -L${libdir} -lmygpo-qt@MYGPO_QT_VERSION_SUFFIX@ + Cflags: -I${includedir} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 253e81e..9d1989c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -81,10 +81,10 @@ add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC + + set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + 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}) ++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt6::Core Qt6::Network) + endif() + + install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) +diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp +index e972318..92e29cc 100644 +--- a/src/DeviceList.cpp ++++ b/src/DeviceList.cpp +@@ -64,7 +64,7 @@ bool DeviceListPrivate::parse( const QVariant& data ) + DevicePtr ptr( new Device( var, this ) ); + m_devicesList.append( ptr ); + QVariant v; +- v.setValue( ptr ); ++ v.setValue( QSharedPointer(ptr) ); + devList.append( v ); + } + m_devices = devList; +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 4f77158..ce63689 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -11,14 +11,18 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU + + # UrlBuilder library + add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( UrlBuilder Qt5::Core ) ++else() ++ target_link_libraries( UrlBuilder Qt6::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}) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) ++else() ++ target_link_libraries( JsonCreator Qt6::Core Qt6::Network ) + endif() + + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) +@@ -29,8 +33,10 @@ 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}) +- if( NOT BUILD_WITH_QT4 ) ++ if( NOT BUILD_WITH_QT6 ) + target_link_libraries(${_name} Qt5::Network Qt5::Test) ++ else() ++ target_link_libraries(${_name} Qt6::Network Qt6::Test) + endif() + endmacro(add_libmygpo_test) + -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v3 3/5] gnu: Add taglib-extras. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Feb 2025 16:08: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.173842605116297 (code B ref 75720); Sat, 01 Feb 2025 16:08:03 +0000 Received: (at 75720) by debbugs.gnu.org; 1 Feb 2025 16:07:31 +0000 Received: from localhost ([127.0.0.1]:59709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teG1r-0004El-7X for submit@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:31 -0500 Received: from layka.disroot.org ([178.21.23.139]:37626) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teG1m-0004EF-3T for 75720@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:26 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3B52825BEE; Sat, 1 Feb 2025 17:07:25 +0100 (CET) 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 rB-UpolRuEio; Sat, 1 Feb 2025 17:07:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738426040; bh=PoOyOyLNQargsvqrzZoob/iTwz2bFWNKBJu2RzZHe6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cRgYUylPvS6PvX4hdOBT97XA3/vFHTlcXzhIoa1ZG/RZWenYLSO4TFQIQAICzPxau g4qCc5V2f/uqPH2LopxB5BfWK8OprSQQduMwebOBL3hHu5/7tXCMfQ7h4plf6/1Ovt l4x127fPmWKxMwd1fXOZTHYfE0FOoLSOtZQsU+wEuG55ExAKFFtF7GUGDGmSc1o7tl fWMuKCL/+BC2SnHWSjuDw9CUbrNDuJBWkNBwjul3LFbWfWGTrHS7tA/dTXUnD7dDBX jtyK8jb4sJ/0aq69VKzasVi3PkhLeRhy+Yg5OEtVqH+LH16/ZW1Mh69IvbGGfH1VJj mhFYE973gql6Q== From: Sughosha Date: Sat, 1 Feb 2025 21:34:39 +0530 Message-ID: <5d2d9389eb48a58e0844b2ef26541235c56ceece.1738425881.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/mp3.scm (taglib-extras): New variable. Change-Id: I6b4ad693001c89e576fadbb02d981d43f7d568ab --- gnu/packages/mp3.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 9dfce6313f..2c54ba978f 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -63,6 +63,7 @@ (define-module (gnu packages mp3) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -278,6 +279,34 @@ (define-public taglib ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1. (license (list license:lgpl2.1 license:mpl1.1)))) +(define-public taglib-extras + (package + (name "taglib-extras") + ;; 2 changes after mentioning version 1.0.2 in ChangeLog, which fixes + ;; finding taglib. + (version "1.0.2-2") + (source + (origin + (method svn-fetch) + (uri + (svn-reference + (url "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib-extras") + (revision 1444333))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1qsima3ln6j63mzdp5y1yjaijxvk3wnriwld5ijdp1xv1dx4hqjc")))) + (build-system cmake-build-system) + (inputs + (list taglib)) + (arguments + (list #:tests? #f)) ;no test suite + (home-page "https://websvn.kde.org/trunk/kdesupport/taglib-extras") + (synopsis "Additional TagLib plugins") + (description + "This package provides TagLib plugins for Audible and RealMedia tags.") + (license (list license:lgpl2.1+ license:gpl2+)))) + (define-public minimp3 ;; The latest commit is used as there is no release. (let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v3 4/5] gnu: mariadb: Enable embedded server. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 01 Feb 2025 16:08: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 , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.173842605216304 (code B ref 75720); Sat, 01 Feb 2025 16:08:03 +0000 Received: (at 75720) by debbugs.gnu.org; 1 Feb 2025 16:07:32 +0000 Received: from localhost ([127.0.0.1]:59711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teG1r-0004Eo-LY for submit@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:31 -0500 Received: from layka.disroot.org ([178.21.23.139]:37636) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teG1n-0004EQ-UI for 75720@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:28 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E846825BEE; Sat, 1 Feb 2025 17:07:26 +0100 (CET) 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 1RCFIYLYwels; Sat, 1 Feb 2025 17:07:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738426042; bh=LAfze2QqnuKESfWW4Js2od5osayyX5/4OrnCIjEWQIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IcZpQdjBU2YVlx7SHziygZrOMxn3Zn5OPY4r3fk6gca7ccPYx61OJHxiO+LhU+HuP tb7gibxVcSi0Qtqi9WsfjTvc3lPl1qggQS7Xbs2ikjKLU+LTPP6JFb+GNiSkB9wfUD MyjbRAmLToXQ8gOSxtpq9tv6qV4ygbXghWWVT6zzC8NRK/ONADaj9pDeGx+V9pD/Qc DFAk044nKMi2FfR1YdmLIpAVcLI4af6A7vvBox9lsmGAfRSp2uWs5ATNmt9kJUyuSO wHqfG0qW/Lo6xkuP2uIIsyZdS/ybpvRLpFbNmLlNHX5+6vwmd6KPOrsfg/7cK0VuwM kMhZvEDG95jkQ== From: Sughosha Date: Sat, 1 Feb 2025 21:34:40 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 95a9c1fa6c..fce2f206e1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -988,6 +988,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" -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v3 5/5] gnu: Add amarok. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 01 Feb 2025 16:08: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.173842605216311 (code B ref 75720); Sat, 01 Feb 2025 16:08:04 +0000 Received: (at 75720) by debbugs.gnu.org; 1 Feb 2025 16:07:32 +0000 Received: from localhost ([127.0.0.1]:59713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1teG1r-0004Ew-VN for submit@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:32 -0500 Received: from layka.disroot.org ([178.21.23.139]:37652) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1teG1p-0004Ed-F7 for 75720@debbugs.gnu.org; Sat, 01 Feb 2025 11:07:30 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6FD5025CB4; Sat, 1 Feb 2025 17:07:28 +0100 (CET) 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 BlKi02fQLQ_U; Sat, 1 Feb 2025 17:07:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738426044; bh=iOw828T310o8jTbV8TvWCvlWrIhHLCjoQgokIvUkM1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PnBI+rgGoQZa5y1R6Ojf6Landa+W55DDHqoSvFDG9opU8t9TapYfCdyMsDtxzMmnn b1lvXeu018e3thtkoWFg5KZoWX4ECffAYHsCimpPh8cNEpklyb92yEQ6oz74cjX/Cv 6D+NJYvbmcmx3rPNBxysWAn8Eyu6ocJ9nRaTSijVVro+rxe5dodG9n9wPvu8nJdBet 0+oaHaJRyq2I3Sl+k8HAdNsAdLh3hbsoKL007Q2PoZnuNLyPPuxCY6Jco6TfUGg2fN lylP9u/reS9CDoeZLZJohVhASiNgXp13LIoS7Q4kdT2IJEWGc5/T/vIRgYsSwLk4zV 8H+eaO49Iei0g== From: Sughosha Date: Sat, 1 Feb 2025 21:34:41 +0530 Message-ID: <35fd33ce9b5ba1be1b2a5a5708d29a9c95974c39.1738425881.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/kde-multimedia.scm (amarok): New variable. * gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch: New file * gnu/local.mk: Register the new file. Change-Id: Iff82b2128b231070e6452a8f86a4349f614235b4 --- gnu/local.mk | 1 + gnu/packages/kde-multimedia.scm | 109 +++++++++++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 ++++++++++++++++++ 3 files changed, 258 insertions(+) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index a725e4eef2..b27e79d7d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -982,6 +982,7 @@ dist_patch_DATA = \ %D%/packages/patches/ibus-anthy-fix-tests.patch \ %D%/packages/patches/ibus-table-paths.patch \ %D%/packages/patches/anki-mpv-args.patch \ + %D%/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index ad0b504268..8390f29f6f 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -31,14 +31,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) @@ -46,6 +51,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) @@ -54,6 +60,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 xiph) #:use-module (gnu packages xml) @@ -98,6 +105,108 @@ (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.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/amarok/" version + "/amarok-" version ".tar.xz")) + (sha256 + (base32 + "14r7iismx28nnh3jhkhczhrsmsap9by8p3kfhkp7d5678c7l62g4")) + (patches + (search-patches "amarok-3.2.1-fix-including-mygpo-qt6.patch")))) + (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 pkg-config qttools)) + (inputs + (list ffmpeg + fftw + glib + 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-qt6 + libxcrypt + `(,mariadb "dev") + `(,mariadb "lib") + openssl + phonon + phonon-backend-vlc + python + qt5compat + qtsvg + qtwebengine + solid + taglib + taglib-extras + 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") diff --git a/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch new file mode 100644 index 0000000000..d23954cf80 --- /dev/null +++ b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch @@ -0,0 +1,148 @@ +This patch fixes including headers of libmygpo-qt6 when built with qt6. + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h 2025-01-21 06:40:56.069282183 +0530 +@@ -22,7 +22,14 @@ + + #include "core/playlists/PlaylistProvider.h" + #include "core/podcasts/PodcastMeta.h" ++ ++#include ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + namespace Podcasts { + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-21 05:22:06.974221089 +0530 +@@ -20,7 +20,12 @@ + #define GPODDERPODCASTREQUESTHANDLER_H_ + + #include "GpodderServiceModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-21 05:16:21.674470671 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERPODCASTTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + class GpodderPodcastTreeItem: public GpodderTreeItem + { +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h 2025-01-21 05:21:29.153812018 +0530 +@@ -23,8 +23,15 @@ + #include "core/podcasts/PodcastProvider.h" + #include "core/podcasts/PodcastReader.h" + #include "GpodderPodcastMeta.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/file/KConfigSyncRelStore.h" + #include "playlistmanager/PlaylistManager.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp +--- amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp 2025-01-21 05:17:27.675190295 +0530 +@@ -27,8 +27,15 @@ + #include "GpodderServiceModel.h" + #include "GpodderServiceView.h" + #include "GpodderSortFilterProxyModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/PlaylistManager.h" + #include "widgets/SearchWidget.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h 2025-01-21 05:20:32.517198664 +0530 +@@ -20,8 +20,15 @@ + #define GPODDERSERVICEMODEL_H_ + + #include "GpodderTreeItem.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "NetworkAccessManagerProxy.h" + + #include +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h 2025-01-21 05:18:10.983661774 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERTAGTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h 2025-01-21 06:33:35.948536483 +0530 +@@ -19,13 +19,18 @@ + #ifndef GPODDERTREEITEM_H_ + #define GPODDERTREEITEM_H_ + +-#include +-#include +- + #include + #include + #include + ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ++#include ++#include ++#else ++#include ++#include ++#endif ++ + + class GpodderTreeItem : public QObject + { -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v4 2/5] gnu: Add libmygpo-qt6. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 17:42: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.17385180778384 (code B ref 75720); Sun, 02 Feb 2025 17:42:02 +0000 Received: (at 75720) by debbugs.gnu.org; 2 Feb 2025 17:41:17 +0000 Received: from localhost ([127.0.0.1]:36131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tedy9-0002B9-2j for submit@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:17 -0500 Received: from layka.disroot.org ([178.21.23.139]:34570) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tedy6-0002Ap-Ix for 75720@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:15 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A1CF625BA6; Sun, 2 Feb 2025 18:41:12 +0100 (CET) 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 FlTTKOO6EC0u; Sun, 2 Feb 2025 18:41:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738518071; bh=tQTPw/0e0x/5nHZJIauQAcShDxNOSEP2B1TMMHV+3s4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kdWDhxol/iD1TSXlCS1HCMOYo09JY0q1/752z2kYbyaHtNQXB735+UVITz/6JVCqR ttHJ9ftJdK79tiwggi2rRlXaFSQLQPYasW/V6+O72t2+Z9AAf+PFlXTEIjcZ+oNn8K xTsUtuzLMjQj3B98JEPCuq84FSU/mvYSjkMg+ttD3cqeGMg8HXmEKg8QCPFjhG1XMd O4Yz3qSe+31ZWWuAkmAQG5ANtrWM6nVr7++yZjwvK51pbYxnWC6c7LxZyCEj0f++GD LMGT74RnBNGA1YToijwfq1WFFsxbJ+ksjB2vjQp8aUOoxhhnGPg96ILPhhw0A99k3N hhgs3hMbMvvvA== From: Sughosha Date: Sun, 2 Feb 2025 23:10:48 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/gpodder.scm (libmygpo-qt6): New variable. Change-Id: Ie9c0257f570147293ec695df312982a98bc9d1a7 --- gnu/packages/gpodder.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index 1baca35f06..a7fb845625 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -161,6 +161,17 @@ (define-public libmygpo-qt track podcasts.") (license license:lgpl2.1+)))) +(define-public libmygpo-qt6 + (package/inherit libmygpo-qt + (name "libmygpo-qt6") + (arguments + (substitute-keyword-arguments (package-arguments libmygpo-qt) + ((#:configure-flags flags) + #~(append '("-DBUILD_WITH_QT6=ON") #$flags)))) + (inputs + (modify-inputs (package-inputs libmygpo-qt) + (replace "qtbase" qtbase))))) + (define-public python-mygpoclient (package (name "python-mygpoclient") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v4 4/5] gnu: mariadb: Enable embedded server. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 17:42: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 , Sharlatan Hellseher X-Debbugs-Original-Xcc: Sharlatan Hellseher Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.17385180798406 (code B ref 75720); Sun, 02 Feb 2025 17:42:02 +0000 Received: (at 75720) by debbugs.gnu.org; 2 Feb 2025 17:41:19 +0000 Received: from localhost ([127.0.0.1]:36134 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tedyB-0002BT-CQ for submit@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:19 -0500 Received: from layka.disroot.org ([178.21.23.139]:59426) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tedy8-0002Av-5Q for 75720@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:16 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 371FE25632; Sun, 2 Feb 2025 18:41:15 +0100 (CET) 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 M0U7cG_VCGxI; Sun, 2 Feb 2025 18:41:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738518074; bh=LAfze2QqnuKESfWW4Js2od5osayyX5/4OrnCIjEWQIQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IJm1SjSxONMl9C2X4DXqVgG4iBbHCHpn9FzkLOYbhlSqmCUkIaXY85Y7hm9c49LZy 5EqhkPaHecN8umZ3GS1LXiXzNfc0HlNENpepr2Lb7ImkbEQyQGSE25SNMcFVuQKM02 dj1b9BOZ3vUVCJnGdzedmtdYxlV4pZFim1Zf5T/0Mcc/OwySHwdbcARpTBSanZU1hf RvJF9e4KkCe/+eYeUfBKBzUV7RdF+jLTpDE/tHPxqJXTFDBqfFK4b4Q/OfsOydcerW gMea2r2LwTudm44IXmFno/g99P45VrLbg5izUNSYzpVXzQHPY5/AFlaWrubv/tA7Hq qLwzeus5NMhEg== From: Sughosha Date: Sun, 2 Feb 2025 23:10:50 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 95a9c1fa6c..fce2f206e1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -988,6 +988,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" -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v4 1/5] gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 17:42: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.17385180858433 (code B ref 75720); Sun, 02 Feb 2025 17:42:03 +0000 Received: (at 75720) by debbugs.gnu.org; 2 Feb 2025 17:41:25 +0000 Received: from localhost ([127.0.0.1]:36136 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tedyB-0002BX-Oj for submit@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:25 -0500 Received: from layka.disroot.org ([178.21.23.139]:59422) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tedy7-0002Au-N4 for 75720@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:17 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B6123256DF; Sun, 2 Feb 2025 18:41:14 +0100 (CET) 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 Zsxq3JY6wkDp; Sun, 2 Feb 2025 18:41:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738518070; bh=3pmeEONqdBrLjY/PIQi0sMBmaCPeKQopZMO92gAhZY0=; h=From:To:Cc:Subject:Date; b=CapNV84bY38w32zn3dJQmA83LFZAhD57YyM3+WfElGUmfv0WSE4fKNEBjsV4CT8Ay GD0/oyNhTJLi8a3RMc/m9lfxJLs9iazaf6+bQNf4qnJPkECaiPgQb7RT997u75/fzM BPD0HuRgvLXhC/LTzQhUs7ipv0d1jbxjfFEinl9bz4NfaHaGUxvKN4mBJGrJU5fkni ho4kdzZUyFDjgH1LgF23Jb5+p+JzlH89x+K9Aj4neTjN0uuyMPZIz+fRBeCJ6o4N3S Wch3N8Qx8l4aVS3EJWezRqlTnkS0MzRdV5HWYhChcp9LNdiuKoTkc0CrDN3fZ/SSrf uE+L4X83jiZdA== From: Sughosha Date: Sun, 2 Feb 2025 23:10:47 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.7 (/) 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.3 (/) * gnu/packages/gpodder.scm (libmygpo-qt): Update to 1.1.0-0.4d1f482. [source]: Switch to git-fetch; update patches. [home-page]: Update URL. * gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch: New file. * 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 files and register the new file. Change-Id: I5cc3fbc8bfbfa7d88843448a2b5b8ef0fa5df60a --- gnu/local.mk | 4 +- gnu/packages/gpodder.scm | 61 +++---- .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 5 files changed, 188 insertions(+), 159 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index aef9f9fbb5..b6f62568bf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1743,8 +1743,8 @@ 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/libmygpo-qt-suppot-building-with-qt6.patch \ + %D%/packages/patches/libpciaccess-hurd64.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..1baca35f06 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -127,34 +127,39 @@ (define-public gpodder (license license:gpl3+))) (define-public libmygpo-qt - (package - (name "libmygpo-qt") - (version "1.1.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")))) - (build-system cmake-build-system) - (native-inputs - (list pkg-config)) - (inputs - (list qtbase-5)) - (arguments - '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") - ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 - ;; is fixed. - #:tests? #f)) - (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 -@url{https://gpodder.net} APIs. It allows applications to discover, manage -and track podcasts.") - (license license:lgpl2.1+))) + (let ((commit "4d1f48291791c64f029e69138e3bc7fb6a851610") + (revision "0")) + (package + (name "libmygpo-qt") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/gpodder/libmygpo-qt") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bxv8blyq66600i8skxmccb1lnmliz90378kck4f6j2ynry2114b")) + (patches + (search-patches "libmygpo-qt-suppot-building-with-qt6.patch")))) + (build-system cmake-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list qtbase-5)) + (arguments + '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") + ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 + ;; is fixed. + #:tests? #f)) + (home-page "https://wiki.gpodder.org/wiki/Libmygpo-qt") + (synopsis "Qt/C++ library wrapping the gpodder web service") + (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the +@url{https://gpodder.net} APIs. It allows applications to discover, manage and +track podcasts.") + (license license:lgpl2.1+)))) (define-public python-mygpoclient (package 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 ) diff --git a/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch new file mode 100644 index 0000000000..efdbe7623d --- /dev/null +++ b/gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch @@ -0,0 +1,153 @@ +From 42e19dcb6b7c07460f05aa1d4586d5c76236c6d0 Mon Sep 17 00:00:00 2001 +From: Tuomas Nurmi +Date: Mon, 8 Jul 2024 17:03:32 +0300 +Subject: [PATCH] Minimal changes to make Qt6 compilation possible + +Untested. Compiles, with a bunch of deprecation warnings. +There's likely room for improvement all around. +--- + CMakeLists.txt | 24 +++++++++--------------- + libmygpo-qt.pc.in | 1 - + src/CMakeLists.txt | 4 ++-- + src/DeviceList.cpp | 2 +- + tests/CMakeLists.txt | 12 +++++++++--- + 5 files changed, 21 insertions(+), 22 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a79ddc..920e841 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,10 +5,10 @@ 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" OFF) ++option(BUILD_WITH_QT6 "Build libmygpo-qt with Qt6" OFF) + option(MYGPO_BUILD_TESTS "Build all unit tests" ON) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + if( MYGPO_BUILD_TESTS ) + find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) + else() +@@ -23,27 +23,21 @@ if( NOT BUILD_WITH_QT4 ) + # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for + # Qt5 + set(MYGPO_QT_MAJOR_VERSION "5") +- set(MYGPO_QT4_QJSON_DEP "") + 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") ++ message(STATUS "Could not find Qt5, searching for Qt6 instead...") + if( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork QtTest REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network Test REQUIRED ) + else( MYGPO_BUILD_TESTS ) +- find_package( Qt4 COMPONENTS QtCore QtNetwork REQUIRED ) ++ find_package( Qt6 COMPONENTS Core Network REQUIRED ) + endif() +- set( QT_DONT_USE_QTGUI TRUE ) +- include( ${QT_USE_FILE} ) ++ set(MYGPO_QT_VERSION_SUFFIX 6) + + macro(qt_wrap_cpp) +- qt4_wrap_cpp(${ARGN}) ++ qt6_wrap_cpp(${ARGN}) + endmacro() + +- set(MYGPO_QT_MAJOR_VERSION "") +- set(MYGPO_QT4_QJSON_DEP "Requires.private: QJson") ++ set(MYGPO_QT_MAJOR_VERSION "6") + +- # QJson is only required for Qt4 +- find_package(QJSON REQUIRED) + endif() + + # Don't use absolute path in Mygpo-qtTargets-$buildType.cmake +@@ -51,7 +45,7 @@ endif() + # set(QT_USE_IMPORTED_TARGETS TRUE) + + set( MYGPO_QT_VERSION_MAJOR "1" ) +-set( MYGPO_QT_VERSION_MINOR "1" ) ++set( MYGPO_QT_VERSION_MINOR "2" ) + set( MYGPO_QT_VERSION_PATCH "0" ) + set( MYGPO_QT_VERSION "${MYGPO_QT_VERSION_MAJOR}.${MYGPO_QT_VERSION_MINOR}.${MYGPO_QT_VERSION_PATCH}" ) + +diff --git a/libmygpo-qt.pc.in b/libmygpo-qt.pc.in +index 8403e48..520bd52 100644 +--- a/libmygpo-qt.pc.in ++++ b/libmygpo-qt.pc.in +@@ -8,6 +8,5 @@ Description: libmygpo-qt is a C++/Qt Library that wraps the gpodder.net WebAPI + URL: http://wiki.gpodder.org/wiki/Libmygpo-qt + Version: @MYGPO_QT_VERSION@ + Requires: Qt@MYGPO_QT_MAJOR_VERSION@Core Qt@MYGPO_QT_MAJOR_VERSION@Network +-@MYGPO_QT4_QJSON_DEP@ + Libs: -L${libdir} -lmygpo-qt@MYGPO_QT_VERSION_SUFFIX@ + Cflags: -I${includedir} +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 253e81e..9d1989c 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -81,10 +81,10 @@ add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC + + set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) + +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + 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}) ++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt6::Core Qt6::Network) + endif() + + install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) +diff --git a/src/DeviceList.cpp b/src/DeviceList.cpp +index e972318..92e29cc 100644 +--- a/src/DeviceList.cpp ++++ b/src/DeviceList.cpp +@@ -64,7 +64,7 @@ bool DeviceListPrivate::parse( const QVariant& data ) + DevicePtr ptr( new Device( var, this ) ); + m_devicesList.append( ptr ); + QVariant v; +- v.setValue( ptr ); ++ v.setValue( QSharedPointer(ptr) ); + devList.append( v ); + } + m_devices = devList; +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 4f77158..ce63689 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -11,14 +11,18 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU + + # UrlBuilder library + add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( UrlBuilder Qt5::Core ) ++else() ++ target_link_libraries( UrlBuilder Qt6::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}) +-if( NOT BUILD_WITH_QT4 ) ++if( NOT BUILD_WITH_QT6 ) + target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) ++else() ++ target_link_libraries( JsonCreator Qt6::Core Qt6::Network ) + endif() + + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) +@@ -29,8 +33,10 @@ 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}) +- if( NOT BUILD_WITH_QT4 ) ++ if( NOT BUILD_WITH_QT6 ) + target_link_libraries(${_name} Qt5::Network Qt5::Test) ++ else() ++ target_link_libraries(${_name} Qt6::Network Qt6::Test) + endif() + endmacro(add_libmygpo_test) + base-commit: b64d3168af697ceb2a96e7e2c62bcf418b8a586a -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v4 3/5] gnu: Add taglib-extras. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 17:42: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.17385180868442 (code B ref 75720); Sun, 02 Feb 2025 17:42:03 +0000 Received: (at 75720) by debbugs.gnu.org; 2 Feb 2025 17:41:26 +0000 Received: from localhost ([127.0.0.1]:36140 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tedyH-0002Bx-Ke for submit@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:26 -0500 Received: from layka.disroot.org ([178.21.23.139]:59428) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tedyA-0002BM-I0 for 75720@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:19 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 9A3A3256DF; Sun, 2 Feb 2025 18:41:17 +0100 (CET) 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 OnBtT1S6B-fL; Sun, 2 Feb 2025 18:41:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738518073; bh=PoOyOyLNQargsvqrzZoob/iTwz2bFWNKBJu2RzZHe6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kwN14TOzd8jAxpwylcpekAoWTzrdm9aSdrs50rCfIpdJE159FeHSATGbe/CdxJCv6 i+8/clIGDbBwMJ9yIFrkSOJy1/MGVFFs2a1hxwDVDVRUvmiOxmtWqLgXNNKBjOcsub PcsW+mhXO5RlMQwDDrPYIg+zL2zACCWvtSwfsd4B8hA/zkg5Y+wflCIsetxK0MUkUi ZH+7pHN2yXP/JIBTussN38Ivj8NyXW9f4GuyKky0QVJNJ9GV49xdiQFOFJ0as4pfFV ybuh06NFuB03j3rjuUEmwY8Q+hGFEoCzonMJA5tU2RXdqMGOo9/u0xPmpqoFgNigf4 axmnK7mzIFepQ== From: Sughosha Date: Sun, 2 Feb 2025 23:10:49 +0530 Message-ID: <790de15485513b6d1e605b9e027fc76afe541299.1738518051.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/mp3.scm (taglib-extras): New variable. Change-Id: I6b4ad693001c89e576fadbb02d981d43f7d568ab --- gnu/packages/mp3.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 9dfce6313f..2c54ba978f 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -63,6 +63,7 @@ (define-module (gnu packages mp3) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix utils) #:use-module (guix build-system copy) #:use-module (guix build-system gnu) @@ -278,6 +279,34 @@ (define-public taglib ;; Dual-licensed: user may choose between LGPLv2.1 or MPLv1.1. (license (list license:lgpl2.1 license:mpl1.1)))) +(define-public taglib-extras + (package + (name "taglib-extras") + ;; 2 changes after mentioning version 1.0.2 in ChangeLog, which fixes + ;; finding taglib. + (version "1.0.2-2") + (source + (origin + (method svn-fetch) + (uri + (svn-reference + (url "svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib-extras") + (revision 1444333))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1qsima3ln6j63mzdp5y1yjaijxvk3wnriwld5ijdp1xv1dx4hqjc")))) + (build-system cmake-build-system) + (inputs + (list taglib)) + (arguments + (list #:tests? #f)) ;no test suite + (home-page "https://websvn.kde.org/trunk/kdesupport/taglib-extras") + (synopsis "Additional TagLib plugins") + (description + "This package provides TagLib plugins for Audible and RealMedia tags.") + (license (list license:lgpl2.1+ license:gpl2+)))) + (define-public minimp3 ;; The latest commit is used as there is no release. (let ((commit "afb604c06bc8beb145fecd42c0ceb5bda8795144") -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v4 5/5] gnu: Add amarok. Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 02 Feb 2025 17:42: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.17385180878451 (code B ref 75720); Sun, 02 Feb 2025 17:42:03 +0000 Received: (at 75720) by debbugs.gnu.org; 2 Feb 2025 17:41:27 +0000 Received: from localhost ([127.0.0.1]:36142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tedyI-0002C8-4F for submit@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:26 -0500 Received: from layka.disroot.org ([178.21.23.139]:59436) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tedyF-0002Bm-T6 for 75720@debbugs.gnu.org; Sun, 02 Feb 2025 12:41:24 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0A0CA25632; Sun, 2 Feb 2025 18:41:23 +0100 (CET) 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 mK9yVATeP3Za; Sun, 2 Feb 2025 18:41:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1738518076; bh=T1yBa3HfUKq1TI2fjymLWrjo74NTlqxDPKSl9H7UMyY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=csH4zciSEHXlfM1yzbeEdwNr8IPvK2+/WAEwLQnqROmjuMnw5QRekRXDOWOWbytJh gkAz9SShHnjUo60I/df6z7/wLX9pT5+kMKR1yICLrugvwHQq8N6JGsAomwHBv25Udo Tku0eroHZGJDza6zzepVRJyplVM3S5cxqGPAkQ+GsMK3TErFs55QAAQKCGahSZqWPF KdWSALDGsimfWoMmUG2ZXUXSc3FMuK6bxam3LtwjUmrZaLYmX+xrsliShnzCSGrAhY Do8xERkJEqwSOz1P2vB7dpoeYqalUz9VHpTx45rVs765tsloGTr+a7E6GROsRWMhRy K5o5t1hgz44cg== From: Sughosha Date: Sun, 2 Feb 2025 23:10:51 +0530 Message-ID: <7f028da14db2e6d26fe62c6c6843119dc890edbc.1738518051.git.sughosha@disroot.org> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * gnu/packages/kde-multimedia.scm (amarok): New variable. * gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch: New file * gnu/local.mk: Register the new file. Change-Id: Iff82b2128b231070e6452a8f86a4349f614235b4 --- gnu/local.mk | 1 + gnu/packages/kde-multimedia.scm | 109 +++++++++++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 ++++++++++++++++++ 3 files changed, 258 insertions(+) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch diff --git a/gnu/local.mk b/gnu/local.mk index b6f62568bf..a6803c26e0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -982,6 +982,7 @@ dist_patch_DATA = \ %D%/packages/patches/ibus-anthy-fix-tests.patch \ %D%/packages/patches/ibus-table-paths.patch \ %D%/packages/patches/anki-mpv-args.patch \ + %D%/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch \ %D%/packages/patches/antiword-CVE-2014-8123.patch \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index ad0b504268..8390f29f6f 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -31,14 +31,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) @@ -46,6 +51,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) @@ -54,6 +60,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 xiph) #:use-module (gnu packages xml) @@ -98,6 +105,108 @@ (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.2.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/amarok/" version + "/amarok-" version ".tar.xz")) + (sha256 + (base32 + "14r7iismx28nnh3jhkhczhrsmsap9by8p3kfhkp7d5678c7l62g4")) + (patches + (search-patches "amarok-3.2.1-fix-including-mygpo-qt6.patch")))) + (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 pkg-config qttools)) + (inputs + (list ffmpeg + fftw + glib + 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-qt6 + libxcrypt + `(,mariadb "dev") + `(,mariadb "lib") + openssl + phonon + phonon-backend-vlc + python + qt5compat + qtsvg + qtwebengine + solid + taglib + taglib-extras + 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") diff --git a/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch new file mode 100644 index 0000000000..d23954cf80 --- /dev/null +++ b/gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch @@ -0,0 +1,148 @@ +This patch fixes including headers of libmygpo-qt6 when built with qt6. + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastMeta.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastMeta.h 2025-01-21 06:40:56.069282183 +0530 +@@ -22,7 +22,14 @@ + + #include "core/playlists/PlaylistProvider.h" + #include "core/podcasts/PodcastMeta.h" ++ ++#include ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + namespace Podcasts { + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastRequestHandler.h 2025-01-21 05:22:06.974221089 +0530 +@@ -20,7 +20,12 @@ + #define GPODDERPODCASTREQUESTHANDLER_H_ + + #include "GpodderServiceModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderPodcastTreeItem.h 2025-01-21 05:16:21.674470671 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERPODCASTTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + class GpodderPodcastTreeItem: public GpodderTreeItem + { +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderProvider.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderProvider.h 2025-01-21 05:21:29.153812018 +0530 +@@ -23,8 +23,15 @@ + #include "core/podcasts/PodcastProvider.h" + #include "core/podcasts/PodcastReader.h" + #include "GpodderPodcastMeta.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/file/KConfigSyncRelStore.h" + #include "playlistmanager/PlaylistManager.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp +--- amarok-3.2.1-a/src/services/gpodder/GpodderService.cpp 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderService.cpp 2025-01-21 05:17:27.675190295 +0530 +@@ -27,8 +27,15 @@ + #include "GpodderServiceModel.h" + #include "GpodderServiceView.h" + #include "GpodderSortFilterProxyModel.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "playlistmanager/PlaylistManager.h" + #include "widgets/SearchWidget.h" + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderServiceModel.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderServiceModel.h 2025-01-21 05:20:32.517198664 +0530 +@@ -20,8 +20,15 @@ + #define GPODDERSERVICEMODEL_H_ + + #include "GpodderTreeItem.h" ++ ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include + #include ++#else ++#include ++#include ++#endif ++ + #include "NetworkAccessManagerProxy.h" + + #include +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTagTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTagTreeItem.h 2025-01-21 05:18:10.983661774 +0530 +@@ -20,7 +20,11 @@ + #define GPODDERTAGTREEITEM_H_ + + #include "GpodderTreeItem.h" ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + #include ++#else ++#include ++#endif + + #include + +diff -ruN amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h +--- amarok-3.2.1-a/src/services/gpodder/GpodderTreeItem.h 2025-01-11 23:47:50.000000000 +0530 ++++ amarok-3.2.1-b/src/services/gpodder/GpodderTreeItem.h 2025-01-21 06:33:35.948536483 +0530 +@@ -19,13 +19,18 @@ + #ifndef GPODDERTREEITEM_H_ + #define GPODDERTREEITEM_H_ + +-#include +-#include +- + #include + #include + #include + ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ++#include ++#include ++#else ++#include ++#include ++#endif ++ + + class GpodderTreeItem : public QObject + { -- 2.47.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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") -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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" -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha Date: Fri, 25 Jul 2025 23:04:58 +0530 Message-ID: <20250725173502.14568-1-sughosha@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 ) -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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") -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 2/5] gnu: libmygpo-qt5: New variable. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Aug 2025 15:02: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 X-Debbugs-Original-To: Sughosha via Guix-patches via , 75720@debbugs.gnu.org Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.175587490323649 (code B ref 75720); Fri, 22 Aug 2025 15:02:02 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Aug 2025 15:01:43 +0000 Received: from localhost ([127.0.0.1]:37099 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upTGw-00069C-G6 for submit@debbugs.gnu.org; Fri, 22 Aug 2025 11:01:42 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:52562) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upTGs-00068s-Rk for 75720@debbugs.gnu.org; Fri, 22 Aug 2025 11:01:39 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-45a1b05a59fso16363135e9.1 for <75720@debbugs.gnu.org>; Fri, 22 Aug 2025 08:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755874892; x=1756479692; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vqCA7oWT06oKRWByT0pwXTmQ5tQKhqFBsN/NPMdE92s=; b=DImYmfMAtI99chs6w03azi84wd4/V3hM2SLd58Nl8bgSbnCq8+dH15/6DdKZMFRKXU Ta4beIPBp9+yXDPWzdr+rBfZzhZQUMblem/N+i2YYAOn5+hfMqEQsFcEgM+g+3f2tec7 KabOt1qHLri3g6vTvJuSYCYP7wTtev2GBq0NVh9viLc9dP528+Na712TX8AbKrmRbfgo KO9kgBV0qmuH+PEQamLKaw630sVMnWPTFziB7llcJN3X45F62KhiLtxhL5k/z7zCjt5y sytiKfTxD6HOX/xyDnd7RXkS0MrQFLdd3ZH+5rJPkQ+wF2dXWOTJUDJE1a+BTVuHliMY wCWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755874892; x=1756479692; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vqCA7oWT06oKRWByT0pwXTmQ5tQKhqFBsN/NPMdE92s=; b=DfTM0495zDQukPgoXh2TfIVBgcpJJSp8dsZl/MK/vBZvHAj5uIwYEEk7wEvvEhbhbZ 75ZuD7g20xTjtQqlA7sIx0hFrTueoLymkxdoljf8wJaL5KDaiOsrbsKrSd31Y5pqBX/K 5lczs9E/Xuuon+3K4/N2Tbh2y/LDrjXDBnHageZsOhb0mK7kSJViGHHLtzGluEK+Wkrf zeE2jjh1f/wyyh0jBE4YiAzXCu9hDW+hRqB7KpzEY/iWZ4dt/JJi8/f3mOonieHXpSA7 q6fzdwkNmqSzlzDXP14pP6C3DVl1KvsMay2m70a9a7rlWX/yHoJl1kaaa9Lun5deWPOj RFNQ== X-Forwarded-Encrypted: i=1; AJvYcCWBMVeHBlzhclmk7QBr/qdrHw1iP0csYqS+U/62nXdcSCq22wp9TA/wK6t4/IgusjOcfwRH4A==@debbugs.gnu.org X-Gm-Message-State: AOJu0Ywn8onBgJDiBVvvxmC1gcB1854ZStqr4KvyulMcDZs7bxgHq2YR sWVEIMBSNKHYFKISQ9nGT+rsuKvtSP31TzOzRma3wWSZkWdoiVmVNY0j X-Gm-Gg: ASbGnct0y6Dbl4zoim7+SxZKaUtlDlcxNy3e1yB4CtcZG0INY0Gko4w/Mz0mzCy/uWk X1ld6Gq3g8nyOQmT3AZRT8MZtlffiLM9o88W2DUXExiJ+S3uOtzvlM0uzacOnod57w0IiYb/rU9 WPuTQaKpRuiaJjFMrig/K8QDGaDOUeJWLRiZ6maSK846cTCohRHRtGJ2HxSq5bTSoD/975tS0ca GSVeF+FD+9VFN1XLCLsO7l8AN6LZYUguFpF4hLn1+zuJXZ2VjJK/LtbnzJKNmef++9pBV7TmoOH mKDP64Qb7H2oc37HqvuLqEH/sGi7saHyaVtXU1JsiWd+DLR0WGut6Zs1qJ2TMFuzjTEzgyCgt8h PGWywtnrD8tuwXaSdbOtfl5mqlT61A259ZO+Q0YLoB4FPhHnQFqJJ+s88RTo= X-Google-Smtp-Source: AGHT+IEOU8/F+fT9s3ciZ1AK8wbHaRYzZM7atnqV/8tC46Wodxg5T4Zbzfe9+Ml+B0/vQhIXyucxzQ== X-Received: by 2002:a05:600c:1c87:b0:45b:4282:7b61 with SMTP id 5b1f17b1804b1-45b517dae7emr25872255e9.35.1755874891444; Fri, 22 Aug 2025 08:01:31 -0700 (PDT) Received: from lili (nat-dsi-209.net.univ-paris-diderot.fr. [81.194.30.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b57498b37sm2148455e9.23.2025.08.22.08.01.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 08:01:30 -0700 (PDT) From: Simon Tournier In-Reply-To: <20250725173502.14568-2-sughosha@disroot.org> References: <20250725173502.14568-1-sughosha@disroot.org> <20250725173502.14568-2-sughosha@disroot.org> Date: Fri, 22 Aug 2025 16:37:20 +0200 Message-ID: <87ldnbv2vz.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi, On Fri, 25 Jul 2025 at 23:04, Sughosha via Guix-patches via wrote: > +(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 _) #~'()))))) I=E2=80=99m not sure to understand the replacement when 4a991b088c6 reads: --8<---------------cut here---------------start------------->8--- (define-public libmygpo-qt (package (name "libmygpo-qt") [...] (inputs (list qtbase-5)) --8<---------------cut here---------------end--------------->8--- Why libmygpo-qt does fit the bill? Cheers, simon From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 4/5] gnu: mariadb: Enable embedded server. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Aug 2025 15:02: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 X-Debbugs-Original-To: Sughosha via Guix-patches via , 75720@debbugs.gnu.org Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.175587490923670 (code B ref 75720); Fri, 22 Aug 2025 15:02:03 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Aug 2025 15:01:49 +0000 Received: from localhost ([127.0.0.1]:37101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upTH2-00069h-JQ for submit@debbugs.gnu.org; Fri, 22 Aug 2025 11:01:48 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:50446) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upTGv-00068x-Fw for 75720@debbugs.gnu.org; Fri, 22 Aug 2025 11:01:42 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-45a1b04f8b5so13987205e9.1 for <75720@debbugs.gnu.org>; Fri, 22 Aug 2025 08:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755874895; x=1756479695; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=HYfqHQ6Qp+AfMXK+sOPNxq4yx6QreLDQb5tjydWDZKw=; b=bKnIwlCEDP1gzB//KQ470dE7zEmjrwwiD011sAiSQrcUQ21qZdZ17dwS18nmIJK06m 5aW3BPdCMPHwW1YHoMR4GEtrVnUm8WE0fVW10iHQmOZ2RaH0lmMUTMs+xo51rXs5Sidt e2BiXkYyB67zZzhvdchMu9zVHyVH7PKL1FTYgQxH0hYV3uur3+Mx8HQ7Lm+UnrU9fDAb LessUQYwRpIEzM2Hdn6mYmjS+hYpXVe6/5wKtxpFL4iDDZUHSoxBanlwzsToI9s0U+DJ v/Pt6BoByVW495VPUQX0eZeXgtvDxBcb8uADSs86lDSLgdcmO66ZzhJKwvWMPNHrBZPK 8vVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755874895; x=1756479695; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HYfqHQ6Qp+AfMXK+sOPNxq4yx6QreLDQb5tjydWDZKw=; b=Uaq765rtYjHUvfC2n8QUjRbYxhMZzqAr9/NsjLoOnwD+CCtByFo3wcN5LikwzVuwaf Mjz39e8Olxz1QK6UMgm02jsdVYm4zWtXsBZdjAcorhO2eXJ445MFfTeThV0ggP7nGXPh m9trfAo48uT9faSmiS+O5t09qGwHY4YLcZB2hvbeJrkPPNc96QJ4AVsOBDqufhmYFkF1 AJVp6hHnn5nds3TWfvrSoKuobFKQX+4sKVWxl0NksLVA2PlTezTzKvvRNjKs7tpkIKTK nIuJZ15UsttGU3cSeB3008mKJ+99N/jrg9W1PigSglZpk5gdz8VxZGSJRPSC0wwIprgT zRdg== X-Forwarded-Encrypted: i=1; AJvYcCX/IRbwN4cXOVq5kwG1ONkPOx7L2/19+XNhfS7UdgzshpeiGPo/x0smk2KVQew2b3K7IJQGHA==@debbugs.gnu.org X-Gm-Message-State: AOJu0YyByuOsADNTrhhHwV6PcGe8lQwbmHcedkunFE5S46cs4vI1NXk2 nv57Gn0fiSqVUCmJqkMjvvVWkAXYPWhK4sq2kCgP04qMTfb/k1YDhsQH X-Gm-Gg: ASbGnctsmBv08A9gvoM8vN7dY5CJyNvqZ4uAtaJEDqQwpzTEi8m65Lv0LAkBe9YdQAo 4vTPYl7Z4SitUzEBssm7jsmDZvXgmXzPrbMd4sYDn6JAiTI5dpydZac3SsAImawA1znBU+8WNor t2yY6DNG5NXW4Rftu56h/UqphaRnEYKpxhDAOKk99hZsUK0o8VVZOmkCxLjX0LfP0ykBIASjPBX 62JBak9E2kuTGGi6z9DGKsfqS5+T6qIrGtbmsLtX+sk73jz1P28Arrji2gJzAEfjNScZtojrVBC xq/MjxmkW1fgvC5uEVVMNKvsNJN4whNZpN1YMm471mdNqTJ9/t3M7u28wFNmDUJ6p5p2dXXupMY ZlQv7VgW4x/xjBmVw1XCNzCQGWkyrCNZUMG2Suq8GUAEGFDhBs45wILqFTxU= X-Google-Smtp-Source: AGHT+IE0eYO7aZRgdto+Qs99XgwwjIRARgp/n3x+za+q8CpL3CkDXdEk9qK2qDFI0vOMfNIB3ASJwQ== X-Received: by 2002:a05:6000:2081:b0:3b9:148b:e78 with SMTP id ffacd0b85a97d-3c5dcdfc385mr2811660f8f.53.1755874893008; Fri, 22 Aug 2025 08:01:33 -0700 (PDT) Received: from lili (nat-dsi-209.net.univ-paris-diderot.fr. [81.194.30.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b5758a0bfsm810455e9.20.2025.08.22.08.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 08:01:32 -0700 (PDT) From: Simon Tournier In-Reply-To: <20250725173502.14568-4-sughosha@disroot.org> References: <20250725173502.14568-1-sughosha@disroot.org> <20250725173502.14568-4-sughosha@disroot.org> Date: Fri, 22 Aug 2025 16:58:37 +0200 Message-ID: <87h5xzv1wi.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Hi, On Fri, 25 Jul 2025 at 23:05, Sughosha via Guix-patches via wrote: > * gnu/packages/databases.scm (mariadb)[arguments]<#:configure-flags>: Add > "-DWITH_EMBEDDED_SERVER=ON". [...] > --- a/gnu/packages/databases.scm > +++ b/gnu/packages/databases.scm > @@ -1102,6 +1102,9 @@ (define-public mariadb > + ;; Enable embedded server. > + "-DWITH_EMBEDDED_SERVER=ON" Well, I do not know what would be the impact of this? Because mariadb has many dependents. :-) --8<---------------cut here---------------start------------->8--- $ guix refresh -l mariadb | cut -f1 -d':' Building the following 1176 packages would ensure 2401 dependent packages are rebuilt --8<---------------cut here---------------end--------------->8--- Cheers, simon From unknown Tue Sep 23 09:04:10 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 4/5] gnu: mariadb: Enable embedded server. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Aug 2025 15:02: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 X-Debbugs-Original-To: Sughosha via Guix-patches via , 75720@debbugs.gnu.org Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.175587490923677 (code B ref 75720); Fri, 22 Aug 2025 15:02:03 +0000 Received: (at 75720) by debbugs.gnu.org; 22 Aug 2025 15:01:49 +0000 Received: from localhost ([127.0.0.1]:37103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upTH3-00069o-7a for submit@debbugs.gnu.org; Fri, 22 Aug 2025 11:01:49 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:61744) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1upTGv-00068z-Qv for 75720@debbugs.gnu.org; Fri, 22 Aug 2025 11:01:42 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-45a1b0c8867so16780695e9.3 for <75720@debbugs.gnu.org>; Fri, 22 Aug 2025 08:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755874895; x=1756479695; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=gWpkLOVJby+H2lxHHgxf0/7jBP5KfxorWjYOuqFzEqQ=; b=ddbm7Qgnq2s/aLQxGZ4FacVChz/pqk8rK0h+139s9VYS5VvXVeXaw5BX8m3HNuhPdI gNAqGnFS3PikZEhGkmqAcS+BnLQDhNyoZu23uVLlylpL7Slg9DhlPMrRT25O5BrydnxJ FzKwlOimZqGi1gNvD5gjjI26zEStHylNHt8bjn8LLkJfllhDlA5B2MeeCa0kAtpIaySG SiOfx1gDZ7HKuoVrGSK8YNcR7jeHjQKKpuRYtydCjdTa+rNDTzDmpeA7WONecvYLw3bo KLawfkGexFFGuYdYOIaR0skvPwmn5bRsLiPR6xDeCVjh1ZSaDjN0ZBXU5Rv9Qj33VWMe dtdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755874895; x=1756479695; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gWpkLOVJby+H2lxHHgxf0/7jBP5KfxorWjYOuqFzEqQ=; b=rU5CQcWh1TdlUKOMujfet2rAATv8ehiJ8NyWEA4X6d0yYgDinwJf34+d8J9UUG0Yt1 XZAAXBvx+hEpYC15/h5wE6Q+AujH7aYpkakrP/kliF3G8M3KkG1MvW9MtS00pOQsy2jD /exSH368DKanQeAgGXPYddE/XDB8jPgaRxBf0OZ+lRszQYWoMVd+JO/Wf4L9GbrMdFFx rYBB40eo7xQPqZqI38iin1eC0u1wFLT8PoKEWSqJrGKC8WsQsJ4o+6cby+0yf+dscKBD eKPpzdYV9Fxnrtx8XbRSoCdgNFopK3IXKCu9GWKa0uP2te/+IvpLRaiZMtuHiw2bBRDl y8Ag== X-Forwarded-Encrypted: i=1; AJvYcCUJcE/u449cA2vGKmpROSis/UotHwDgt1CkMB7kIAOmPjAoTyYpsSxP626lqDLPoIyEg7LAjg==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzlBNhqoGEXfqPjVQbhGelVGrY6lH8iIgNLXKnRmNJnjpSuxa/G 0JPQut8lUMtJUJNnemPBn/1u+Zt1dUvVKcMnPJCQzsG1HBXmTkNx5lme X-Gm-Gg: ASbGnctd3VNxZrH8MupurJdCMP3bu0D3SIY+Q6DuktOypn1ph02skAOCPMM/gFMS6vj yJ8QlyLkDzyema62dVegIPojantnHHC5P8Lu4rZioknooLV2wMW4YPhPmpMPjya/UbP7kpV/GKF jW9OeN33Le+e0TTK89nvmaOzlXDAi2dnvit6z8hRcgvxNoR0ROajvq9dlVTkJS5iaW2eFWSPBoX I8n5r5pgzwFsniLvGoAdaCT4/20XtmuwabLXfll6SBVcNNZFc7K00k0BympPyz7qqBtQXjdJn3U tID3nSMh+kof9l6tZabpDD9LMnD6zRVXZQ+laskAfCS8KEaU/ICCcJMOy7w0QoAnBJojxEPZaXI +MmgndXJhNimNhkmdEPxeejkYu0ei5wxBWqwUQYHC8b/0a7N3GHyyz4Ej+60= X-Google-Smtp-Source: AGHT+IGoT0J/7leTDv8vNJ1/BxNDpYsI7IlGgXN9UVEf8wN7SR9TDhYfuOL5XKyh0aMb2I8ntLSY+g== X-Received: by 2002:a05:600c:444c:b0:458:bf9c:274f with SMTP id 5b1f17b1804b1-45b517d4cabmr24783915e9.29.1755874894808; Fri, 22 Aug 2025 08:01:34 -0700 (PDT) Received: from lili (nat-dsi-209.net.univ-paris-diderot.fr. [81.194.30.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b5744e9b1sm2267885e9.11.2025.08.22.08.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Aug 2025 08:01:33 -0700 (PDT) From: Simon Tournier In-Reply-To: <20250725173502.14568-4-sughosha@disroot.org> References: <20250725173502.14568-1-sughosha@disroot.org> <20250725173502.14568-4-sughosha@disroot.org> Date: Fri, 22 Aug 2025 17:00:07 +0200 Message-ID: <87cy8nv1u0.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) 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: -1.0 (-) Re, On Fri, 25 Jul 2025 at 23:05, Sughosha via Guix-patches via wrote: > * gnu/packages/databases.scm (mariadb)[arguments]<#:configure-flags>: Add > "-DWITH_EMBEDDED_SERVER=ON". > + ;; Enable embedded server. > + "-DWITH_EMBEDDED_SERVER=ON" > + Maybe, it would be better to create an new package e.g., mariadb-with-server that inherits from mariadb and has this option turned on. WDYT? Cheers, simon From unknown Tue Sep 23 09:04:10 2025 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: Sat, 23 Aug 2025 07:32: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, zimon.toutoune@gmail.com X-Debbugs-Original-To: Sughosha via Guix-patches via , 75720@debbugs.gnu.org, Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.175593427319962 (code B ref -1); Sat, 23 Aug 2025 07:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Aug 2025 07:31:13 +0000 Received: from localhost ([127.0.0.1]:38575 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1upiiX-0005Bu-2D for submit@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:13 -0400 Received: from lists.gnu.org ([2001:470:142::17]:49630) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1upiiV-0005Be-A0 for submit@debbugs.gnu.org; Sat, 23 Aug 2025 03:31:11 -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 1upiiP-0001J2-6o for guix-patches@gnu.org; Sat, 23 Aug 2025 03:31:05 -0400 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1upiiM-0000iJ-8i for guix-patches@gnu.org; Sat, 23 Aug 2025 03:31:04 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 875ED24E32; Sat, 23 Aug 2025 09:30:58 +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 2rfgfkP5ihMg; Sat, 23 Aug 2025 09:30:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1755934257; bh=maWb3tfLZSCM58qsvMlTrfEOW+V3ROCtXuqffLZ0/7g=; h=From:To:Subject:Date:In-Reply-To:References; b=Yg+tnjQ9gFPUoWxF8K54+ZUF9B/RT11aJACC0asMsYNd0KpfdjOIW6AR9fYwyYZeF bpiloFIclHpvNAsF+V0pJ9LMDZyFyhG6tBSXiKDUOZd/j7YtK/F9OJSt1J5qXjh2eb 5etSTDFKXLzkvJjYrDdLRc7IGcV9KOL1qNdVe6epbGP+EsFPmrAbHgQooU22+LgA6T fQuUpU3MZerH6H5hEDSKM4ssfcSjKds1VAol9XybWPf/HRsNT5jRUOROVWSQ4FMwa/ qvK25aGu/hIQav8e48+iXmayz04Q6vIZtRbSQWt3gzLTg/3Tgm/rZkSdDG1pD25hFb LH80Fsy9QrRNw== From: Sughosha Date: Sat, 23 Aug 2025 13:00:34 +0530 Message-ID: <5013156.GXAFRqVoOG@localhost.localdomain> In-Reply-To: <87cy8nv1u0.fsf@gmail.com> References: <20250725173502.14568-1-sughosha@disroot.org> <20250725173502.14568-4-sughosha@disroot.org> <87cy8nv1u0.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1937974.tdWV9SEqCh"; micalg="pgp-sha256"; protocol="application/pgp-signature" Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) 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.1 (/) --nextPart1937974.tdWV9SEqCh Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Sughosha Date: Sat, 23 Aug 2025 13:00:34 +0530 Message-ID: <5013156.GXAFRqVoOG@localhost.localdomain> In-Reply-To: <87cy8nv1u0.fsf@gmail.com> MIME-Version: 1.0 On Friday, August 22, 2025 8:30:07=E2=80=AFPM India Standard Time Simon Tou= rnier=20 wrote: > Re, >=20 > On Fri, 25 Jul 2025 at 23:05, Sughosha via Guix-patches via wrote: > > * gnu/packages/databases.scm (mariadb)[arguments]<#:configure-flags>: A= dd > > "-DWITH_EMBEDDED_SERVER=3DON". > >=20 > > + ;; Enable embedded server. > > + "-DWITH_EMBEDDED_SERVER=3DON" > > + >=20 > Maybe, it would be better to create an new package e.g., > mariadb-with-server that inherits from mariadb and has this option > turned on. WDYT? >=20 > Cheers, > simon Thanks for the suggestion. I will send a next patch series which adds maria= db- embedded instead of modifying mariadb. I created a pull request also in=20 Codeberg: https://codeberg.org/guix/guix/pulls/1556 for the same. =2D-=20 Sughosha --nextPart1937974.tdWV9SEqCh Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE6tGJ5HmbXl6yCioZzbwL2VlDpwYFAmipbhoACgkQzbwL2VlD pwa7mhAAnGxN9BuPwKIM1vdBKWgL53rwHZtbO6y+Rv4Xds1Cp07GPXrOguEp+TtX /nBBeF8VPGnyaulRSH5UCwi10E6MluajW9mlwYvGwLKPIbHSY9EV0ke3d0A2OC/K /5JyqbKCzQfRioGimdwTI4xD9oP83uTHCc0GHO3pAwxsNVw2B3+jKUZotR/M2uA3 E2LzTxUy2cr9sp3iQZlW5S52DwsH26jhgcg5DtneLxV8D9y4PJO6NmBCWHQpj/QA Wo4ngoHOhk78gHOl4ZoPtX76PvZXVWddZ6SWypSNlerWOaOQ9zSzCF5ZeNcWLVe7 Awoy7L6Ez9YOZBzbi7oqEmGxufmhRZPGn7a1BIMq/xSkS1ddKpADeaJYX8uiVLCq kFbBV8MQgCU7oN59EZ/oXbIk4pV1ZQkNaYuCete0GAQeR2JIWO9/w99USJNR0FsU UDM7sHQYLEHUSLbscbSUWui9yaoUeeDpLoOzH4mQ8xFi6zjzx0jxDgOo982ZeJH+ mGpK0dwhxNpB9IuG/+LfF+dOI53TCrGsRN8MlDbNmP2/p372EwdaCRekH+zLqiJu DwaVqYAvgdNc2dRN7jw/xFrABnrsrocYIm6aDSf2a+i4QtWnXrsQECzKd6awrEIl yKggqOvMQG2O1atda9Fj45dLEzNdJEG0y8xvA7taqPFfBL115XA= =O709 -----END PGP SIGNATURE----- --nextPart1937974.tdWV9SEqCh-- From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha Date: Sat, 23 Aug 2025 13:00:59 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 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 ) base-commit: 48fea09d68d575e82c986c93785786165bd95f82 -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha Date: Sat, 23 Aug 2025 13:01:00 +0530 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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") -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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 -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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") -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 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== From: Sughosha 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) 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: -1.0 (-) * 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") -- 2.50.1 From unknown Tue Sep 23 09:04:10 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Sughosha Subject: bug#75720: closed (Re: [bug#75720] [PATCH v6 4/5] gnu: mariadb: Enable embedded server.) Message-ID: References: <87h5xvlpor.fsf@gmail.com> X-Gnu-PR-Message: they-closed 75720 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 75720@debbugs.gnu.org Date: Mon, 25 Aug 2025 10:00:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1756116003-29047-1" This is a multi-part message in MIME format... ------------=_1756116003-29047-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #75720: [PATCH 0/4] gnu: Add amarok. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 75720@debbugs.gnu.org. --=20 75720: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D75720 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1756116003-29047-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 75720-done) by debbugs.gnu.org; 25 Aug 2025 09:59:59 +0000 Received: from localhost ([127.0.0.1]:48352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uqTza-0007Xc-QB for submit@debbugs.gnu.org; Mon, 25 Aug 2025 05:59:59 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:49356) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uqTzX-0007Wp-0E for 75720-done@debbugs.gnu.org; Mon, 25 Aug 2025 05:59:56 -0400 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-3c79f0a604aso903989f8f.2 for <75720-done@debbugs.gnu.org>; Mon, 25 Aug 2025 02:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1756115988; x=1756720788; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=dWG+1WipjHfC+61WXiwngTR7nHdHLnbX0D3eD6HZTnM=; b=nRJJ5c4x90x3PRTlADbXMkDT9iTK2/C7gsCXzeFh0qWHxAulrM2xAz8JBEHcs67MGO wSx9StA1bclpnhVH9WU+BJnegxOWWFCMOxMe6u8tS7XXOwD7DfjgNZQNAKg6czgGk4kW qAtPpjPztA+YZco4Ra78NiZmUlDtQ6sPuejwbKqm0aoY3XHgYHKs7XyOXpBXEJjt2FK9 i266VY1BtGzKA58XhuoLHWYhoOo1w3nNfuRze+/IST6QXPxOV1YLkuFOP8fSc15X8rjp AMXxwSh7Iy0VqbrsEdpRWhviwDk+XOWRtmls/bwqqnjcvYoyOg8+wyTQccH5yDFaHrSF ct/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756115988; x=1756720788; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=dWG+1WipjHfC+61WXiwngTR7nHdHLnbX0D3eD6HZTnM=; b=XCPDcF930tb3dsa5EIxo+m0CpfvLhxrPoCGDaMQfuAnfXaKX71rz+0WAvOUrSLMk2g nFvyv9MESjrLpo5Bw3BkAjnVmr8UQ2Q0XbxwF+4gbrH6GLU2js3hij+s2lQeIJJf8TKI xGGS6U5vHXg5wXXedGx+YAlmkIhARFYsEszrs9cHplKb8aq7P4oA+uCSC6uBUOd6OgQC FzkJMXRekGCyqf2+CblAt5dy2+bTHoQNoBljSRQKjfZkMtYaM/K//5XKEnkP9XxU0RiQ yIrFpSu6c7KSMEZJd+rJwmzoqxzeS3JOwTchE5COMO6xWIHtqMuCxM0SYfYbiWb/HwRG alcA== X-Gm-Message-State: AOJu0YxTBAcLEA6Vmu9xDTcH7eTQ/GMNdZMZ0jZp5E/bJmwYJ3HpbRQb FhQtfoeLWpK1GTAT5AKWG5/eCg3vaTNKmf3ey37yuThrhnHM2KtxKsT6Z6gK5Q== X-Gm-Gg: ASbGnctyxKTj7VCHoBKhjg3POtkJmm6jbK/iAbndFACZbvoxztpDGMS9eYe7s+a+KBr 3GOEf18F5iOzWQEdHFeWFzyffhc4fpeZyGeHDa6DQBrO4/hAe5go7MJaTN0nOu8KrI38peC7nXp MSa/iqhNudTsM9zMJy6t3BZ7L9FWSAlu/w4xGRmV+Nw8VAUism1XeNZ841Jt124DaI/6HI4lMQ3 mHDiTon6Nc5DMSyMEu3Spbcum1YkGSP/IMZubKWB7lTcPeV2Iof/XgMNUnyVy8NNfaJh31ZXUi5 xISccpXEYwWZfgUB0eydb6jqzqrHrpXPCWqgNc+B07u1kMvp29mZn7RmM1ZeL1J3Ghp2YKok/kt uOJt891cXPvopxk3HQj3ttU528CWduMprYcva987yzqzaiOxFjbNQ5Zl4ijw= X-Google-Smtp-Source: AGHT+IGIeZGJN9fIks28N9Y/oq5wJUZUAxhTEQSCInx4om4X5yG58Y1qAVQC8LnIXvQjQsMShO127Q== X-Received: by 2002:a05:6000:4212:b0:3c7:f9a9:7b44 with SMTP id ffacd0b85a97d-3c7f9a97f14mr4567822f8f.14.1756115987561; Mon, 25 Aug 2025 02:59:47 -0700 (PDT) Received: from lili (nat-dsi-209.net.univ-paris-diderot.fr. [81.194.30.209]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b5757378dsm102351795e9.15.2025.08.25.02.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 02:59:46 -0700 (PDT) From: Simon Tournier To: Sughosha Subject: Re: [bug#75720] [PATCH v6 4/5] gnu: mariadb: Enable embedded server. In-Reply-To: <5013156.GXAFRqVoOG@localhost.localdomain> (sughosha@disroot.org's message of "Sat, 23 Aug 2025 13:00:34 +0530") References: <20250725173502.14568-1-sughosha@disroot.org> <20250725173502.14568-4-sughosha@disroot.org> <87cy8nv1u0.fsf@gmail.com> <5013156.GXAFRqVoOG@localhost.localdomain> Date: Mon, 25 Aug 2025 11:24:04 +0200 Message-ID: <87h5xvlpor.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 75720-done Cc: 75720-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: -1.0 (-) Hi, On Sat, 23 Aug 2025 at 13:00, Sughosha wrote: > Thanks for the suggestion. I will send a next patch series which adds mariadb- > embedded instead of modifying mariadb. I created a pull request also in > Codeberg: https://codeberg.org/guix/guix/pulls/1556 for the same. Cool, thank you. Closing this one to avoid duplication. :-) Cheers, simon ------------=_1756116003-29047-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 21 Jan 2025 02:28:44 +0000 Received: from localhost ([127.0.0.1]:52681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ta40R-0004ZG-Tu for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:28:44 -0500 Received: from lists.gnu.org ([2001:470:142::17]:58458) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ta40N-0004Yo-3Z for submit@debbugs.gnu.org; Mon, 20 Jan 2025 21:28:41 -0500 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 1ta40H-0006AO-2Q for guix-patches@gnu.org; Mon, 20 Jan 2025 21:28:33 -0500 Received: from layka.disroot.org ([178.21.23.139]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ta40F-0004Bz-3L for guix-patches@gnu.org; Mon, 20 Jan 2025 21:28:32 -0500 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6783525C5C; Tue, 21 Jan 2025 03:28:27 +0100 (CET) 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 HRECy5YhZSGH; Tue, 21 Jan 2025 03:28:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1737426503; bh=KBfxv/T3bZmMxF105tC8RGpJWxOrCICnfxYb1GFLYBU=; h=From:To:Cc:Subject:Date; b=JEBzLCF8ysW1YoF9wPwbsxmgORv/LvccGOQM6Yf+luDs158Iya9K+kiKDiQYhcGnY 74zAK5aQNhapFR2a5OgmFzPn9/vIxHlH+pkt3ElE9kiWkJFJ2tJM6YFqPgORp3t7TL KlM7P9+R1LKfH/3HWcLUSQja4XaRQ9mZGFrw5oQC5XiaHZMF+DentOKkO/VlfaAXG7 zQitBPliT9ezvvwaiwClVYMxOnh3qBADS+Yw2/RDl6PlURD9ExYKpk57tvob52iOnT xvA/U9VQIb+gVlM1PY0vUS4kuL4uFqB8pLIGgm853YgvhLVBVqc4D5hyy0JyykwRw2 utbeOKw9sV9cw== From: Sughosha To: guix-patches@gnu.org Subject: [PATCH 0/4] gnu: Add amarok. Date: Tue, 21 Jan 2025 07:57:39 +0530 Message-ID: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=sughosha@disroot.org; helo=layka.disroot.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-Debbugs-Envelope-To: submit Cc: Sughosha 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.1 (/) This series adds amarok. Sughosha (4): gnu: libmygpo-qt: Update to 1.1.0-0.4d1f482. gnu: Add libmygpo-qt6. gnu: Add taglib-extras. gnu: Add amarok. gnu/local.mk | 4 +- gnu/packages/gpodder.scm | 70 ++++---- gnu/packages/kde-multimedia.scm | 97 +++++++++++ gnu/packages/mp3.scm | 29 ++++ ...amarok-3.2.1-fix-including-mygpo-qt6.patch | 148 +++++++++++++++++ .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 --------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------ ...libmygpo-qt-suppot-building-with-qt6.patch | 153 ++++++++++++++++++ 8 files changed, 472 insertions(+), 158 deletions(-) create mode 100644 gnu/packages/patches/amarok-3.2.1-fix-including-mygpo-qt6.patch 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 create mode 100644 gnu/packages/patches/libmygpo-qt-suppot-building-with-qt6.patch base-commit: 7aae0e2c159b1612b405a372b18f25fbb58f9d82 -- 2.47.1 ------------=_1756116003-29047-1--