From 6c090f34aca682a13611a45bad54fd142349b2ca Mon Sep 17 00:00:00 2001 From: cr6git Date: Thu, 7 Dec 2017 17:58:05 +0100 Subject: [PATCH] lemonbar-xft: avoid conflict with lemonbar, fix cross build Closes: #9824 [via git-merge-pr] --- srcpkgs/lemonbar-xft/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/lemonbar-xft/template b/srcpkgs/lemonbar-xft/template index 48d88d3bd0a..8fb3da6c0af 100644 --- a/srcpkgs/lemonbar-xft/template +++ b/srcpkgs/lemonbar-xft/template @@ -1,13 +1,14 @@ # Template file for 'lemonbar-xft' pkgname=lemonbar-xft version=1.0.20161107 -revision=1 +revision=2 +conflicts="lemonbar" _commit=043ad4757cc079666f50212ee0a2ef0729ecac6b build_style=gnu-makefile wrksrc="bar-${_commit}" -hostmakedepends="perl libXft-devel libxcb-devel" -makedepends="libxcb-devel libXft-devel" -short_desc="A lightweight xcb based bar with xft support" +hostmakedepends="perl" +makedepends="libXft-devel" +short_desc="Lightweight xcb based bar with xft support" maintainer='ivierlin ' homepage="https://github.com/krypt-n/bar" license="MIT" @@ -18,6 +19,9 @@ pre_build() { sed -i "s/^\(VERSION =\).*/\1 ${version}/" Makefile sed -i 's/^\(CFLAGS *+=\)/override \1/' Makefile sed -i 's/^\(LDFLAGS *+=\)/override \1/' Makefile + + # found this trick on the 'spectrwm' template + sed -i "s,-I/usr/include/freetype2,-I${XBPS_CROSS_BASE}/usr/include/freetype2,g" Makefile } post_install() { vlicense LICENSE