From c118610069b9640114d08d171c1ff4c4931c36d5 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 16 Nov 2020 09:40:09 -0600 Subject: [PATCH] i3: update to 4.19. --- srcpkgs/i3/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template index cb23283d1a5..ee7fae920b1 100644 --- a/srcpkgs/i3/template +++ b/srcpkgs/i3/template @@ -1,9 +1,8 @@ # Template file for 'i3' pkgname=i3 -version=4.18.3 +version=4.19 revision=1 -build_style=gnu-configure -configure_args="--disable-builddir" +build_style=meson hostmakedepends="pkg-config perl" makedepends="pcre-devel yajl-devel libxcb-devel libev-devel pango-devel startup-notification-devel libxkbcommon-devel @@ -15,8 +14,8 @@ short_desc="Improved tiling window manager" maintainer="Frank Steinborn " license="BSD-3-Clause" homepage="https://i3wm.org/" -distfiles="${homepage}/downloads/${pkgname}-${version}.tar.bz2" -checksum=53ae7903fad6eea830d58e949698e4a502c432c0d0a582659a0a59b1b995b10d +distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz" +checksum=aca48b03c0c70607826a1a91333065ff44d61774c152ddc9210fbc1627355872 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" libglob-devel";; @@ -25,7 +24,8 @@ esac pre_build() { case "$XBPS_TARGET_MACHINE" in *-musl) - sed -i "/^LIBS =/s,$,& ${XBPS_CROSS_BASE}/usr/lib/libglob.a," Makefile + sed -i "/^common_deps/i glob_dep = meson.get_compiler('c').find_library('glob', dirs: ['${XBPS_CROSS_BASE}/usr/lib'])" meson.build + sed -i "/^common_deps/a glob_dep," meson.build 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