| 1 |
commit: 4012abe8b06da80e146bacd1ccbfec0af1a255cb |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 28 12:14:04 2018 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 28 12:14:36 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4012abe8 |
| 7 |
|
| 8 |
x11-misc/dmenu: Fix patch, rework src_compile(). |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 11 |
|
| 12 |
x11-misc/dmenu/dmenu-9999.ebuild | 21 ++++++++------- |
| 13 |
x11-misc/dmenu/files/dmenu-9999-gentoo.patch | 38 ++++++---------------------- |
| 14 |
2 files changed, 18 insertions(+), 41 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild |
| 17 |
index e55ea229223..5cb15906696 100644 |
| 18 |
--- a/x11-misc/dmenu/dmenu-9999.ebuild |
| 19 |
+++ b/x11-misc/dmenu/dmenu-9999.ebuild |
| 20 |
@@ -1,4 +1,4 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
@@ -42,16 +42,15 @@ src_prepare() { |
| 27 |
|
| 28 |
src_compile() { |
| 29 |
emake CC=$(tc-getCC) \ |
| 30 |
- "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ |
| 31 |
- "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ |
| 32 |
- "XINERAMAFLAGS=$( |
| 33 |
- usex xinerama "-DXINERAMA $( |
| 34 |
- $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null |
| 35 |
- )" '' |
| 36 |
- )" \ |
| 37 |
- "XINERAMALIBS=$( |
| 38 |
- usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' |
| 39 |
- )" |
| 40 |
+ INCS=" \ |
| 41 |
+ $(usex xinerama "-DXINERAMA" '') \ |
| 42 |
+ $( |
| 43 |
+ $(tc-getPKG_CONFIG) --cflags fontconfig freetype2 x11 xft $(usex xinerama xinerama '') |
| 44 |
+ )" \ |
| 45 |
+ LIBS=" \ |
| 46 |
+ $( |
| 47 |
+ $(tc-getPKG_CONFIG) --libs fontconfig x11 xft $(usex xinerama xinerama '') |
| 48 |
+ )" |
| 49 |
} |
| 50 |
|
| 51 |
src_install() { |
| 52 |
|
| 53 |
diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch |
| 54 |
index faeed310c88..75a1f89415e 100644 |
| 55 |
--- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch |
| 56 |
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch |
| 57 |
@@ -1,37 +1,15 @@ |
| 58 |
--- a/config.mk |
| 59 |
+++ b/config.mk |
| 60 |
-@@ -5,8 +5,8 @@ |
| 61 |
- PREFIX = /usr/local |
| 62 |
- MANPREFIX = ${PREFIX}/share/man |
| 63 |
- |
| 64 |
--X11INC = /usr/X11R6/include |
| 65 |
--X11LIB = /usr/X11R6/lib |
| 66 |
-+X11INC = -I/usr/X11R6/include |
| 67 |
-+X11LIB = -L/usr/X11R6/lib |
| 68 |
- |
| 69 |
- # Xinerama, comment if you don't want it |
| 70 |
- XINERAMALIBS = -lXinerama |
| 71 |
-@@ -14,18 +14,18 @@ |
| 72 |
- |
| 73 |
- # freetype |
| 74 |
- FREETYPELIBS = -lfontconfig -lXft |
| 75 |
--FREETYPEINC = /usr/include/freetype2 |
| 76 |
-+FREETYPEINC = -I/usr/include/freetype2 |
| 77 |
- # OpenBSD (uncomment) |
| 78 |
- #FREETYPEINC = ${X11INC}/freetype2 |
| 79 |
- |
| 80 |
- # includes and libs |
| 81 |
--INCS = -I${X11INC} -I${FREETYPEINC} |
| 82 |
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
| 83 |
-+INCS = ${X11INC} ${FREETYPEINC} |
| 84 |
-+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} |
| 85 |
+@@ -23,9 +23,9 @@ |
| 86 |
+ LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) |
| 87 |
|
| 88 |
# flags |
| 89 |
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} |
| 90 |
--CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} |
| 91 |
--LDFLAGS = -s ${LIBS} |
| 92 |
-+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} |
| 93 |
-+LDFLAGS = ${LIBS} |
| 94 |
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) |
| 95 |
+-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) |
| 96 |
+-LDFLAGS = -s $(LIBS) |
| 97 |
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" |
| 98 |
++CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS) |
| 99 |
++LDFLAGS += $(LIBS) |
| 100 |
|
| 101 |
# compiler and linker |
| 102 |
CC = cc |
Archives