| 1 |
commit: e82d0a5251dd59099ed8f07308d2b87374ac2afc |
| 2 |
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me> |
| 3 |
AuthorDate: Wed Jan 29 11:57:34 2020 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 30 06:33:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e82d0a52 |
| 7 |
|
| 8 |
x11-misc/x11vnc: fix build with -fno-common |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/706840 |
| 11 |
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/14495 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
.../x11vnc/files/x11vnc-0.9.16-fno-common.patch | 45 ++++++++++++++++++++++ |
| 16 |
x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild | 3 +- |
| 17 |
2 files changed, 47 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch b/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..504159efe92 |
| 22 |
--- /dev/null |
| 23 |
+++ b/x11-misc/x11vnc/files/x11vnc-0.9.16-fno-common.patch |
| 24 |
@@ -0,0 +1,45 @@ |
| 25 |
+From a48b0b1cd887d7f3ae67f525d7d334bd2feffe60 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Alexander Tsoy <alexander@××××.me> |
| 27 |
+Date: Tue, 28 Jan 2020 22:21:01 +0300 |
| 28 |
+Subject: [PATCH] Fix build with -fno-common |
| 29 |
+ |
| 30 |
+GCC 10 defaults to -fno-common |
| 31 |
+--- |
| 32 |
+ src/util.c | 3 +++ |
| 33 |
+ src/util.h | 6 +++--- |
| 34 |
+ 2 files changed, 6 insertions(+), 3 deletions(-) |
| 35 |
+ |
| 36 |
+diff --git a/src/util.c b/src/util.c |
| 37 |
+index a82a1a4..6a52ebf 100644 |
| 38 |
+--- a/src/util.c |
| 39 |
++++ b/src/util.c |
| 40 |
+@@ -47,6 +47,9 @@ int hxl = 0; |
| 41 |
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD |
| 42 |
+ MUTEX(x11Mutex); |
| 43 |
+ MUTEX(scrollMutex); |
| 44 |
++MUTEX(clientMutex); |
| 45 |
++MUTEX(inputMutex); |
| 46 |
++MUTEX(pointerMutex); |
| 47 |
+ #endif |
| 48 |
+ |
| 49 |
+ int nfix(int i, int n); |
| 50 |
+diff --git a/src/util.h b/src/util.h |
| 51 |
+index 35c1afd..99b5dd1 100644 |
| 52 |
+--- a/src/util.h |
| 53 |
++++ b/src/util.h |
| 54 |
+@@ -102,9 +102,9 @@ extern struct timeval _mysleep; |
| 55 |
+ #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD |
| 56 |
+ extern MUTEX(x11Mutex); |
| 57 |
+ extern MUTEX(scrollMutex); |
| 58 |
+-MUTEX(clientMutex); |
| 59 |
+-MUTEX(inputMutex); |
| 60 |
+-MUTEX(pointerMutex); |
| 61 |
++extern MUTEX(clientMutex); |
| 62 |
++extern MUTEX(inputMutex); |
| 63 |
++extern MUTEX(pointerMutex); |
| 64 |
+ #endif |
| 65 |
+ |
| 66 |
+ #define X_INIT INIT_MUTEX(x11Mutex) |
| 67 |
+-- |
| 68 |
+2.24.1 |
| 69 |
+ |
| 70 |
|
| 71 |
diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild |
| 72 |
index bc16d70cde2..f01cd79f6ba 100644 |
| 73 |
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild |
| 74 |
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r3.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2019 Gentoo Authors |
| 77 |
+# Copyright 1999-2020 Gentoo Authors |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
|
| 80 |
EAPI=7 |
| 81 |
@@ -44,6 +44,7 @@ PATCHES=( |
| 82 |
"${FILESDIR}"/${P}-crypto.patch # https://github.com/LibVNC/x11vnc/issues/86 |
| 83 |
"${FILESDIR}"/${P}-anonymous-ssl.patch # https://github.com/LibVNC/x11vnc/pull/85 |
| 84 |
"${FILESDIR}"/${P}-libressl.patch |
| 85 |
+ "${FILESDIR}"/${P}-fno-common.patch |
| 86 |
) |
| 87 |
|
| 88 |
src_prepare() { |
Archives