From f19bcd748c09ed9bd68899e8765a7661ec3a0638 Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Sun, 8 Sep 2024 14:42:59 -0700 Subject: [PATCH] community/telepathy-logger: fix build with GCC 14 --- community/telepathy-logger/APKBUILD | 8 +++- community/telepathy-logger/gcc14.patch | 52 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 community/telepathy-logger/gcc14.patch diff --git a/community/telepathy-logger/APKBUILD b/community/telepathy-logger/APKBUILD index 1bdf9c209bc..cac2f8b6469 100644 --- a/community/telepathy-logger/APKBUILD +++ b/community/telepathy-logger/APKBUILD @@ -22,6 +22,7 @@ checkdepends="dbus" subpackages="$pkgname-static $pkgname-dev $pkgname-doc" source="https://telepathy.freedesktop.org/releases/telepathy-logger/telepathy-logger-$pkgver.tar.bz2 python3.patch + gcc14.patch " prepare() { @@ -53,5 +54,8 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3eda26133a4c38eeb79b01cbe3b7801a5eb773e8b4e6ce621c47d3ca701025364c6b2b890caea00104f01ba85ae891a6fad82d7a9dc487fd7a980221cede451 telepathy-logger-0.8.2.tar.bz2 -54e8accf12572245e3d02c971d3b2945a52b9e1eb124310ac3ceb80a30f18748ebd80e0cd8a363256e054380182bcd490e4fe6d2dfb68f7effb98f85747341c5 python3.patch" +sha512sums=" +f3eda26133a4c38eeb79b01cbe3b7801a5eb773e8b4e6ce621c47d3ca701025364c6b2b890caea00104f01ba85ae891a6fad82d7a9dc487fd7a980221cede451 telepathy-logger-0.8.2.tar.bz2 +54e8accf12572245e3d02c971d3b2945a52b9e1eb124310ac3ceb80a30f18748ebd80e0cd8a363256e054380182bcd490e4fe6d2dfb68f7effb98f85747341c5 python3.patch +4110056b029db419992135b4e00ba861d2ad023752275d2dbafc71d8ef9a815fa4b4161230e3976cd4e209906f9f1e77a1c562ece92b6d033ef774084f5d5d0f gcc14.patch +" diff --git a/community/telepathy-logger/gcc14.patch b/community/telepathy-logger/gcc14.patch new file mode 100644 index 00000000000..494719e9e34 --- /dev/null +++ b/community/telepathy-logger/gcc14.patch @@ -0,0 +1,52 @@ +From 2e50d1855b3395b622c768094ff2b617a0208724 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +Date: Thu, 1 Aug 2024 19:26:43 +0200 +Subject: [PATCH] Fix incompatible pointer types + +gcc14 defaults to -Werror=incompatible-pointer-types . +Fix build error with this option. +--- + telepathy-logger/conf.c | 2 +- + telepathy-logger/dbus-service.c | 2 +- + telepathy-logger/log-manager.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/telepathy-logger/conf.c b/telepathy-logger/conf.c +index 888114d..9aaa222 100644 +--- a/telepathy-logger/conf.c ++++ b/telepathy-logger/conf.c +@@ -132,7 +132,7 @@ tpl_conf_constructor (GType type, + + if (conf_singleton != NULL) + { +- retval = g_object_ref (conf_singleton); ++ retval = g_object_ref (G_OBJECT (conf_singleton)); + } + else + { +diff --git a/telepathy-logger/dbus-service.c b/telepathy-logger/dbus-service.c +index ee3c353..5f8c158 100644 +--- a/telepathy-logger/dbus-service.c ++++ b/telepathy-logger/dbus-service.c +@@ -97,7 +97,7 @@ favourite_contact_closure_new (TplDBusService *self, + FavouriteContactClosure *closure; + + closure = g_slice_new0 (FavouriteContactClosure); +- closure->service = g_object_ref (G_OBJECT (self)); ++ closure->service = TPL_DBUS_SERVICE (g_object_ref (G_OBJECT (self))); + closure->account = g_strdup (account); + closure->contact_id = g_strdup (contact_id); + /* XXX: ideally we'd up the ref count or duplicate this */ +diff --git a/telepathy-logger/log-manager.c b/telepathy-logger/log-manager.c +index 49bc6db..8ae500d 100644 +--- a/telepathy-logger/log-manager.c ++++ b/telepathy-logger/log-manager.c +@@ -160,7 +160,7 @@ log_manager_constructor (GType type, + GObject *retval = NULL; + + if (G_LIKELY (manager_singleton)) +- retval = g_object_ref (manager_singleton); ++ retval = g_object_ref (G_OBJECT (manager_singleton)); + else + { + retval = G_OBJECT_CLASS (tpl_log_manager_parent_class)->constructor (