From: abenson <abenson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] i3: update to 4.19.
Date: Mon, 16 Nov 2020 17:54:45 +0100 [thread overview]
Message-ID: <20201116165445.fm0hZvQDu-0DdPrzlpLPOPxOFfu07z1M9nQefpkAoOk@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26433@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
There is an updated pull request by abenson against master on the void-packages repository
https://github.com/abenson/void-packages i3_4.19
https://github.com/void-linux/void-packages/pull/26433
i3: update to 4.19.
A patch file from https://github.com/void-linux/void-packages/pull/26433.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i3_4.19-26433.patch --]
[-- Type: text/x-diff, Size: 1868 bytes --]
From c118610069b9640114d08d171c1ff4c4931c36d5 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
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 <steinex@nognu.de>"
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
next prev parent reply other threads:[~2020-11-16 16:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-16 15:40 [PR PATCH] " abenson
2020-11-16 16:54 ` abenson [this message]
2020-11-16 17:44 ` [PR PATCH] [Updated] " abenson
2020-11-17 18:57 ` [PR PATCH] [Merged]: " abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201116165445.fm0hZvQDu-0DdPrzlpLPOPxOFfu07z1M9nQefpkAoOk@z \
--to=abenson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).