From 74ac211bda275ef996a3579996a4555de293ecbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Jendrysik?= Date: Sat, 8 Jul 2017 19:31:15 +0200 Subject: [PATCH] i3-gaps: upgrade to 4.13 --- srcpkgs/i3-gaps/template | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template index ad9cc6d479..14cc4e7cc0 100644 --- a/srcpkgs/i3-gaps/template +++ b/srcpkgs/i3-gaps/template @@ -1,17 +1,22 @@ # Template file for 'i3-gaps' pkgname=i3-gaps -version=4.12 +version=4.13 revision=1 -build_style=gnu-makefile -hostmakedepends="pkg-config perl git" +build_style=gnu-configure +configure_args="--disable-builddir" +hostmakedepends="pkg-config perl git autoconf automake" makedepends="pcre-devel yajl-devel libxcb-devel libev-devel pango-devel startup-notification-devel libxkbcommon-devel - xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel" + xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-cursor-devel + xcb-util-xrm-devel" conf_files="/etc/i3/config /etc/i3/config.keycodes" short_desc="Improved tiling window manager - i3 fork with more features" maintainer="ian c. " license="BSD" homepage="https://github.com/Airblader/i3" +distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz" +checksum=e80c07e525a07f2d3d2f02d282774d3264b6d1f165713c9903c06626ba4d2571 +wrksrc=i3-${version} provides="i3-${version}_${revision}" replaces="i3>=0" @@ -20,15 +25,14 @@ case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libglob-devel";; esac -do_fetch() { - local url="git://github.com/Airblader/i3.git" - msg_normal "Fetching source from $url ...\n" - git clone ${url} ${pkgname}-${version} -b gaps +pre_configure() { + autoreconf -fi } + pre_build() { case "$XBPS_TARGET_MACHINE" in - *-musl) - sed -i "/LIBS =/s,-lm,& ${XBPS_CROSS_BASE}/usr/lib/libglob.a,g" common.mk + *-musl) + sed -i "/^LIBS =/s,$,& ${XBPS_CROSS_BASE}/usr/lib/libglob.a," Makefile sed -i '/include/s,glob.h,libglob/glob.h,g' i3bar/src/main.c libi3/resolve_tilde.c sed -i '/GLOB_TILDE/s/glob(/g_glob(/g' i3bar/src/main.c libi3/resolve_tilde.c sed -i 's/globfree(/g_globfree(/g' i3bar/src/main.c libi3/resolve_tilde.c