all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Josselin Poiret via Bug reports for GNU Guix <bug-guix@gnu.org>
To: Steven Roose <steven@roose.io>, 63154@debbugs.gnu.org
Cc: Josselin Poiret <dev@jpoiret.xyz>
Subject: bug#63154: [PATCH 1/2] gnu: libnma: Update to 1.10.6.
Date: Sat, 29 Apr 2023 10:59:07 +0200	[thread overview]
Message-ID: <af87f58b0687d00cc1cce6f5c459030a6e3fb224.1682758526.git.dev@jpoiret.xyz> (raw)
In-Reply-To: <cover.1682758525.git.dev@jpoiret.xyz>

From: Josselin Poiret <dev@jpoiret.xyz>

* gnu/packages/gnome.scm (libnma): Update to 1.10.6.  Also remove general
schema that belongs to network-manager-applet.
---
 gnu/packages/gnome.scm | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7aa7180f5e..a98f2fbe5a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1735,7 +1735,7 @@ (define-public rygel
 (define-public libnma
   (package
     (name "libnma")
-    (version "1.10.2")
+    (version "1.10.6")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -1743,14 +1743,26 @@ (define-public libnma
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0h095a26w3sgbspsf7wzz8ddg62j3jb9ckrrv41k7cdp0k2dkhsg"))))
+                "1avdsw1l61gwr29lzvlr4dh3qz6ypsc3xvfahrcprlqa34mzp9jk"))))
     (build-system meson-build-system)
     (arguments
      ;; GTK 4.x depends on Rust (indirectly) so pull it only on platforms
      ;; where it is supported.
-     (list #:configure-flags (if (supported-package? gtk)
-                                 #~(list "-Dlibnma_gtk4=true")
-                                 #~(list "-Dlibnma_gtk4=false"))))
+     (list
+      #:configure-flags
+      (if (supported-package? gtk)
+          #~(list "-Dlibnma_gtk4=true")
+          #~(list "-Dlibnma_gtk4=false"))
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; We follow upstream's recommendation at
+          ;; https://gitlab.gnome.org/GNOME/libnma/-/commit/9166164387b0367becbe3400af696f925fef0ab1
+          (add-after 'install 'delete-org.gnome.nm-applet.gschema
+            (lambda _
+              (delete-file
+               (string-append
+                #$output
+                "/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml")))))))
     (native-inputs
      (list docbook-xml-4.3
            gettext-minimal
-- 
2.39.2





  reply	other threads:[~2023-04-29  9:00 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-28 18:10 bug#63154: Settings schema 'org.gnome.nm-applet.eap' is not installed Steven Roose
2023-04-28 18:51 ` Mario Forzanini via Bug reports for GNU Guix
2023-04-29  8:59 ` bug#63154: [PATCH 0/2] Update network-manager-applet and libnma Josselin Poiret via Bug reports for GNU Guix
2023-04-29  8:59   ` Josselin Poiret via Bug reports for GNU Guix [this message]
2023-04-29  8:59   ` bug#63154: [PATCH 2/2] gnu: network-manager-applet: Update to 1.32.0 Josselin Poiret via Bug reports for GNU Guix
2023-05-09  2:29     ` bug#63154: Settings schema 'org.gnome.nm-applet.eap' is not installed Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=af87f58b0687d00cc1cce6f5c459030a6e3fb224.1682758526.git.dev@jpoiret.xyz \
    --to=bug-guix@gnu.org \
    --cc=63154@debbugs.gnu.org \
    --cc=dev@jpoiret.xyz \
    --cc=steven@roose.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.