From 4b3493ed0156709a924f31ef4c9a5efa0815dfe8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 18 Sep 2022 00:20:46 +0200 Subject: gnu: komikku: Update to 1.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (komikku): Update to 1.0.0. [arguments]<#:meson>: Use meson-0.63. <#:phases>: Adjust ‘skip-gtk-update-icon-cache’ [inputs]: Replace gtk+ with gtk. Replace libhandy with libadwaita. Replace webkitgtk-with-libsoup2 with webkitgtk-next. --- gnu/packages/gnome.scm | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 81b8c241ee..fbaef9eb6e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2019 David Wilson ;;; Copyright © 2019, 2020 Raghav Gururajan ;;; Copyright © 2019, 2020 Jonathan Brielmaier -;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler +;;; Copyright © 2019-2022 Liliana Marie Prikler ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Pierre Neidhardt ;;; Copyright © 2020 raingloom @@ -13010,7 +13010,7 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.41.0") + (version "1.0.0") (source (origin (method git-fetch) @@ -13020,11 +13020,12 @@ profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "17r059srxrx26w40swy47pdpyigyjdczp8550g4rfh86qs3ld4il")))) + "0k0s644ylbyq3a4vhdn9ymmk7kb0jgcpxxrhpr1g2nrcq7fqn116")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t + #:meson meson-0.63 #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-sources @@ -13036,8 +13037,12 @@ profiler via Sysprof, debugging support, and more.") "return data_dir_path")))) (add-after 'unpack 'skip-gtk-update-icon-cache (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") (which "true"))))) + (substitute* "meson.build" + (("([a-z_]*): true" all option) + (cond ; cond rather than match saves an import + ((string=? option "gtk_update_icon_cache") + (string-append option ": false")) + (else all)))))) (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/komikku") @@ -13045,8 +13050,8 @@ profiler via Sysprof, debugging support, and more.") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs (list bash-minimal - gtk+ - libhandy + gtk + libadwaita libnotify libsecret python @@ -13064,7 +13069,7 @@ profiler via Sysprof, debugging support, and more.") python-pygobject python-requests python-unidecode - webkitgtk-with-libsoup2)) + webkitgtk-next)) (native-inputs (list desktop-file-utils gettext-minimal -- cgit v1.2.3 6'>transformations: Add '--with-patch'....Suggested by Philippe Swartvagher <philippe.swartvagher@inria.fr>. * guix/transformations.scm (transform-package-patches): New procedure. (%transformations): Add it as 'with-patch'. (%transformation-options, show-transformation-options-help/detailed): Add '--with-patch'. * tests/transformations.scm ("options->transformation, with-patch"): New test. * doc/guix.texi (Package Transformation Options): Document it. Ludovic Courtès 2020-12-21tests: Check the effect of '--without-tests' on implicit inputs....* tests/transformations.scm ("options->transformation, without-tests"): Ensure TAR has #:tests? #f. Ludovic Courtès 2020-10-31guix build: Move transformation options to (guix transformations)....* guix/transformations.scm: New file. * tests/scripts-build.scm: Rename to... * tests/transformations.scm: ... this. * Makefile.am (MODULES): Add 'guix/transformations.scm'. (SCM_TESTS): Adjust to rename. * guix/scripts/build.scm (numeric-extension?) (tarball-base-name, <downloaded-file>, download-to-store*) (compile-downloaded-file, package-with-source) (transform-package-source, evaluate-replacement-specs) (transform-package-inputs, transform-package-inputs/graft) (%not-equal, package-git-url, evaluate-git-replacement-specs) (transform-package-source-branch, transform-package-source-commit) (transform-package-source-git-url, package-dependents/spec) (package-toolchain-rewriting, transform-package-toolchain) (transform-package-with-debug-info, transform-package-tests) (%transformations, transformation-procedure, %transformation-options) (show-transformation-options-help, options->transformation) (package-transformations): Move to (guix transformations). * guix/scripts/environment.scm: Adjust accordingly. * guix/scripts/graph.scm: Likewise. * guix/scripts/install.scm: Likewise. * guix/scripts/pack.scm: Likewise. * guix/scripts/package.scm: Likewise. * guix/scripts/upgrade.scm: Likewise. * po/guix/POTFILES.in: Add 'guix/transformations.scm'. Ludovic Courtès