commit: 412900288e16795e9d6765b186b43df68810ff28 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Thu Feb 7 09:20:28 2019 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Thu Feb 7 09:21:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41290028
x11-misc/dmenu: Fix includes Package-Manager: Portage-2.3.59, Repoman-2.3.12 Fixes: https://bugs.gentoo.org/677324 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> x11-misc/dmenu/dmenu-4.9.ebuild | 2 ++ x11-misc/dmenu/files/dmenu-4.9-gentoo.patch | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild index 022c42ba3dc..9fe6efe1753 100644 --- a/x11-misc/dmenu/dmenu-4.9.ebuild +++ b/x11-misc/dmenu/dmenu-4.9.ebuild @@ -43,6 +43,8 @@ src_compile() { emake CC=$(tc-getCC) \ "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ + "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \ + "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \ "XINERAMAFLAGS=$( usex xinerama "-DXINERAMA $( $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null diff --git a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch index ee2ce0b9c15..25fd34ab457 100644 --- a/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch +++ b/x11-misc/dmenu/files/dmenu-4.9-gentoo.patch @@ -1,7 +1,13 @@ --- a/config.mk +++ b/config.mk -@@ -23,9 +23,9 @@ - LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) +@@ -19,13 +19,13 @@ + #FREETYPEINC = $(X11INC)/freetype2 + + # includes and libs +-INCS = -I$(X11INC) -I$(FREETYPEINC) +-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) ++INCS = $(X11INC) $(FREETYPEINC) ++LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS) # flags -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
