1 |
commit: 4a7dab58101e17754ab76cbe6c8e1a399ca4ca75 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 1 04:15:08 2016 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 1 04:15:08 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a7dab58 |
7 |
|
8 |
x11-misc/dmenu: Tweak Gentoo patch. |
9 |
|
10 |
Package-Manager: portage-2.2.27 |
11 |
|
12 |
x11-misc/dmenu/dmenu-9999.ebuild | 4 +++- |
13 |
x11-misc/dmenu/files/dmenu-9999-gentoo.patch | 2 +- |
14 |
2 files changed, 4 insertions(+), 2 deletions(-) |
15 |
|
16 |
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild |
17 |
index 65eabbb..79a2f8b 100644 |
18 |
--- a/x11-misc/dmenu/dmenu-9999.ebuild |
19 |
+++ b/x11-misc/dmenu/dmenu-9999.ebuild |
20 |
@@ -2,7 +2,7 @@ |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
# $Id$ |
23 |
|
24 |
-EAPI=5 |
25 |
+EAPI=6 |
26 |
inherit eutils git-r3 savedconfig toolchain-funcs |
27 |
|
28 |
DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System" |
29 |
@@ -35,6 +35,8 @@ src_prepare() { |
30 |
|
31 |
epatch "${FILESDIR}"/${P}-gentoo.patch |
32 |
|
33 |
+ eapply_user |
34 |
+ |
35 |
restore_config config.def.h |
36 |
} |
37 |
|
38 |
|
39 |
diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch |
40 |
index b6940d1..faeed31 100644 |
41 |
--- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch |
42 |
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch |
43 |
@@ -27,7 +27,7 @@ |
44 |
+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
45 |
|
46 |
# flags |
47 |
- CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
48 |
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
49 |
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
50 |
-LDFLAGS = -s ${LIBS} |
51 |
+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} |