| 1 |
commit: 645b62c84d25e8d90617e53cd62b5cf9bc1b2ac3 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Nov 1 05:01:40 2020 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Nov 1 05:02:06 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645b62c8 |
| 7 |
|
| 8 |
x11-plugins/asmon: fix build with gcc 10 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/708118 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 13 |
|
| 14 |
x11-plugins/asmon/asmon-0.71-r1.ebuild | 18 ++++++++++-------- |
| 15 |
.../asmon/files/asmon-0.71-fno-common.patch | 22 ++++++++++++++++++++++ |
| 16 |
x11-plugins/asmon/files/asmon-0.71-list.patch | 10 ++++------ |
| 17 |
3 files changed, 36 insertions(+), 14 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-plugins/asmon/asmon-0.71-r1.ebuild b/x11-plugins/asmon/asmon-0.71-r1.ebuild |
| 20 |
index 2c91504fc69..2d2ce19ee4e 100644 |
| 21 |
--- a/x11-plugins/asmon/asmon-0.71-r1.ebuild |
| 22 |
+++ b/x11-plugins/asmon/asmon-0.71-r1.ebuild |
| 23 |
@@ -1,17 +1,18 @@ |
| 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=5 |
| 29 |
-inherit eutils toolchain-funcs |
| 30 |
+EAPI=7 |
| 31 |
+ |
| 32 |
+inherit toolchain-funcs |
| 33 |
|
| 34 |
DESCRIPTION="WindowMaker/AfterStep system monitor dockapp" |
| 35 |
HOMEPAGE="http://rio.vg/asmon" |
| 36 |
SRC_URI="http://rio.vg/${PN}/${P}.tar.bz2" |
| 37 |
+S="${WORKDIR}/${P}/${PN}" |
| 38 |
|
| 39 |
LICENSE="GPL-2" |
| 40 |
SLOT="0" |
| 41 |
KEYWORDS="~alpha amd64 ppc sparc x86" |
| 42 |
-IUSE="" |
| 43 |
|
| 44 |
RDEPEND="x11-libs/libXext |
| 45 |
x11-libs/libXpm |
| 46 |
@@ -19,13 +20,14 @@ RDEPEND="x11-libs/libXext |
| 47 |
DEPEND="${RDEPEND} |
| 48 |
x11-base/xorg-proto" |
| 49 |
|
| 50 |
-S=${WORKDIR}/${P}/${PN} |
| 51 |
- |
| 52 |
src_prepare() { |
| 53 |
+ default |
| 54 |
+ |
| 55 |
sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die |
| 56 |
|
| 57 |
- cd "${WORKDIR}"/${P} || die |
| 58 |
- epatch "${FILESDIR}"/${P}-list.patch |
| 59 |
+ cd "../wmgeneral" || die |
| 60 |
+ eapply "${FILESDIR}/${P}-list.patch" |
| 61 |
+ eapply "${FILESDIR}/${P}-fno-common.patch" |
| 62 |
} |
| 63 |
|
| 64 |
src_compile() { |
| 65 |
|
| 66 |
diff --git a/x11-plugins/asmon/files/asmon-0.71-fno-common.patch b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch |
| 67 |
new file mode 100644 |
| 68 |
index 00000000000..831d6b25816 |
| 69 |
--- /dev/null |
| 70 |
+++ b/x11-plugins/asmon/files/asmon-0.71-fno-common.patch |
| 71 |
@@ -0,0 +1,22 @@ |
| 72 |
+https://bugs.gentoo.org/708118 |
| 73 |
+--- a/wmgeneral.c |
| 74 |
++++ b/wmgeneral.c |
| 75 |
+@@ -50,6 +50,7 @@ Window iconwin, win; |
| 76 |
+ GC NormalGC; |
| 77 |
+ XpmIcon wmgen; |
| 78 |
+ Pixmap pixmask; |
| 79 |
++Display *display; |
| 80 |
+ |
| 81 |
+ /*****************/ |
| 82 |
+ /* Mouse Regions */ |
| 83 |
+--- a/wmgeneral.h |
| 84 |
++++ b/wmgeneral.h |
| 85 |
+@@ -28,7 +28,7 @@ typedef struct { |
| 86 |
+ /* Global variable */ |
| 87 |
+ /*******************/ |
| 88 |
+ |
| 89 |
+-Display *display; |
| 90 |
++extern Display *display; |
| 91 |
+ |
| 92 |
+ /***********************/ |
| 93 |
+ /* Function Prototypes */ |
| 94 |
|
| 95 |
diff --git a/x11-plugins/asmon/files/asmon-0.71-list.patch b/x11-plugins/asmon/files/asmon-0.71-list.patch |
| 96 |
index 1b1ac317669..89e9ef32167 100644 |
| 97 |
--- a/x11-plugins/asmon/files/asmon-0.71-list.patch |
| 98 |
+++ b/x11-plugins/asmon/files/asmon-0.71-list.patch |
| 99 |
@@ -1,6 +1,5 @@ |
| 100 |
-diff -Naur wmgeneral.orig/list.c wmgeneral/list.c |
| 101 |
---- wmgeneral.orig/list.c 2016-01-04 13:28:36.583339716 +0100 |
| 102 |
-+++ wmgeneral/list.c 2016-01-04 13:28:48.694343645 +0100 |
| 103 |
+--- a/list.c |
| 104 |
++++ b/list.c |
| 105 |
@@ -38,7 +38,7 @@ |
| 106 |
|
| 107 |
/* Return a cons cell produced from (head . tail) |
| 108 |
@@ -82,9 +81,8 @@ diff -Naur wmgeneral.orig/list.c wmgeneral/list.c |
| 109 |
list_mapcar(LinkedList* list, void(*function)(void*)) |
| 110 |
{ |
| 111 |
while(list) |
| 112 |
-diff -Naur wmgeneral.orig/list.h wmgeneral/list.h |
| 113 |
---- wmgeneral.orig/list.h 2016-01-04 13:28:36.583339716 +0100 |
| 114 |
-+++ wmgeneral/list.h 2016-01-04 13:28:39.471340654 +0100 |
| 115 |
+--- a/list.h |
| 116 |
++++ b/list.h |
| 117 |
@@ -29,31 +29,25 @@ |
| 118 |
#ifndef __LIST_H_ |
| 119 |
#define __LIST_H_ |
Archives