guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

13/13: gnu: komikku: Update to 1.0.0.


From: guix-commits
Subject: 13/13: gnu: komikku: Update to 1.0.0.
Date: Sat, 1 Oct 2022 12:10:53 -0400 (EDT)

lilyp pushed a commit to branch master
in repository guix.

commit 4b3493ed0156709a924f31ef4c9a5efa0815dfe8
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sun Sep 18 00:20:46 2022 +0200

    gnu: komikku: Update to 1.0.0.
    
    * 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(-)

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 <david@daviwil.com>
 ;;; Copyright © 2019, 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2019, 2020 Jonathan Brielmaier <jonathan.brielmaier@web.de>
-;;; Copyright © 2019, 2020, 2021 Liliana Marie Prikler 
<liliana.prikler@gmail.com>
+;;; Copyright © 2019-2022 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Pierre Neidhardt <mail@ambrevar.xyz>
 ;;; Copyright © 2020 raingloom <raingloom@riseup.net>
@@ -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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]