diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2019-02-07 10:20:28 +0100 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2019-02-07 10:21:23 +0100 |
| commit | 412900288e16795e9d6765b186b43df68810ff28 (patch) | |
| tree | ec34fb36eab36ebae65d801542bb51784d23d0e9 /x11-misc/dmenu | |
| parent | www-client/opera-beta: Version 58.0.3135.59 (diff) | |
| download | gentoo-412900288e16795e9d6765b186b43df68810ff28.tar.gz gentoo-412900288e16795e9d6765b186b43df68810ff28.tar.bz2 gentoo-412900288e16795e9d6765b186b43df68810ff28.zip | |
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>
Diffstat (limited to 'x11-misc/dmenu')
| -rw-r--r-- | x11-misc/dmenu/dmenu-4.9.ebuild | 2 | ||||
| -rw-r--r-- | 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 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) |