Balló György pushed to branch main at Arch Linux / Packaging / Packages /
telepathy-glib
Commits:
15165105 by Balló György at 2024-08-01T19:49:32+02:00
Cherry-pick commit instead of patch
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − telepathy-glib-pr3-test-cm-with-newer-glib.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -15,10 +15,8 @@ pkgbase = telepathy-glib
depends = glibc
source =
git+https://gitlab.freedesktop.org/telepathy/telepathy-glib.git?signed#tag=telepathy-glib-0.24.2
source = telepathy-glib-function-type-cast.patch
- source = telepathy-glib-pr3-test-cm-with-newer-glib.patch
validpgpkeys = AA33B0D27868E36C151780F0FE0B6D736B1195ED
b2sums =
529f200eeb03a65e3722928b4bacb81469c81f586e4f87d509beb70434bbeb226e8024ff78827c63bb3976ea44246293f680fcbe9aa2a321b52b138e12c04113
b2sums =
7a2fd782f700741f97133203f7ca23cbe6028c99cd5118b97eb6d35191868097bc50fbfd8b149f83c622a9c86309a580f06c680051f52d93416a98323ad45fa1
- b2sums =
2e18ed3b4957a072b6f5441f976117ef4af45c60fa37b30fc21f34c516cf2d7f4e48f0120588c019d443862b53c7ce3187485df5da5ba4cd153c3a8a8c14bf71
pkgname = telepathy-glib
=====================================
PKGBUILD
=====================================
@@ -26,23 +26,21 @@ makedepends=(
source=(
"git+https://gitlab.freedesktop.org/telepathy/$pkgname.git?signed#tag=$pkgname-$pkgver";
telepathy-glib-function-type-cast.patch
- telepathy-glib-pr3-test-cm-with-newer-glib.patch
)
b2sums=(
529f200eeb03a65e3722928b4bacb81469c81f586e4f87d509beb70434bbeb226e8024ff78827c63bb3976ea44246293f680fcbe9aa2a321b52b138e12c04113
7a2fd782f700741f97133203f7ca23cbe6028c99cd5118b97eb6d35191868097bc50fbfd8b149f83c622a9c86309a580f06c680051f52d93416a98323ad45fa1
-
2e18ed3b4957a072b6f5441f976117ef4af45c60fa37b30fc21f34c516cf2d7f4e48f0120588c019d443862b53c7ce3187485df5da5ba4cd153c3a8a8c14bf71
)
validpgpkeys=(AA33B0D27868E36C151780F0FE0B6D736B1195ED) # Alexandr Akulich
<[email protected]>
prepare() {
cd $pkgname
- # Fix build
- git apply -3 ../telepathy-glib-function-type-cast.patch
+ # https://gitlab.freedesktop.org/telepathy/telepathy-glib/-/merge_requests/3
+ git cherry-pick -n aa858698d7ede76b3b4c825ca14b8061c24f14e1
- # Fix tests
- git apply -3 ../telepathy-glib-pr3-test-cm-with-newer-glib.patch
+ # https://gitlab.freedesktop.org/telepathy/telepathy-glib/-/merge_requests/4
+ git apply -3 ../telepathy-glib-function-type-cast.patch
autoreconf -fi
}
=====================================
telepathy-glib-pr3-test-cm-with-newer-glib.patch deleted
=====================================
@@ -1,34 +0,0 @@
-From aa858698d7ede76b3b4c825ca14b8061c24f14e1 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <[email protected]>
-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
---
-GitLab
-
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/telepathy-glib/-/commit/15165105d6391ee7778ba79bf46d18577797854d
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/telepathy-glib/-/commit/15165105d6391ee7778ba79bf46d18577797854d
You're receiving this email because of your account on gitlab.archlinux.org.
