From patchwork Fri Jul 25 17:34:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sughosha X-Patchwork-Id: 43266 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CF3A327BC4B; Fri, 25 Jul 2025 18:43:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0546E27BC49 for ; Fri, 25 Jul 2025 18:43:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ufMS1-0002Ao-96; Fri, 25 Jul 2025 13:43:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ufMRk-0001yF-0x for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ufMRj-0006Hn-Or for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=umOCI0VajetMiwC/VyYKtBiqVyRsY2DN1VaciV5md00=; b=MSKsyRoF9MoXKHI4m9VISDLs2Fmn+JZPVKOUQzW16vd1ED0EMGYsXzBi/i55JV9mjHNcPF2nquTSVujHNyirtrGmhoK8D4EVLF+DYH9Xbb1V0qwxngT61esEU3rmTu7565/CLZXlbX2BddfBZbh00MQNMoZXkHiovuebRUpARj6O51stIiVdhKpV/Bxwg3knwSVibqLHKBkmjfFYKghnkkdLQp9GPLKd6puedsAW2Cah4VP9NcjVuDVrqMZ6/AaoMtKXrp8v4vqgF4vmBis3zrzEGoCVXTKXqTIvCbVw+YohCPgFt8MKkqAXWb2moaAPLdjRFmCfKysUj3VTtHqodQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ufMRj-0000gP-HF for guix-patches@gnu.org; Fri, 25 Jul 2025 13:43:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#75720] [PATCH v6 1/5] gnu: libmygpo-qt: Update to 1.2.0. References: In-Reply-To: Resent-From: Sughosha Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jul 2025 17:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75720 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75720@debbugs.gnu.org Cc: Sughosha Received: via spool by 75720-submit@debbugs.gnu.org id=B75720.17534653342484 (code B ref 75720); Fri, 25 Jul 2025 17:43:03 +0000 Received: (at 75720) by debbugs.gnu.org; 25 Jul 2025 17:42:14 +0000 Received: from localhost ([127.0.0.1]:35961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ufMQv-0000dp-Jy for submit@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:14 -0400 Received: from layka.disroot.org ([178.21.23.139]:43088) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1ufMQl-0000cO-7z for 75720@debbugs.gnu.org; Fri, 25 Jul 2025 13:42:07 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E2B7622F48; Fri, 25 Jul 2025 19:42:00 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id WNGPPJzJyUq1; Fri, 25 Jul 2025 19:41:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1753465319; bh=ClX2SDQVN1NtwpiJjo96/DFEc+dn0q6AbmswoD7mcAo=; h=From:To:Cc:Subject:Date; b=WpQnt9Ug446hXFjlO8YmAaAkBT8ROlivRQu2WLdL0YkTK6JaIQ3T/yg5lIoddVkh2 oDOEJ8C9P01Yk7BGqj1uQLOyMtXC/GQqXyCqQHy54NlllY5opNtwmdNjfds1emCYQj mrZThIlVxjYC+5slVYt68YAmE/7EcCe0MwxTSK0U2sPy30+x1XzIfkHWuXS5aVtlV9 5R3CuUf6oEYwrdWYXc+B3LM6WDhcdQec1T0zqzRXUMPDPl305kyvcMa3QTAW9M67ie A05efBbDQWZVto65yzb4v7Rqaw05TxFlpZX2JAO2h1KOfiwsMcHoNKKNBSaYAJqhcT C1uYZ74M7Pq4Q== Date: Fri, 25 Jul 2025 23:04:58 +0530 Message-ID: <20250725173502.14568-1-sughosha@disroot.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Sughosha X-ACL-Warn: , Sughosha via Guix-patches X-Patchwork-Original-From: Sughosha via Guix-patches via From: Sughosha Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gpodder.scm (libmygpo-qt): Update to 1.2.0. [source]: Remove the patches. [inputs]: Replace qtbase-5 with qtbase. [arguments]: Switch to gexp. <#:configure-flags>: Remove "-DMYGPO_BUILD_TESTS=ON"; add "-DBUILD_WITH_QT6=ON". <#:phases>: Replace 'check phase. * gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch: Delete file. * gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch: Delete file. * gnu/local.mk: Deregister the deleted patches. Change-Id: I3afb30499477ec2d756f7010afcf901cb0646bde --- gnu/local.mk | 2 - gnu/packages/gpodder.scm | 22 +++--- .../patches/libmygpo-qt-fix-qt-5.11.patch | 78 ------------------- .../libmygpo-qt-missing-qt5-modules.patch | 51 ------------ 4 files changed, 13 insertions(+), 140 deletions(-) delete mode 100644 gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch delete mode 100644 gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6e4664ac35..407edabdb8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1775,8 +1775,6 @@ dist_patch_DATA = \ %D%/packages/patches/libmp4v2-c++11.patch \ %D%/packages/patches/libmpeg2-arm-private-symbols.patch \ %D%/packages/patches/libmpeg2-global-symbol-test.patch \ - %D%/packages/patches/libmygpo-qt-fix-qt-5.11.patch \ - %D%/packages/patches/libmygpo-qt-missing-qt5-modules.patch \ %D%/packages/patches/libphonenumber-reproducible-build.patch \ %D%/packages/patches/libqalculate-3.8.0-libcurl-ssl-fix.patch \ %D%/packages/patches/libquicktime-ffmpeg.patch \ diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index c3e1c9b496..bd2c7271ae 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -129,26 +129,30 @@ (define-public gpodder (define-public libmygpo-qt (package (name "libmygpo-qt") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "http://stefan.derkits.at/files/" "libmygpo-qt/libmygpo-qt." version ".tar.gz")) (sha256 (base32 - "1kg18qrq2rsswgzhl65r3mlyx7kpqg4wwnbp4yiv6svvmadmlxl2")) - (patches (search-patches "libmygpo-qt-fix-qt-5.11.patch" - "libmygpo-qt-missing-qt5-modules.patch")))) + "1rpallrgfdpvdw2npjizw0gj7lidb8hxs7ak16jkryq2yijpzkjh")))) (build-system cmake-build-system) (native-inputs (list pkg-config)) (inputs - (list qtbase-5)) + (list qtbase)) (arguments - '(#:configure-flags '("-DMYGPO_BUILD_TESTS=ON") - ;; TODO: Enable tests when https://github.com/gpodder/gpodder/issues/446 - ;; is fixed. - #:tests? #f)) + (list #:configure-flags + #~(list "-DBUILD_WITH_QT6=ON") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; TODO: Enable JsonCreatorTest-test when + ;; https://github.com/gpodder/gpodder/issues/446 is fixed. + (invoke "ctest" "-E" "JsonCreatorTest-test"))))))) (home-page "https://gpodder.github.io") (synopsis "Qt/C++ library wrapping the gpodder web service") (description "@code{libmygpo-qt} is a Qt/C++ library wrapping the diff --git a/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch b/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch deleted file mode 100644 index 69673c90ee..0000000000 --- a/gnu/packages/patches/libmygpo-qt-fix-qt-5.11.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1b53767b988b339aac8b353327a1542b2a0c0610 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 15 Apr 2018 22:29:33 +0200 -Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) - ---- - CMakeLists.txt | 3 --- - src/CMakeLists.txt | 8 ++++++-- - tests/CMakeLists.txt | 12 +++++++++--- - 3 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eb006d9..fa4b0cb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,9 +34,6 @@ else() - set( QT_DONT_USE_QTGUI TRUE ) - include( ${QT_USE_FILE} ) - -- macro(qt5_use_modules) -- endmacro() -- - macro(qt_wrap_cpp) - qt4_wrap_cpp(${ARGN}) - endmacro() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 802125b..253e81e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) - - add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) - --target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) - set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) --qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network ) -+ -+if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network) -+else() -+ target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES}) -+endif() - - install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index a3e3223..4f77158 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU - - # UrlBuilder library - add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) --qt5_use_modules( UrlBuilder Core ) -+if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries( UrlBuilder Qt5::Core ) -+endif() - # JSONCreator library - QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h ) - add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC}) --qt5_use_modules( JsonCreator Core Network ) -+if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) -+endif() - - set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) - -@@ -25,7 +29,9 @@ macro(add_libmygpo_test _source) - add_executable(${_name} ${_source} ${${_name}_MOC_SRC}) - target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY}) - add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name}) -- qt5_use_modules(${_name} Network Test) -+ if( NOT BUILD_WITH_QT4 ) -+ target_link_libraries(${_name} Qt5::Network Qt5::Test) -+ endif() - endmacro(add_libmygpo_test) - - add_libmygpo_test( UrlBuilderTest.cpp ) diff --git a/gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch b/gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch deleted file mode 100644 index aa9ed2c0f7..0000000000 --- a/gnu/packages/patches/libmygpo-qt-missing-qt5-modules.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 0d76d960727018bddf04c6cc89552af69aaa7e55 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 15 Apr 2018 22:20:34 +0200 -Subject: [PATCH] Add missing Qt5Network, Qt5Test, make BUILD_WITH_QT4 more - strict - ---- - CMakeLists.txt | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a1f652..eb006d9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,25 +5,25 @@ project( libmygpo-qt ) - set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) - --option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) -+option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) - - if( NOT BUILD_WITH_QT4 ) -- find_package(Qt5Core QUIET) -- if( Qt5Core_DIR ) -- set(MYGPO_QT_VERSION_SUFFIX 5) -- -- macro(qt_wrap_cpp) -- qt5_wrap_cpp(${ARGN}) -- endmacro() -+ if( MYGPO_BUILD_TESTS ) -+ find_package(Qt5 REQUIRED COMPONENTS Core Network Test CONFIG) -+ else() -+ find_package(Qt5 REQUIRED COMPONENTS Core Network CONFIG) - endif() -+ set(MYGPO_QT_VERSION_SUFFIX 5) -+ -+ macro(qt_wrap_cpp) -+ qt5_wrap_cpp(${ARGN}) -+ endmacro() - - # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for - # Qt5 - set(MYGPO_QT_MAJOR_VERSION "5") - set(MYGPO_QT4_QJSON_DEP "") --endif() -- --if( NOT Qt5Core_DIR ) -+else() - message(STATUS "Could not find Qt5, searching for Qt4 instead...") - message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") - if( MYGPO_BUILD_TESTS )