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