diff options
Diffstat (limited to 'gnu/packages/gpodder.scm')
| -rw-r--r-- | gnu/packages/gpodder.scm | 43 |
1 files changed, 29 insertions, 14 deletions
diff --git a/gnu/packages/gpodder.scm b/gnu/packages/gpodder.scm index c3e1c9b496..5ce98a6058 100644 --- a/gnu/packages/gpodder.scm +++ b/gnu/packages/gpodder.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019, 2020, 2021 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at> -;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2022 Maxim Cournoyer <maxim@guixotic.coop> ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,26 +129,30 @@ locally for later listening.") (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 @@ -156,6 +160,17 @@ locally for later listening.") 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 flags) + #~(delete "-DBUILD_WITH_QT6=ON" #$flags)))))) + (define-public python-mygpoclient (package (name "python-mygpoclient") @@ -213,8 +228,8 @@ in Python.") ;; Since ronn-ng uses a newer ruby-nokogiri, the test suite would fail on a ;; free call with the error: "free(): invalid pointer". Use the latest ;; commit, which is immune to that problem. - (let ((revision "0") - (commit "da9727de1b9e4e636be21bf07c73eb41f5d8439b")) + (let ((revision "1") + (commit "e97b179227b4fc7e2e2bc5a373933624c0467daa")) (package (name "castget") (version (git-version "2.0.0" revision commit)) @@ -225,7 +240,7 @@ in Python.") (url "https://github.com/mlj/castget") (commit commit))) (sha256 - (base32 "0d5ji21af5mfj1xa90v4hp104c1ipy076175kp7nzz1c4sxdadff")) + (base32 "1dsbmfkchza9bwcsks2iyq5n2sj55pdmh79jpg3hisxpjgqcvpyy")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs |