From db41d883a8b80e097271f5c6e42ed8197aa6372c Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Mon, 20 Sep 2021 06:15:30 -0600
Subject: [PATCH] community/rtpengine: fix build with latest glib
---
community/rtpengine/APKBUILD | 8 +++--
community/rtpengine/fix-glib-build.patch | 45 ++++++++++++++++++++++++
2 files changed, 51 insertions(+), 2 deletions(-)
create mode 100644 community/rtpengine/fix-glib-build.patch
diff --git a/community/rtpengine/APKBUILD b/community/rtpengine/APKBUILD
index 39cbe736e9ec..4bb5fed80c01 100644
--- a/community/rtpengine/APKBUILD
+++ b/community/rtpengine/APKBUILD
@@ -35,6 +35,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sipwise/rtpengine/archive/mr
disable-O3.patch
fix-default-config.patch
+ fix-glib-build.patch
"
builddir="$srcdir"/$pkgname-mr$pkgver
@@ -82,7 +83,10 @@ recording() {
done
}
-sha512sums="7a6a1662a927c59365952fb2aec6e9f7751590005efecf526b4e20120c41ce2f2afc530b7f688765027966fa47092c372d5196e81e4492bcd0892272fb2c665c rtpengine-9.3.1.2.tar.gz
+sha512sums="
+7a6a1662a927c59365952fb2aec6e9f7751590005efecf526b4e20120c41ce2f2afc530b7f688765027966fa47092c372d5196e81e4492bcd0892272fb2c665c rtpengine-9.3.1.2.tar.gz
a696277b8ef477420db13e4628818b728f318a8ba52f727ce8b7969f5f0182f9389f3b931eb4542ce1fe1a6fbc4dcdc3d6959090de76b1981f434b3fafebc224 rtpengine.initd
9e59d1e1507abc139c016d218e496919bc7053d143b3220753fe7a7b350bbf74facc2f43cbaf8f0b47984608a1fead7171270b0c06d2c866e5b21cf2a94da81d disable-O3.patch
-a86f896955cb06252c81abaffd362f999a0a4f38dbafb34739015f787bbd966adba1e4e3232edf562a38415a4f69c4b21d62745cb7ef8e730d0259f098765685 fix-default-config.patch"
+a86f896955cb06252c81abaffd362f999a0a4f38dbafb34739015f787bbd966adba1e4e3232edf562a38415a4f69c4b21d62745cb7ef8e730d0259f098765685 fix-default-config.patch
+5eed099d8748d7dad9076d371225fab97aba31cf0fa08424a18953b43ba6d2d574b8726232d33f8ead8a3f82e4487035745640bde6dc3c85d86555c7188d4ab9 fix-glib-build.patch
+"
diff --git a/community/rtpengine/fix-glib-build.patch b/community/rtpengine/fix-glib-build.patch
new file mode 100644
index 000000000000..117ec5bf1b78
--- /dev/null
+++ b/community/rtpengine/fix-glib-build.patch
@@ -0,0 +1,45 @@
+From d90de55e83be25906fc7565a3e766ae8c4700fdc Mon Sep 17 00:00:00 2001
+From: Richard Fuchs <rfuchs@sipwise.com>
+Date: Mon, 9 Aug 2021 14:53:16 -0400
+Subject: [PATCH] TT#14008 rename g_tree_remove_all to avoid namespace conflict
+
+closes #1327
+
+Change-Id: I30e745a7d2a2b0fa8cef90ecb76881071c437695
+---
+ daemon/ice.c | 8 ++++----
+ include/aux.h | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/daemon/ice.c b/daemon/ice.c
+index 0437cdccb..68e24cd1c 100644
+--- a/daemon/ice.c
++++ b/daemon/ice.c
+@@ -908,10 +908,10 @@ static void __recalc_pair_prios(struct ice_agent *ag) {
+
+ ilogs(ice, LOG_DEBUG, "Recalculating all ICE pair priorities");
+
+- g_tree_remove_all(&nominated, ag->nominated_pairs);
+- g_tree_remove_all(&succ, ag->succeeded_pairs);
+- g_tree_remove_all(&valid, ag->valid_pairs);
+- g_tree_remove_all(&all, ag->all_pairs);
++ g_tree_find_remove_all(&nominated, ag->nominated_pairs);
++ g_tree_find_remove_all(&succ, ag->succeeded_pairs);
++ g_tree_find_remove_all(&valid, ag->valid_pairs);
++ g_tree_find_remove_all(&all, ag->all_pairs);
+
+ for (l = ag->candidate_pairs.head; l; l = l->next) {
+ pair = l->data;
+diff --git a/include/aux.h b/include/aux.h
+index e0cee6af7..4ee701eb4 100644
+--- a/include/aux.h
++++ b/include/aux.h
+@@ -182,7 +182,7 @@ INLINE void g_tree_find_all(GQueue *out, GTree *t, GEqualFunc f, void *data) {
+ INLINE void g_tree_get_values(GQueue *out, GTree *t) {
+ g_tree_find_all(out, t, NULL, NULL);
+ }
+-INLINE void g_tree_remove_all(GQueue *out, GTree *t) {
++INLINE void g_tree_find_remove_all(GQueue *out, GTree *t) {
+ GList *l;
+ g_queue_init(out);
+ g_tree_find_all(out, t, NULL, NULL);
--
GitLab