1 |
commit: 583b4210a0e3aff5c029a3d569aa18e0ee2bfb2c |
2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 29 11:13:14 2020 +0000 |
4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 29 11:35:24 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=583b4210 |
7 |
|
8 |
x11-plugins/wmacpi: fix build with -fno-common |
9 |
|
10 |
Latest libdockapp revbump now defines a global variable as extern |
11 |
|
12 |
Closes: https://bugs.gentoo.org/715260 |
13 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
14 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
15 |
|
16 |
.../wmacpi/files/wmacpi-2.3-fno-common.patch | 11 ++++++++ |
17 |
x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild | 33 ++++++++++++++++++++++ |
18 |
2 files changed, 44 insertions(+) |
19 |
|
20 |
diff --git a/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..068c00c592f |
23 |
--- /dev/null |
24 |
+++ b/x11-plugins/wmacpi/files/wmacpi-2.3-fno-common.patch |
25 |
@@ -0,0 +1,11 @@ |
26 |
+diff -Naur dockapps.orig/wmacpi.c dockapps/wmacpi.c |
27 |
+--- dockapps.orig/wmacpi.c 2015-01-12 11:24:15.000000000 +0100 |
28 |
++++ dockapps/wmacpi.c 2020-03-29 13:11:56.712022800 +0200 |
29 |
+@@ -72,6 +72,7 @@ |
30 |
+ |
31 |
+ /* globals */ |
32 |
+ struct dockapp *dockapp; |
33 |
++Display *display; |
34 |
+ /* global_t *globals; */ |
35 |
+ |
36 |
+ /* this gives us a variable scroll rate, depending on the importance of the |
37 |
|
38 |
diff --git a/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild |
39 |
new file mode 100644 |
40 |
index 00000000000..25640e9e028 |
41 |
--- /dev/null |
42 |
+++ b/x11-plugins/wmacpi/wmacpi-2.3-r2.ebuild |
43 |
@@ -0,0 +1,33 @@ |
44 |
+# Copyright 1999-2020 Gentoo Authors |
45 |
+# Distributed under the terms of the GNU General Public License v2 |
46 |
+ |
47 |
+EAPI=7 |
48 |
+inherit toolchain-funcs |
49 |
+ |
50 |
+DESCRIPTION="DockApp ACPI status monitor for laptops" |
51 |
+HOMEPAGE="https://www.dockapps.net/wmacpi" |
52 |
+SRC_URI="https://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz" |
53 |
+ |
54 |
+LICENSE="GPL-2" |
55 |
+SLOT="0" |
56 |
+KEYWORDS="~amd64 -ppc -sparc ~x86" |
57 |
+ |
58 |
+DEPEND=">=x11-libs/libdockapp-0.7-r1:= |
59 |
+ x11-libs/libX11" |
60 |
+ |
61 |
+S=${WORKDIR}/dockapps |
62 |
+ |
63 |
+PATCHES=( |
64 |
+ "${FILESDIR}"/${P}-makefile.patch |
65 |
+ "${FILESDIR}"/${P}-fno-common.patch |
66 |
+ ) |
67 |
+ |
68 |
+src_prepare() { |
69 |
+ default |
70 |
+ |
71 |
+ sed -e 's#<dockapp.h>#<libdockapp/dockapp.h>#' -i *.c || die |
72 |
+} |
73 |
+ |
74 |
+src_compile() { |
75 |
+ emake CC="$(tc-getCC)" |
76 |
+} |