mirrors/guru
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/guru.git synced 2026-07-09 23:23:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

net-libs/telepathy-haze: fix fix-Wincompatible-pointer-types

Browse Source 
Closes: https://bugs.gentoo.org/887865
Closes: https://bugs.gentoo.org/862984
Signed-off-by: Takuya Wakazono <pastalian46@gmail.com>
This commit is contained in:
Takuya Wakazono
2024-12-08 21:31:31 +09:00
parent 48c46c76ee
commit 6a3f3bd68b
3 changed files with 71 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
net-libs/telepathy-haze/files/telepathy-haze-0.8.1-fix-Wincompatible-pointer-types.patch Normal file
View File

@@ -0,0 +1,50 @@
https://bugs.gentoo.org/887865
Fix Wincompatible-pointer-types.
--- a/src/media-backend.c
+++ b/src/media-backend.c
@@ -531,7 +531,7 @@ haze_media_backend_ready (TpSvcMediaSessionHandler *iface,
static void
haze_media_backend_error (TpSvcMediaSessionHandler *iface,
- guint errno,
+ guint err,
const gchar *message,
DBusGMethodInvocation *context)
{
@@ -561,7 +561,7 @@ haze_media_backend_error (TpSvcMediaSessionHandler *iface,
}
DEBUG ("Media.SessionHandler::Error called, error %u (%s) -- "
- "emitting error on each stream", errno, message);
+ "emitting error on each stream", err, message);
purple_media_end (priv->media, NULL, NULL);
@@ -579,7 +579,7 @@ haze_media_backend_error (TpSvcMediaSessionHandler *iface,
{
HazeMediaStream *stream = g_ptr_array_index (tmp, i);
- haze_media_stream_error (stream, errno, message, NULL);
+ haze_media_stream_error (stream, err, message, NULL);
}
g_ptr_array_free (tmp, TRUE);
--- a/src/media-stream.c
+++ b/src/media-stream.c
@@ -849,14 +849,14 @@ haze_media_stream_error (HazeMediaStream *self,
*/
static void
haze_media_stream_error_async (TpSvcMediaStreamHandler *iface,
- guint errno,
+ guint err,
const gchar *message,
DBusGMethodInvocation *context)
{
HazeMediaStream *self = HAZE_MEDIA_STREAM (iface);
GError *error = NULL;
- if (haze_media_stream_error (self, errno, message, &error))
+ if (haze_media_stream_error (self, err, message, &error))
{
tp_svc_media_stream_handler_return_from_error (context);
}

11
net-libs/telepathy-haze/files/telepathy-haze-0.8.1-remove-broken-test.patch Normal file
View File

@@ -0,0 +1,11 @@
https://bugs.gentoo.org/862984
--- a/tests/twisted/simple-caps.py
+++ b/tests/twisted/simple-caps.py
@@ -92,6 +92,4 @@
exec_test(test_self_handle)
exec_test(test_someone_else, do_connect=False, protocol=JabberXmlStream)
- if config.MEDIA_ENABLED:
- exec_test(test_media)

12
net-libs/telepathy-haze/telepathy-haze-0.8.1.ebuild
View File

@@ -3,7 +3,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
PYTHON_COMPAT=( python3_{10..13} )
inherit python-any-r1
@@ -22,8 +22,9 @@ IUSE="test"
RDEPEND="
dev-libs/dbus-glib
dev-libs/glib:2
net-im/pidgin[dbus]
net-im/pidgin:=[dbus]
net-libs/telepathy-glib
sys-apps/dbus
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -41,6 +42,13 @@ BDEPEND="
RESTRICT="!test? ( test )"
PATCHES=(
# bug #887865
"${FILESDIR}/${P}-fix-Wincompatible-pointer-types.patch"
# bug #862984
"${FILESDIR}/${P}-remove-broken-test.patch"
)
python_check_deps() {
if use test ; then
python_has_version "dev-python/twisted[${PYTHON_USEDEP}]"