GNU bug report logs - #67493
[PATCH 0/6] Update telegram desktop

Previous Next

Package: guix-patches;

Reported by: Saku Laesvuori <saku <at> laesvuori.fi>

Date: Mon, 27 Nov 2023 19:24:01 UTC

Severity: normal

Tags: patch

Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Saku Laesvuori <saku <at> laesvuori.fi>
To: 67493 <at> debbugs.gnu.org
Cc: Saku Laesvuori <saku <at> laesvuori.fi>, Liliana Marie Prikler <liliana.prikler <at> gmail.com>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, Raghav Gururajan <rg <at> raghavgururajan.name>
Subject: [bug#67493] [PATCH 1/6] gnu: Update glib-next to 2.78.1
Date: Mon, 27 Nov 2023 21:26:05 +0200
* gnu/packages/glib.scm (glib-next): Update to 2.78.1.
[patches]: Remove redundant patch.
[phases]<disable-failing-tests>: Disable new failing tests.

Change-Id: I0d4bab8248cd33fde35fecc1c2c07e2bdb83d733
---
 gnu/packages/glib.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b5eb4602da..353cb95aaf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -486,7 +486,7 @@ (define-public glib-next
   (package
     (inherit glib)
     (name "glib")
-    (version "2.73.3")
+    (version "2.78.1")
     (source
      (origin
        (inherit (package-source glib))
@@ -494,11 +494,14 @@ (define-public glib-next
         (string-append "mirror://gnome/sources/"
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
+       (patches (filter (lambda (patch-file)
+                          (not (string-suffix? "glib-skip-failing-test.patch" patch-file)))
+                        (origin-patches (package-source glib))))
        (snippet
         '(substitute* "glib/tests/spawn-test.c"
            (("/bin/sh") "sh")))
        (sha256
-        (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
+        (base32 "1ckqxmpiwvxbgm57bmy4m9cww3v7zgwf4ciqml76azahz38c6nwi"))))
     (arguments
      (substitute-keyword-arguments (package-arguments glib)
        ((#:test-options test-options ''())
@@ -520,8 +523,10 @@ (define-public glib-next
                                  "desktop-app-info.c"
                                  "file.c"
                                  "gdbus-address-get-session.c"
-                                 "gdbus-peer.c")
-                    (("[ \t]*g_test_add_func.*;") "")))
+                                 "gdbus-peer.c"
+                                 "gdbus-server-auth.c"
+                                 "portal-support-snap.c")
+                    (("g_test_run.*;") "0;")))
 
                 #$@(if (target-x86-32?)
                        ;; Comment out parts of timer.c that fail on i686 due to
-- 
2.41.0





This bug report was last modified 242 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.