~ruther/guix-local

9b8ef0abd045e5fc04ab0e7489444e38ccef4cb7 — Liliana Marie Prikler 1 year, 10 months ago 94000d8
gnu: telepathy-glib: Fix build.

* gnu/packages/patches/telepathy-glib-fix-test.patch: New file.
* gnu/packages/glib.scm (telepathy-glib)[patches]: Use it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
3 files changed, 33 insertions(+), 0 deletions(-)

M gnu/local.mk
M gnu/packages/glib.scm
A gnu/packages/patches/telepathy-glib-fix-test.patch
M gnu/local.mk => gnu/local.mk +1 -0
@@ 2300,6 2300,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/telegram-desktop-unbundle-cppgir.patch   \
  %D%/packages/patches/telegram-desktop-unbundle-gsl.patch      \
  %D%/packages/patches/telegram-purple-adjust-test.patch	\
  %D%/packages/patches/telepathy-glib-fix-test.patch	\
  %D%/packages/patches/teuchos-remove-duplicate-using.patch	\
  %D%/packages/patches/texi2html-document-encoding.patch	\
  %D%/packages/patches/texi2html-i18n.patch			\

M gnu/packages/glib.scm => gnu/packages/glib.scm +1 -0
@@ 1161,6 1161,7 @@ libraries.  Examples include gtk+, webkit, libsoup and many more.")
        (string-append
         "https://telepathy.freedesktop.org/releases/telepathy-glib/"
         "telepathy-glib-" version ".tar.gz"))
       (patches (search-patches "telepathy-glib-fix-test.patch"))
       (sha256
        (base32
         "1w3kja8j3gz2apal79bi3hq44xk5g78aphrqbw983l6df7bp98xh"))))

A gnu/packages/patches/telepathy-glib-fix-test.patch => gnu/packages/patches/telepathy-glib-fix-test.patch +31 -0
@@ 0,0 1,31 @@
From aa858698d7ede76b3b4c825ca14b8061c24f14e1 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Mon, 4 Sep 2023 17:56:15 +0900
Subject: [PATCH] test: make test-cm accepted with newer GLib

With GLib 2.77.3, the key value "foo\;bar" is no longer accepted
with g_key_file_get_string and it returns null string result.

Modify key value in test file to get it accepted by new GLib.
---
 tests/dbus/telepathy/managers/test_manager_file.manager | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/dbus/telepathy/managers/test_manager_file.manager b/tests/dbus/telepathy/managers/test_manager_file.manager
index 426ad4a7e..bdb3f90f1 100644
--- a/tests/dbus/telepathy/managers/test_manager_file.manager
+++ b/tests/dbus/telepathy/managers/test_manager_file.manager
@@ -79,11 +79,9 @@ default-triply-escaped-semicolon-in-list = list\\\;of;misc;
 param-empty-list = as
 default-empty-list =
 
-# this is probably technically a Desktop Entry spec violation?
-# we should be permissive, interpreting this as either "foo\;bar" or "foo;bar"
-# seems reasonable
+# the value is "foo\\;bar"
 param-escaped-semicolon = s
-default-escaped-semicolon = foo\;bar
+default-escaped-semicolon = foo\\;bar
 
 # all the other types
 param-object = o
\ No newline at end of file