From d78dd2d23919ca111991be890d21b78fa8b4a129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 11 Mar 2021 07:41:47 +0700 Subject: [PATCH] i3: update to 4.19.2. - remove datetime fixup in meson.build (fixed upstream) - remove glob replacement in musl (supported from 1.1.24) - remove perl-AnyEvent-I3 from depends, whoever wants to write the binding need to install themself. --- srcpkgs/i3/template | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template index 51733b6ba53..f0a69f731b1 100644 --- a/srcpkgs/i3/template +++ b/srcpkgs/i3/template @@ -1,40 +1,23 @@ # Template file for 'i3' pkgname=i3 -version=4.19.1 -revision=2 +version=4.19.2 +revision=1 build_style=meson hostmakedepends="pkg-config perl" 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-xrm-devel" -depends="perl-AnyEvent-I3" conf_files="/etc/i3/config /etc/i3/config.keycodes" short_desc="Improved tiling window manager" maintainer="Frank Steinborn " license="BSD-3-Clause" homepage="https://i3wm.org/" distfiles="${homepage}/downloads/${pkgname}-${version}.tar.xz" -checksum=2284c812fc689e0338d8fe9be0b8d1552e548fc168d165f795b26bf497c22b47 +checksum=8a6ee177689dcf22964d20b6093014ee4fa0419345d3fd515d5512d9980bb279 -case "$XBPS_TARGET_MACHINE" in - *-musl) makedepends+=" libglob-devel";; -esac - -pre_configure() { - # This change must be in pre_configre because: - # - it needs to be done before configure - # - date wrapper is only available from pre-configure - vsed -i "s/-non-git/ ($(date --iso-8601))/" meson.build - case "$XBPS_TARGET_MACHINE" in - *-musl) - vsed -i "/^common_deps/i glob_dep = cc.find_library('glob')" meson.build - vsed -i "/^common_deps/a glob_dep," meson.build - vsed -i '/include/s,glob.h,libglob/glob.h,g' i3bar/src/main.c libi3/resolve_tilde.c - vsed -i '/GLOB_TILDE/s/glob(/g_glob(/g' i3bar/src/main.c libi3/resolve_tilde.c - vsed -i 's/globfree(/g_globfree(/g' i3bar/src/main.c libi3/resolve_tilde.c - ;; - esac +do_check() { + : "Michael disables tests in Debian rules, too" } post_install() { vlicense LICENSE