[gnome-boxes/vte-without-fno-exception: 2/2] flatpak: Fix build of libtirpc with new gcc

[Felipe Borges <felipeborges src gnome org>]

commit 1a8c86d3e8d51d379307d432d5f510df1041632c
Author: Felipe Borges <felipeborges gnome org>
Date:   Wed Jun 3 12:45:14 2020 +0200

    flatpak: Fix build of libtirpc with new gcc
    
    Avoid multiple-definiton with gcc -fno-common
    GCC 10 enables -fno-common by default.
    
    See https://bugs.gentoo.org/705896

 .../libtirpc-1.2.5-avoid-multiple-definition.patch | 65 ++++++++++++++++++++++
 build-aux/flatpak/org.gnome.Boxes.json             |  4 ++
 2 files changed, 69 insertions(+)
---
diff --git a/build-aux/flatpak/libtirpc-1.2.5-avoid-multiple-definition.patch 
b/build-aux/flatpak/libtirpc-1.2.5-avoid-multiple-definition.patch
new file mode 100644
index 00000000..07aa2cce
--- /dev/null
+++ b/build-aux/flatpak/libtirpc-1.2.5-avoid-multiple-definition.patch
@@ -0,0 +1,65 @@
+From 2d6097b9d063af8225463181162e01ad6e853e05 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness gentoo org>
+Date: Wed, 26 Feb 2020 07:06:08 -0500
+Subject: net-libs/libtirpc: add missing patch
+
+Package-Manager: Portage-2.3.84, Repoman-2.3.20
+Signed-off-by: Anthony G. Basile <blueness gentoo org>
+---
+ .../libtirpc-1.2.5-avoid-multiple-definition.patch | 44 ++++++++++++++++++++++
+ 1 file changed, 44 insertions(+)
+ create mode 100644 net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
+
+diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch 
b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
+new file mode 100644
+index 0000000..a5fecc5
+--- /dev/null
++++ b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch
+@@ -0,0 +1,44 @@
++From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001
++From: Mike Gilbert <floppym gentoo org>
++Date: Sun, 19 Jan 2020 16:57:45 -0500
++Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common
++
++GCC 10 enables -fno-common by default.
++
++Bug: https://bugs.gentoo.org/705896
++---
++ src/rpc_com.h | 3 +--
++ src/svc.c     | 3 +++
++ 2 files changed, 4 insertions(+), 2 deletions(-)
++
++diff --git a/src/rpc_com.h b/src/rpc_com.h
++index 10bec79..76badef 100644
++--- a/src/rpc_com.h
+++++ b/src/rpc_com.h
++@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *);
++ void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *);
++ 
++ 
++-SVCXPRT **__svc_xports;
++-int __svc_maxrec;
+++extern int __svc_maxrec;
++ 
++ #ifdef __cplusplus
++ }
++diff --git a/src/svc.c b/src/svc.c
++index b59467b..6db164b 100644
++--- a/src/svc.c
+++++ b/src/svc.c
++@@ -57,6 +57,9 @@
++ 
++ #define max(a, b) (a > b ? a : b)
++ 
+++static SVCXPRT **__svc_xports;
+++int __svc_maxrec;
+++
++ /*
++  * The services list
++  * Each entry represents a set of procedures (an rpc program).
++-- 
++2.25.0
++
+-- 
+cgit v1.2.1
+
diff --git a/build-aux/flatpak/org.gnome.Boxes.json b/build-aux/flatpak/org.gnome.Boxes.json
index 0da7810d..b8bb152a 100644
--- a/build-aux/flatpak/org.gnome.Boxes.json
+++ b/build-aux/flatpak/org.gnome.Boxes.json
@@ -122,6 +122,10 @@
                     "type" : "archive",
                     "url" : "http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.1.4.tar.bz2";,
                     "sha256" : "2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d"
+                },
+                {
+                    "type" : "patch",
+                    "path": "libtirpc-1.2.5-avoid-multiple-definition.patch"
                 }
             ]
         },