From 43a62154103b39c62c506814fed40da12038f093 Mon Sep 17 00:00:00 2001
From: Ypnose <linuxien@legtux.org>
Date: Wed, 15 Jul 2015 19:39:14 +0200
Subject: [PATCH] st: replace patch by sed
---
srcpkgs/st/patches/bug_1779.patch | 24 ------------------------
srcpkgs/st/template | 6 +++++-
2 files changed, 5 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/st/patches/bug_1779.patch
diff --git a/srcpkgs/st/patches/bug_1779.patch b/srcpkgs/st/patches/bug_1779.patch
deleted file mode 100644
index b2bf1b6bba5..00000000000
--- a/srcpkgs/st/patches/bug_1779.patch
+++ /dev/null
@@ -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
diff --git a/srcpkgs/st/template b/srcpkgs/st/template
index 2eec30a354f..55db29ea35c 100644
--- a/srcpkgs/st/template
+++ b/srcpkgs/st/template
@@ -1,7 +1,7 @@
# Template file for 'st'
pkgname=st
version=0.6
-revision=1
+revision=2
build_style=gnu-makefile
hostmakedepends="pkg-config"
makedepends="fontconfig-devel libX11-devel libXft-devel terminus-font"
@@ -15,6 +15,10 @@ checksum="85310c08c3814e099b5e45888f8ac7548640e69e9973e934d4fba38b03737a2b"
pre_build() {
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.
sed -i 's|@tic -s st.info||g' Makefile
}