fix complication failed due to gcc upgrade

This commit is contained in:
liheavy 2021-08-04 09:39:25 +08:00
parent 5a57499534
commit 0c9587436a
2 changed files with 32 additions and 2 deletions

View File

@ -0,0 +1,26 @@
diff --git a/plugins/vnc/vinagre-vnc-connection.h b/plugins/vnc/vinagre-vnc-connection.h
index 4788ae2..f37642c 100644
--- a/plugins/vnc/vinagre-vnc-connection.h
+++ b/plugins/vnc/vinagre-vnc-connection.h
@@ -26,7 +26,7 @@
G_BEGIN_DECLS
-gboolean scaling_command_line;
+extern gboolean scaling_command_line;
#define VINAGRE_TYPE_VNC_CONNECTION (vinagre_vnc_connection_get_type ())
#define VINAGRE_VNC_CONNECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VINAGRE_TYPE_VNC_CONNECTION, VinagreVncConnection))
diff --git a/plugins/vnc/vinagre-vnc-plugin.c b/plugins/vnc/vinagre-vnc-plugin.c
index a5884da..438aa99 100644
--- a/plugins/vnc/vinagre-vnc-plugin.c
+++ b/plugins/vnc/vinagre-vnc-plugin.c
@@ -35,6 +35,8 @@
#include "vinagre-vnc-connection.h"
#include "vinagre-vnc-tab.h"
+gboolean scaling_command_line;
+
void vnc_register_types (void);
static void vinagre_vnc_protocol_iface_init (VinagreProtocolInterface *iface);

View File

@ -1,6 +1,6 @@
Name: vinagre
Version: 3.22.0
Release: 12
Release: 13
Summary: A remote desktop viewer for GNOME
License: GPLv2+
URL: https://wiki.gnome.org/Apps/Vinagre
@ -8,6 +8,7 @@ Source0: https://download.gnome.org/sources/%{name}/3.22/%{name}-%{versio
Patch0: 0001-handle-new-freerdp-pkgconfig-name.patch
Patch1: 0002-freerdp2-32bpp.patch
Patch2: 0003-fix-compilation-failed.patch
BuildRequires: pkgconfig(avahi-gobject) pkgconfig(avahi-ui-gtk3) automake autoconf
BuildRequires: pkgconfig(freerdp2) pkgconfig(gtk+-3.0) pkgconfig(gtk-vnc-2.0) pkgconfig(libsecret-1)
@ -28,7 +29,7 @@ This is Vinagre, a remote desktop viewer for the GNOME Desktop.
%build
ACLOCAL_FLAGS="$ACLOCAL_FLAGS" USE_GNOME2_MACROS=1 . gnome-autogen.sh
export CFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-format-nonliteral -fcommon"
export CFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-format-nonliteral"
%configure \
%ifarch %{ix86} x86_64
--enable-spice \
@ -62,6 +63,9 @@ make check
%{_datadir}/man/man1/*
%changelog
* Mon Aug 2 2021 Haiwei Li <lihaiwei8@huawei.com> - 3.22.0-13
- Fix complication failed due to gcc upgrade
* Thu Feb 13 2020 daiqianwen <daiqianwen@huawei.com> - 3.22.0-12
- Type:bugfix
- ID:NA