From: Jeroen Roovers <jer@gentoo.org>
Date: Thu, 7 Feb 2019 09:20:28 +0000 (+0100)
Subject: x11-misc/dmenu: Fix includes
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=412900288e16795e9d6765b186b43df68810ff28;p=gentoo.git

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@gentoo.org>
---

diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index 022c42ba3dce..9fe6efe17530 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 ee2ce0b9c159..25fd34ab4579 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)