Control: tag -1 patch fixed-upstream

On Tue, Oct 15, 2024 at 03:39:41PM +0300, Adrian Bunk wrote:
> Source: pidgin
> Version: 2.14.13-1
> Severity: serious
> Tags: ftbfs
> 
> https://buildd.debian.org/status/logs.php?pkg=pidgin&ver=2.14.13-1%2Bb1
> 
> ...
> ../../../../libpurple/protocols/bonjour/parser.c:200:9: error: initialization 
> of 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError 
> *)'} from incompatible pointer type 'void (*)(void *, const xmlError *)' {aka 
> 'void (*)(void *, const struct _xmlError *)'} [-Wincompatible-pointer-types]
>   200 |         bonjour_parser_structured_error_handler /*serror*/
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> ../../../../libpurple/protocols/bonjour/parser.c:200:9: note: (near 
> initialization for 'bonjour_parser_libxml.serror')
> make[7]: *** [Makefile:697: libbonjour_la-parser.lo] Error 1
> ...

This was fixed upstream with

  https://reviews.imfreedom.org/r/3016/

  https://reviews.imfreedom.org/r/3018/

The second one doesn't apply as-is to the Debian packaged version.
Backported combination attached, the package builds for me with this.

This is a blocker for the Perl 5.40 transition as pidgin couldn't be
rebuilt for libperl5.40.
-- 
Niko Tyni   nt...@debian.org
>From 3088789e91b5bbec86712dc01958df0ba9a52b17 Mon Sep 17 00:00:00 2001
From: Niko Tyni <nt...@debian.org>
Date: Fri, 18 Oct 2024 08:48:17 +0100
Subject: [PATCH] Fix incompatible type conversion errors

Backported from

  https://reviews.imfreedom.org/r/3016/
  https://reviews.imfreedom.org/r/3018/

Bug-Debian: https://bugs.debian.org/1085148
---
 libpurple/protocols/bonjour/parser.c | 2 +-
 libpurple/protocols/jabber/parser.c  | 2 +-
 libpurple/xmlnode.c                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libpurple/protocols/bonjour/parser.c b/libpurple/protocols/bonjour/parser.c
index baa9e24..9e6cce5 100644
--- a/libpurple/protocols/bonjour/parser.c
+++ b/libpurple/protocols/bonjour/parser.c
@@ -197,7 +197,7 @@ static xmlSAXHandler bonjour_parser_libxml = {
 	NULL,									/*_private*/
 	bonjour_parser_element_start_libxml,	/*startElementNs*/
 	bonjour_parser_element_end_libxml,		/*endElementNs*/
-	bonjour_parser_structured_error_handler /*serror*/
+	(xmlStructuredErrorFunc)bonjour_parser_structured_error_handler /*serror*/
 };
 
 void
diff --git a/libpurple/protocols/jabber/parser.c b/libpurple/protocols/jabber/parser.c
index 14bd421..1e57a9c 100644
--- a/libpurple/protocols/jabber/parser.c
+++ b/libpurple/protocols/jabber/parser.c
@@ -246,7 +246,7 @@ static xmlSAXHandler jabber_parser_libxml = {
 	NULL,									/*_private*/
 	jabber_parser_element_start_libxml,		/*startElementNs*/
 	jabber_parser_element_end_libxml,		/*endElementNs*/
-	jabber_parser_structured_error_handler	/*serror*/
+	(xmlStructuredErrorFunc)jabber_parser_structured_error_handler	/*serror*/
 };
 
 void
diff --git a/libpurple/xmlnode.c b/libpurple/xmlnode.c
index 28e427f..c1c7928 100644
--- a/libpurple/xmlnode.c
+++ b/libpurple/xmlnode.c
@@ -700,7 +700,7 @@ static xmlSAXHandler xmlnode_parser_libxml = {
 	NULL, /* _private */
 	xmlnode_parser_element_start_libxml, /* startElementNs */
 	xmlnode_parser_element_end_libxml,   /* endElementNs   */
-	xmlnode_parser_structural_error_libxml, /* serror */
+	(xmlStructuredErrorFunc)xmlnode_parser_structural_error_libxml, /* serror */
 };
 
 xmlnode *
-- 
2.45.2

Reply via email to