[Pkg-xmpp-devel] Bug#957384: jabber-muc: ftbfs with GCC-10

[Logan Rosen]

Package: jabber-muc
Version: 0.8-7
Followup-For: Bug #957384
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu hirsute ubuntu-patch
Control: tags -1 patch

Hi,

In Ubuntu, the attached patch was applied to achieve the following:

  * d/p/gcc_10.diff: Fix FTBFS with GCC 10 due to multiple definitions.

Thanks for considering the patch.

Logan
-------------- next part --------------
diff -Nru jabber-muc-0.8/debian/patches/gcc_10.diff jabber-muc-0.8/debian/patches/gcc_10.diff
--- jabber-muc-0.8/debian/patches/gcc_10.diff	1969-12-31 19:00:00.000000000 -0500
+++ jabber-muc-0.8/debian/patches/gcc_10.diff	2021-01-17 18:13:34.000000000 -0500
@@ -0,0 +1,51 @@
+--- a/include/jcomp-compat.h
++++ b/include/jcomp-compat.h
+@@ -66,6 +66,6 @@
+     handel hds;
+ };
+ 
+-int deliver__flag;
++extern int deliver__flag;
+ 
+ typedef void(*shutdown_func)(void *arg);
+--- a/src/conference_user.c
++++ b/src/conference_user.c
+@@ -19,7 +19,7 @@
+  */
+ 
+ #include "conference.h"
+-extern int deliver__flag;
++int deliver__flag;
+ 
+ cnu con_user_new(cnr room, jid id)
+ {
+--- a/include/jcomp.h
++++ b/include/jcomp.h
+@@ -98,7 +98,7 @@
+ #define _STREAM_ERROR	   4
+ #define _STREAM_SHUTDOWN   5
+ 
+-jcr_instance jcr;
++extern jcr_instance jcr;
+ 
+ void log_debug(char *, const char *, ...) G_GNUC_PRINTF(2, 3);
+ void log_warn(char *, const char *, ...) G_GNUC_PRINTF(2, 3);
+--- a/src/conference.c
++++ b/src/conference.c
+@@ -20,6 +20,8 @@
+ 
+ #include "conference.h"
+ 
++jcr_instance jcr;
++
+ void con_server_browsewalk(gpointer key, gpointer data, gpointer arg)
+ {
+   cnr room = (cnr)data;
+@@ -1064,7 +1066,6 @@
+ /*** everything starts here ***/
+ void conference(instance i, xmlnode x)
+ {
+-  extern jcr_instance jcr;
+   cni master;
+   xmlnode cfg;
+   jid sadmin;
diff -Nru jabber-muc-0.8/debian/patches/series jabber-muc-0.8/debian/patches/series
--- jabber-muc-0.8/debian/patches/series	2019-05-12 04:13:37.000000000 -0400
+++ jabber-muc-0.8/debian/patches/series	2021-01-17 18:09:44.000000000 -0500
@@ -1,2 +1,3 @@
 cflags_hardening.diff
 cross.diff
+gcc_10.diff