| 1 |
commit: 52dcd1a0b28afe53a6f82f4221fee1cecf59dbfb |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 30 21:19:00 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 30 21:19:07 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52dcd1a0 |
| 7 |
|
| 8 |
x11-misc/bbrun: tweak for gcc-10, bug #707448 |
| 9 |
|
| 10 |
Reported-by: Toralf Förster |
| 11 |
Closes: https://bugs.gentoo.org/707448 |
| 12 |
Package-Manager: Portage-2.3.86, Repoman-2.3.20 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
x11-misc/bbrun/bbrun-1.6-r1.ebuild | 3 ++- |
| 16 |
x11-misc/bbrun/files/bbrun-1.6-gcc-10.patch | 23 +++++++++++++++++++++++ |
| 17 |
2 files changed, 25 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild |
| 20 |
index f9bd99cef70..0ae88b55243 100644 |
| 21 |
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild |
| 22 |
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=7 |
| 29 |
@@ -26,6 +26,7 @@ BDEPEND=" |
| 30 |
PATCHES=( |
| 31 |
"${FILESDIR}"/${P}-makefile.patch |
| 32 |
"${FILESDIR}"/${P}-list.patch |
| 33 |
+ "${FILESDIR}"/${P}-gcc-10.patch |
| 34 |
) |
| 35 |
|
| 36 |
src_compile() { |
| 37 |
|
| 38 |
diff --git a/x11-misc/bbrun/files/bbrun-1.6-gcc-10.patch b/x11-misc/bbrun/files/bbrun-1.6-gcc-10.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..ef23d1152ad |
| 41 |
--- /dev/null |
| 42 |
+++ b/x11-misc/bbrun/files/bbrun-1.6-gcc-10.patch |
| 43 |
@@ -0,0 +1,23 @@ |
| 44 |
+--- a/wmgeneral/wmgeneral.c |
| 45 |
++++ b/wmgeneral/wmgeneral.c |
| 46 |
+@@ -70,6 +70,7 @@ Window iconwin, win; |
| 47 |
+ GC NormalGC; |
| 48 |
+ XpmIcon wmgen; |
| 49 |
+ Pixmap pixmask; |
| 50 |
++Display *display; |
| 51 |
+ |
| 52 |
+ /*****************/ |
| 53 |
+ /* Mouse Regions */ |
| 54 |
+diff --git a/wmgeneral/wmgeneral.h b/wmgeneral/wmgeneral.h |
| 55 |
+index e9d6ca6..cad4f38 100644 |
| 56 |
+--- a/wmgeneral/wmgeneral.h |
| 57 |
++++ b/wmgeneral/wmgeneral.h |
| 58 |
+@@ -36,7 +36,7 @@ typedef struct { |
| 59 |
+ /* Global variable */ |
| 60 |
+ /*******************/ |
| 61 |
+ |
| 62 |
+-Display *display; |
| 63 |
++extern Display *display; |
| 64 |
+ |
| 65 |
+ /***********************/ |
| 66 |
+ /* Function Prototypes */ |
Archives