summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2016-03-01 05:15:08 +0100
committerJeroen Roovers <jer@gentoo.org>2016-03-01 05:15:08 +0100
commit4a7dab58101e17754ab76cbe6c8e1a399ca4ca75 (patch)
treebe9e00983819a0a90b2c57b009dfe230131072a4 /x11-misc/dmenu
parentdev-util/complexity: Old. (diff)
downloadgentoo-4a7dab58101e17754ab76cbe6c8e1a399ca4ca75.tar.gz
gentoo-4a7dab58101e17754ab76cbe6c8e1a399ca4ca75.tar.bz2
gentoo-4a7dab58101e17754ab76cbe6c8e1a399ca4ca75.zip
x11-misc/dmenu: Tweak Gentoo patch.
Package-Manager: portage-2.2.27
Diffstat (limited to 'x11-misc/dmenu')
-rw-r--r--x11-misc/dmenu/dmenu-9999.ebuild4
-rw-r--r--x11-misc/dmenu/files/dmenu-9999-gentoo.patch2
2 files changed, 4 insertions, 2 deletions
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index 65eabbb5fff7..79a2f8b8ba17 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils git-r3 savedconfig toolchain-funcs
DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
@@ -35,6 +35,8 @@ src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
+ eapply_user
+
restore_config config.def.h
}
diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
index b6940d195edc..faeed310c886 100644
--- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
@@ -27,7 +27,7 @@
+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
# flags
- CPPFLAGS = -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS = -s ${LIBS}
+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}