[PR PATCH] i3-gaps: update to 4.19.

[PR PATCH] i3-gaps: update to 4.19.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 314 bytes --]

There is a new pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages i3-gaps_4.19
https://github.com/void-linux/void-packages/pull/26437

i3-gaps: update to 4.19.


A patch file from https://github.com/void-linux/void-packages/pull/26437.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i3-gaps_4.19-26437.patch --]
[-- Type: text/x-diff, Size: 2181 bytes --]

From 54fc3223cfc84de534cdf43d7e927a8c52570f8a Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 16 Nov 2020 11:02:23 -0600
Subject: [PATCH] i3-gaps: update to 4.19.

---
 srcpkgs/i3-gaps/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index dbd9f5f0e20..c333e2229d5 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,10 +1,10 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.18.3
+version=4.19
 revision=1
 wrksrc="i3-${version}"
-build_style=gnu-configure
-configure_args="--disable-builddir"
+build_style=meson
+configure_args="-Dmans=true"
 hostmakedepends="pkg-config perl autoconf automake asciidoc pod2mdoc xmlto"
 makedepends="pcre-devel yajl-devel libxcb-devel libev-devel
  pango-devel startup-notification-devel libxkbcommon-devel
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=e87b5f5da1f026cf9261aec03de62305720cb0e7fd312245b2b9101aca6ad2ba
+checksum=dbd739dae5c16a94763dac0a7407d0307f0814f7bf48b99591b772820c874b4f
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"
@@ -26,14 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
 esac
 
-pre_configure() {
-	autoreconf -fi
-}
-
 pre_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
-		vsed -i "/^LIBS =/s,$,& ${XBPS_CROSS_BASE}/usr/lib/libglob.a," Makefile
+		vsed -i "/^common_deps/i glob_dep = cc.find_library('glob', dirs: ['${XBPS_CROSS_BASE}/usr/lib'])" 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
@@ -48,6 +45,4 @@ do_check() {
 post_install() {
 	rm -rf ${DESTDIR}/usr/include
 	vlicense LICENSE
-	vmkdir usr/share/man/man1
-	install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1
 }

Re: [PR PATCH] [Updated] i3-gaps: update to 4.19.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 319 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages i3-gaps_4.19
https://github.com/void-linux/void-packages/pull/26437

i3-gaps: update to 4.19.


A patch file from https://github.com/void-linux/void-packages/pull/26437.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-i3-gaps_4.19-26437.patch --]
[-- Type: text/x-diff, Size: 2143 bytes --]

From ec835815b204101a1533492c96eccda1e23509ad Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Mon, 16 Nov 2020 11:02:23 -0600
Subject: [PATCH] i3-gaps: update to 4.19.

---
 srcpkgs/i3-gaps/template | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/i3-gaps/template b/srcpkgs/i3-gaps/template
index dbd9f5f0e20..916ef6729c2 100644
--- a/srcpkgs/i3-gaps/template
+++ b/srcpkgs/i3-gaps/template
@@ -1,10 +1,10 @@
 # Template file for 'i3-gaps'
 pkgname=i3-gaps
-version=4.18.3
+version=4.19
 revision=1
 wrksrc="i3-${version}"
-build_style=gnu-configure
-configure_args="--disable-builddir"
+build_style=meson
+configure_args="-Dmans=true"
 hostmakedepends="pkg-config perl autoconf automake asciidoc pod2mdoc xmlto"
 makedepends="pcre-devel yajl-devel libxcb-devel libev-devel
  pango-devel startup-notification-devel libxkbcommon-devel
@@ -17,7 +17,7 @@ maintainer="ian c. <ian@airmail.cc>"
 license="BSD-3-Clause"
 homepage="https://github.com/Airblader/i3"
 distfiles="${homepage}/archive/${version}.tar.gz>${version}.tar.gz"
-checksum=e87b5f5da1f026cf9261aec03de62305720cb0e7fd312245b2b9101aca6ad2ba
+checksum=dbd739dae5c16a94763dac0a7407d0307f0814f7bf48b99591b772820c874b4f
 
 provides="i3-${version}_${revision}"
 replaces="i3>=0"
@@ -26,14 +26,11 @@ case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libglob-devel";;
 esac
 
-pre_configure() {
-	autoreconf -fi
-}
-
 pre_build() {
 	case "$XBPS_TARGET_MACHINE" in
 	*-musl)
-		vsed -i "/^LIBS =/s,$,& ${XBPS_CROSS_BASE}/usr/lib/libglob.a," Makefile
+		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
@@ -48,6 +45,4 @@ do_check() {
 post_install() {
 	rm -rf ${DESTDIR}/usr/include
 	vlicense LICENSE
-	vmkdir usr/share/man/man1
-	install -m644 man/*.1 ${DESTDIR}/usr/share/man/man1
 }

Re: [PR PATCH] [Merged]: i3-gaps: update to 4.19.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

There's a merged pull request on the void-packages repository

i3-gaps: update to 4.19.
https://github.com/void-linux/void-packages/pull/26437

Description: