- fix building with gcc 10, rebuild with openssl 3.0.0, rel 2

diff --git a/gcc10.patch b/gcc10.patch
new file mode 100644 (file)
index 0000000..7baedfc
--- /dev/null
+++ b/gcc10.patch
@@ -0,0 +1,50 @@
+From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 28 Jan 2020 22:21:01 +0300
+Subject: [PATCH] Fix build with -fno-common
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+GCC 10 defaults to -fno-common
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ src/util.c | 3 +++
+ src/util.h | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index a82a1a4..6a52ebf 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -47,6 +47,9 @@ int hxl = 0;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ MUTEX(x11Mutex);
+ MUTEX(scrollMutex);
++MUTEX(clientMutex);
++MUTEX(inputMutex);
++MUTEX(pointerMutex);
+ #endif
+ 
+ int nfix(int i, int n);
+diff --git a/src/util.h b/src/util.h
+index 35c1afd..99b5dd1 100644
+--- a/src/util.h
++++ b/src/util.h
+@@ -102,9 +102,9 @@ extern struct timeval _mysleep;
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
+ extern MUTEX(x11Mutex);
+ extern MUTEX(scrollMutex);
+-MUTEX(clientMutex);
+-MUTEX(inputMutex);
+-MUTEX(pointerMutex);
++extern MUTEX(clientMutex);
++extern MUTEX(inputMutex);
++extern MUTEX(pointerMutex);
+ #endif
+ 
+ #define X_INIT INIT_MUTEX(x11Mutex)
+-- 
+2.21.1
+

diff --git a/x11vnc.spec b/x11vnc.spec
index 36c30c9aef18927a784377794abbe5edb18bdb98..3ed5cd493d0ccb3ab8012853c0ff5336561c7c0b 100644 (file)
--- a/x11vnc.spec
+++ b/x11vnc.spec
@@ -2,7 +2,7 @@ Summary:        A VNC server for the current X11 session
 Summary(pl.UTF-8):     Program serwujący aktualną sesję X11 poprzez VNC
 Name:          x11vnc
 Version:       0.9.16
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         X11/Applications/Networking
 #Source0Download: https://github.com/LibVNC/x11vnc/releases
@@ -12,6 +12,7 @@ Source1:      %{name}-x11vncd
 Source2:       %{name}-x11vncd.init
 Source3:       %{name}-x11vncd.sysconfig
 Source4:       %{name}-x11vncd_passwd
+Patch0:                gcc10.patch
 URL:           https://github.com/LibVNC/x11vnc/
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
@@ -68,6 +69,7 @@ Skrytpy startowe dla servera VNC.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__aclocal}