* [PR PATCH] i3: update to 4.19.
@ 2020-11-16 15:40 abenson
2020-11-16 16:54 ` [PR PATCH] [Updated] " abenson
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: abenson @ 2020-11-16 15:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 304 bytes --]
There is a new 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: 1281 bytes --]
From 45e3c7060dff8ca73da13afbfb9f3c5eecdcfbed 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 | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index cb23283d1a5..c9bd459c2f7 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";;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] i3: update to 4.19.
2020-11-16 15:40 [PR PATCH] i3: update to 4.19 abenson
@ 2020-11-16 16:54 ` abenson
2020-11-16 17:44 ` abenson
2020-11-17 18:57 ` [PR PATCH] [Merged]: " abenson
2 siblings, 0 replies; 4+ messages in thread
From: abenson @ 2020-11-16 16:54 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] i3: update to 4.19.
2020-11-16 15:40 [PR PATCH] i3: update to 4.19 abenson
2020-11-16 16:54 ` [PR PATCH] [Updated] " abenson
@ 2020-11-16 17:44 ` abenson
2020-11-17 18:57 ` [PR PATCH] [Merged]: " abenson
2 siblings, 0 replies; 4+ messages in thread
From: abenson @ 2020-11-16 17:44 UTC (permalink / raw)
To: ml
[-- 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: 2082 bytes --]
From 0ddb626076de1ef07d65131e38c3e73adcad311c 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 | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/i3/template b/srcpkgs/i3/template
index cb23283d1a5..f3d9d6c9d00 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,10 +24,11 @@ esac
pre_build() {
case "$XBPS_TARGET_MACHINE" in
*-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
+ 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
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: i3: update to 4.19.
2020-11-16 15:40 [PR PATCH] i3: update to 4.19 abenson
2020-11-16 16:54 ` [PR PATCH] [Updated] " abenson
2020-11-16 17:44 ` abenson
@ 2020-11-17 18:57 ` abenson
2 siblings, 0 replies; 4+ messages in thread
From: abenson @ 2020-11-17 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
There's a merged pull request on the void-packages repository
i3: update to 4.19.
https://github.com/void-linux/void-packages/pull/26433
Description:
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-17 18:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-16 15:40 [PR PATCH] i3: update to 4.19 abenson
2020-11-16 16:54 ` [PR PATCH] [Updated] " abenson
2020-11-16 17:44 ` abenson
2020-11-17 18:57 ` [PR PATCH] [Merged]: " abenson
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).