| 1 |
jer 14/09/03 10:50:04 |
| 2 |
|
| 3 |
Added: dzen-0.9.5-config-default.patch |
| 4 |
Log: |
| 5 |
Replace some sed scripts with a patch. Do not inject pkg-config output directly. Ensure USE flags match build configuration (bug #521776). |
| 6 |
|
| 7 |
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 x11-misc/dzen/files/dzen-0.9.5-config-default.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/files/dzen-0.9.5-config-default.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/dzen/files/dzen-0.9.5-config-default.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: dzen-0.9.5-config-default.patch |
| 16 |
=================================================================== |
| 17 |
--- a/config.mk |
| 18 |
+++ b/config.mk |
| 19 |
@@ -4,7 +4,7 @@ |
| 20 |
# Customize below to fit your system |
| 21 |
|
| 22 |
# paths |
| 23 |
-PREFIX = /usr/local |
| 24 |
+PREFIX = /usr |
| 25 |
MANPREFIX = ${PREFIX}/share/man |
| 26 |
|
| 27 |
X11INC = /usr/X11R6/include |
| 28 |
@@ -19,55 +19,12 @@ |
| 29 |
# Comment : Add # to the beginning of the respective lines |
| 30 |
|
| 31 |
## Option 1: No Xinerama no XPM no XFT |
| 32 |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 |
| 33 |
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" |
| 34 |
- |
| 35 |
- |
| 36 |
-## Option 2: No Xinerama with XPM |
| 37 |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm |
| 38 |
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM |
| 39 |
- |
| 40 |
- |
| 41 |
-# Option 3: With Xinerama no XPM |
| 42 |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama |
| 43 |
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA |
| 44 |
- |
| 45 |
- |
| 46 |
-## Option 4: With Xinerama and XPM |
| 47 |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm |
| 48 |
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM |
| 49 |
- |
| 50 |
- |
| 51 |
-## Option 5: With XFT |
| 52 |
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft` |
| 53 |
-CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft` |
| 54 |
- |
| 55 |
- |
| 56 |
-## Option 6: With XPM and XFT |
| 57 |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXpm `pkg-config --libs xft` |
| 58 |
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft` |
| 59 |
- |
| 60 |
- |
| 61 |
-## Option 7: With Xinerama and XPM and XFT |
| 62 |
-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft` |
| 63 |
-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft` |
| 64 |
- |
| 65 |
- |
| 66 |
+LIBS = -lX11 |
| 67 |
+CFLAGS += -Wall ${INCS} -DVERSION=\"${VERSION}\" |
| 68 |
|
| 69 |
# END of feature configuration |
| 70 |
|
| 71 |
- |
| 72 |
-LDFLAGS = ${LIBS} |
| 73 |
- |
| 74 |
-# Solaris, uncomment for Solaris |
| 75 |
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" |
| 76 |
-#LDFLAGS = ${LIBS} |
| 77 |
-#CFLAGS += -xtarget=ultra |
| 78 |
- |
| 79 |
-# Debugging |
| 80 |
-#CFLAGS = ${INCS} -DVERSION=\"${VERSION}\" -std=gnu89 -pedantic -Wall -W -Wundef -Wendif-labels -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wdisabled-optimization -O2 -pipe -DDZEN_XFT `pkg-config --cflags xft` |
| 81 |
-#LDFLAGS = ${LIBS} |
| 82 |
+LDFLAGS += ${LIBS} |
| 83 |
|
| 84 |
# compiler and linker |
| 85 |
-CC = gcc |
| 86 |
-LD = ${CC} |
| 87 |
+LD = $(CC) |
| 88 |
--- a/gadgets/config.mk |
| 89 |
+++ b/gadgets/config.mk |
| 90 |
@@ -1,7 +1,7 @@ |
| 91 |
# Customize below to fit your system |
| 92 |
|
| 93 |
# paths |
| 94 |
-PREFIX = /usr/local |
| 95 |
+PREFIX = /usr |
| 96 |
MANPREFIX = ${PREFIX}/share/man |
| 97 |
|
| 98 |
X11INC = /usr/X11R6/include |
| 99 |
@@ -10,9 +10,8 @@ |
| 100 |
X11LIB = /usr/X11R6/lib |
| 101 |
LIBS = -L/usr/lib |
| 102 |
|
| 103 |
-CFLAGS = -Os ${INCS} |
| 104 |
-LDFLAGS = ${LIBS} |
| 105 |
+CFLAGS += ${INCS} |
| 106 |
+LDFLAGS += ${LIBS} |
| 107 |
|
| 108 |
# compiler and linker |
| 109 |
-CC = gcc |
| 110 |
-LD = ${CC} |
| 111 |
+LD = $(CC) |
Archives