st: replace patch by sed
This commit is contained in:
parent
c186c5732e
commit
43a6215410
2 changed files with 5 additions and 25 deletions
|
@ -1,24 +0,0 @@
|
||||||
--- config.mk.orig
|
|
||||||
+++ config.mk
|
|
||||||
@@ -11,17 +11,17 @@
|
|
||||||
X11LIB = /usr/X11R6/lib
|
|
||||||
|
|
||||||
# includes and libs
|
|
||||||
-INCS = -I. -I/usr/include -I${X11INC} \
|
|
||||||
+INCS = -I. \
|
|
||||||
`pkg-config --cflags fontconfig` \
|
|
||||||
`pkg-config --cflags freetype2`
|
|
||||||
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
|
|
||||||
+LIBS = -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
|
|
||||||
`pkg-config --libs fontconfig` \
|
|
||||||
`pkg-config --libs freetype2`
|
|
||||||
|
|
||||||
# flags
|
|
||||||
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600
|
|
||||||
-CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS} ${CPPFLAGS}
|
|
||||||
-LDFLAGS += -g ${LIBS}
|
|
||||||
+override CFLAGS += -std=c99 -Wall -Wvariadic-macros ${INCS} ${CPPFLAGS}
|
|
||||||
+override LDFLAGS += ${LIBS}
|
|
||||||
|
|
||||||
# compiler and linker
|
|
||||||
CC ?= cc
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'st'
|
# Template file for 'st'
|
||||||
pkgname=st
|
pkgname=st
|
||||||
version=0.6
|
version=0.6
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
makedepends="fontconfig-devel libX11-devel libXft-devel terminus-font"
|
makedepends="fontconfig-devel libX11-devel libXft-devel terminus-font"
|
||||||
|
@ -15,6 +15,10 @@ checksum="85310c08c3814e099b5e45888f8ac7548640e69e9973e934d4fba38b03737a2b"
|
||||||
|
|
||||||
pre_build() {
|
pre_build() {
|
||||||
sed -i 's|Liberation Mono|Terminus|g' config.def.h
|
sed -i 's|Liberation Mono|Terminus|g' config.def.h
|
||||||
|
sed -i 's|^CFLAGS +=|override CFLAGS +=|g' config.mk
|
||||||
|
sed -i 's|^LDFLAGS +=|override LDFLAGS +=|g' config.mk
|
||||||
|
sed -i 's| -I/usr/include||g' config.mk
|
||||||
|
sed -i 's| -L/usr/lib||g' config.mk
|
||||||
# We will use tic after install. See INSTALL.
|
# We will use tic after install. See INSTALL.
|
||||||
sed -i 's|@tic -s st.info||g' Makefile
|
sed -i 's|@tic -s st.info||g' Makefile
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue