[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/, x11-wm/i3-gaps/files/
commit: 7a8f35c5dfc8d84cc2e37b064b1eff2c3a4d346d
Author: John Helmert III gentoo org>
AuthorDate: Mon Aug 15 15:06:52 2022 +
Commit: John Helmert III gentoo org>
CommitDate: Mon Aug 15 15:07:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8f35c5
x11-wm/i3-gaps: drop 4.19.1, 4.20
Signed-off-by: John Helmert III gentoo.org>
x11-wm/i3-gaps/Manifest| 2 -
x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch | 22 --
x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild | 87 --
x11-wm/i3-gaps/i3-gaps-4.20.ebuild | 85 -
4 files changed, 196 deletions(-)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 157ed84d5b9c..8e0330038f20 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,3 +1 @@
-DIST i3-gaps-4.19.1.tar.gz 4189285 BLAKE2B
91dcf3024cfdc01f52eefc53912d5d2264c51683ae1249761fa848593ffea94ee67d7638d07e078477074fa57158d099f668a27f88b7ad3c10e56efb464bb6d9
SHA512
200610a221655beee5c204dca1b2d8fe37c64d9054713605a403ba8973b30460bbc64f9172aa3b262f2f8b477584fca667137147ac076bb06745130f31750a9a
DIST i3-gaps-4.20.1.tar.gz 4199697 BLAKE2B
b9297f95d8e29f6bcc2fa89ba99c30bd9c4df3549de8b4eff018c0ad1e39e1c5a89281e5a0994596b6af08e8bdf94b8df87042023dc757fa2596770484be
SHA512
0f3cab505f5dcd11d4d9ab63aa84d7d90e63ffebe6a867c9592c7979fe57d37db69869d555ea2127b84caa108778a028e03fa8fab1432d897c02723e3c83e6ba
-DIST i3-gaps-4.20.tar.gz 4200904 BLAKE2B
a76825404119b9161b90eebfd0d5beca53dc6b081ce434c6eac059abf7446452817364a598bfed76965807307be80227dd221162eb299b63276a8639a0f8f7e4
SHA512
e0fd261df5dd80bf7d2e1b13da88fa4968a03e9a883a7d5f4d2a68fe62cc3df8f675acde1f35a9dbd9ecec7e800322264e7f869d89f34c77668a310b866fb316
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch
b/x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch
deleted file mode 100644
index 6917aa091dff..
--- a/x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 11541e21..a6f8974e 100644
a/meson.build
-+++ b/meson.build
-@@ -642,7 +642,7 @@ if get_option('docs')
- '@OUTPUT@',
- ],
- install: true,
--install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
-+install_dir: docdir,
- )
-
- custom_target(
-@@ -655,7 +655,7 @@ if get_option('docs')
- '@OUTPUT@',
- ],
- install: true,
--install_dir: join_paths(get_option('datadir'), 'doc', 'i3'),
-+install_dir: docdir,
- )
- endif
-
diff --git a/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
deleted file mode 100644
index 4ec99970db7a..
--- a/x11-wm/i3-gaps/i3-gaps-4.19.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson optfeature
-
-DESCRIPTION="i3 fork with gaps and some more features"
-HOMEPAGE="https://github.com/Airblader/i3";
-SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="dev-libs/glib:2
- dev-libs/libev
- dev-libs/libpcre
- dev-libs/yajl
- x11-libs/cairo[X,xcb(+)]
- x11-libs/libxcb[xkb]
- x11-libs/libxkbcommon[X]
- x11-libs/pango[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-cursor
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm"
-DEPEND="${COMMON_DEPEND}
- test? (
- dev-perl/ExtUtils-PkgConfig
- dev-perl/IPC-Run
- dev-perl/Inline
- dev-perl/Inline-C
- dev-perl/X11-XCB
- dev-perl/XS-Object-Magic
- x11-apps/xhost
- x11-base/xorg-server[xephyr,xvfb]
- x11-misc/xvfb-run
- )"
-BDEPEND="app-text/asciidoc
- app-text/xmlto
- dev-lang/perl
- virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- dev-perl/AnyEvent-I3
- dev-perl/JSON-XS
- !x11-wm/i3"
-
-S="${WORKDIR}/i3-${PV}"
-
-DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.18-musl.patch"
- "${FILESDIR}/${PN}-4.19-fix-docdir.patch"
-)
-
-src_configure() {
- local emesonargs=(
- -Ddocdir="/usr/share/doc/${PF}"
- -Ddocs=$(usex doc true false)
- -Dmans=true
- )
-
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- exeinto /etc/X11/Sessions
- newexe - i3wm <<- EOF
- #!/usr/bin/env sh
- exec /usr/bin/i3
- EOF
-}
-
-pkg_postinst() {
- optfeature "Application launcher" x11-misc/dmenu
- optfeature "Simple screen locker" x11-misc/i
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/, x11-wm/i3-gaps/files/
commit: 74c3f22f3f3c9ef3e0f5b6fec85b2a3da6c2989c
Author: John Helmert III posteo net>
AuthorDate: Sun Oct 4 16:12:41 2020 +
Commit: David Seifert gentoo org>
CommitDate: Sun Oct 4 16:12:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74c3f22f
x11-wm/i3-gaps: bump to 4.18.2
Tests depend on a version bump for dev-perl/X11-XCB [1], and I've
dropped a test for which a report is open upstream [2].
PPC64 is also dropped here pending rekeywording of new test deps.
[1] https://bugs.gentoo.org/744115
[2] https://github.com/i3/i3/issues/4204
Closes: https://bugs.gentoo.org/743013
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: John Helmert III posteo.net>
Signed-off-by: David Seifert gentoo.org>
x11-wm/i3-gaps/Manifest| 1 +
.../files/i3-gaps-4.18.2-drop-branch-test.patch| 11 +++
x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild | 101 +
3 files changed, 113 insertions(+)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 9f7fe358514..9d4ec11d394 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,3 +1,4 @@
DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
SHA512
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
DIST i3-gaps-4.17.1.tar.gz 3991747 BLAKE2B
e5ff8293abf41ffbd15c35590a0594861d7c8b70c0f42886ef7f15fb34b8da57a92cf9bcae76576e7db6db9bacc2356722e5653b1cf35b8446716f8845468b4b
SHA512
31e47487f6f662f27b2642925f4ddfc553f1fd075e612d0d2661db723897b12eeae0a2bcefa8a43e7f1d4c15aecd3a63e37c8f7e1f9fc96567faa380ebff
DIST i3-gaps-4.18.1.tar.gz 3999609 BLAKE2B
1a7f0d83831505fb8b75c00efeff276d3a837166029ff6d63dec7aa746a0d9c31245fdcf075f27a43f8c7456f178e30c8c8ddc87e30fbc53b244cf141a41aa34
SHA512
63a37e5920b3945be58e54f86b75523499e6b3a8dd9a05a952118e5609c9bd50fedabe05160eef0ebc377020042508a552f2a32272afcf1c913efcf48ac3e460
+DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B
d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd
SHA512
86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.18.2-drop-branch-test.patch
b/x11-wm/i3-gaps/files/i3-gaps-4.18.2-drop-branch-test.patch
new file mode 100644
index 000..f6312fd0bf8
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.18.2-drop-branch-test.patch
@@ -0,0 +1,11 @@
+diff --git a/testcases/t/193-ipc-version.t b/testcases/t/193-ipc-version.t
+index d5f4badf..1f911a63 100644
+--- a/testcases/t/193-ipc-version.t
b/testcases/t/193-ipc-version.t
+@@ -32,6 +32,4 @@ cmp_ok($version->{minor}, '>', 0, 'minor version > 0');
+
+ is(int($version->{minor}), $version->{minor}, 'minor version is an integer');
+ is(int($version->{patch}), $version->{patch}, 'patch version is an integer');
+-like($version->{human_readable}, qr/branch/, 'human readable version contains
branch name');
+-
+ done_testing;
diff --git a/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
new file mode 100644
index 000..b1f798d7b3d
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3";
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="dev-libs/glib:2
+ dev-libs/libev
+ dev-libs/libpcre
+ dev-libs/yajl
+ x11-libs/cairo[X,xcb(+)]
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbcommon[X]
+ x11-libs/pango[X]
+ x11-libs/startup-notification
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+ x11-libs/xcb-util-xrm
+"
+DEPEND="${CDEPEND}
+ test? (
+ dev-perl/ExtUtils-PkgConfig
+ dev-perl/IPC-Run
+ dev-perl/Inline
+ dev-perl/Inline-C
+ dev-perl/X11-XCB
+ dev-perl/XS-Object-Magic
+ x11-base/xorg-server[xephyr,xvfb]
+ x11-misc/xvfb-run
+ )
+"
+BDEPEND="
+ app-text/asciidoc
+ app-text/xmlto
+ dev-lang/perl
+ virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+ dev-lang/perl
+ dev-perl/AnyEvent-I3
+ dev-perl/JSON-XS
+ !x11-wm/i3
+"
+
+S="${WORKDIR}/i3-${PV}"
+
+DOCS=( RELEASE-NOTES-$(ver_cut 1-3) )
+
+PATCHES=(
+ "${FILESDIR}/${PN}-
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/, x11-wm/i3-gaps/files/
commit: d7353b73cff97ab511c027620d57fb44d8b0d661
Author: John Helmert III posteo net>
AuthorDate: Sat Jun 6 17:16:58 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Wed Jun 17 21:57:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7353b73
x11-wm/i3-gaps: Add 4.18.1 (fixes GCC10 build)
Bug: https://bugs.gentoo.org/711546
Closes: https://bugs.gentoo.org/721274
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: John Helmert III posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16087
Signed-off-by: Thomas Deutschmann gentoo.org>
x11-wm/i3-gaps/Manifest | 1 +
x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch | 74 +++
x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild | 87
3 files changed, 162 insertions(+)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 652f73bdb1d..9f7fe358514 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,2 +1,3 @@
DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
SHA512
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
DIST i3-gaps-4.17.1.tar.gz 3991747 BLAKE2B
e5ff8293abf41ffbd15c35590a0594861d7c8b70c0f42886ef7f15fb34b8da57a92cf9bcae76576e7db6db9bacc2356722e5653b1cf35b8446716f8845468b4b
SHA512
31e47487f6f662f27b2642925f4ddfc553f1fd075e612d0d2661db723897b12eeae0a2bcefa8a43e7f1d4c15aecd3a63e37c8f7e1f9fc96567faa380ebff
+DIST i3-gaps-4.18.1.tar.gz 3999609 BLAKE2B
1a7f0d83831505fb8b75c00efeff276d3a837166029ff6d63dec7aa746a0d9c31245fdcf075f27a43f8c7456f178e30c8c8ddc87e30fbc53b244cf141a41aa34
SHA512
63a37e5920b3945be58e54f86b75523499e6b3a8dd9a05a952118e5609c9bd50fedabe05160eef0ebc377020042508a552f2a32272afcf1c913efcf48ac3e460
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch
b/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch
new file mode 100644
index 000..bf59b32e3f7
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.18-musl.patch
@@ -0,0 +1,74 @@
+--- a/i3bar/src/main.c
b/i3bar/src/main.c
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+ *
+ */
+ static char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree(&globbuf);
+-return result;
++
++return sstrdup(path);
+ }
+
+ static void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+ *
+ */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strcpy(result, head);
+-if (tail) {
+-strcat(result, tail);
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
+ }
+ }
+-globfree(&globbuf);
+
+-return result;
++return sstrdup(path);
+ }
+--
+2.27.0
+
diff --git a/x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild
new file mode 100644
index 000..760a674fe04
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3";
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/, x11-wm/i3-gaps/files/
commit: be3b270d9e1ae89d12875793595eab3ff82eb37d
Author: Johannes Huber gentoo org>
AuthorDate: Sat Sep 28 10:45:16 2019 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Sep 28 10:45:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3b270d
x11-wm/i3-gaps: Version bump 4.17.1
Reported-by: Marcin Kowalski autograf.pl>
Closes: https://bugs.gentoo.org/693822
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Johannes Huber gentoo.org>
x11-wm/i3-gaps/Manifest | 1 +
x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch | 71 +++
x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild | 87
3 files changed, 159 insertions(+)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 4d354175686..652f73bdb1d 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1 +1,2 @@
DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
SHA512
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
+DIST i3-gaps-4.17.1.tar.gz 3991747 BLAKE2B
e5ff8293abf41ffbd15c35590a0594861d7c8b70c0f42886ef7f15fb34b8da57a92cf9bcae76576e7db6db9bacc2356722e5653b1cf35b8446716f8845468b4b
SHA512
31e47487f6f662f27b2642925f4ddfc553f1fd075e612d0d2661db723897b12eeae0a2bcefa8a43e7f1d4c15aecd3a63e37c8f7e1f9fc96567faa380ebff
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
b/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
new file mode 100644
index 000..d4f9113e6b1
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
@@ -0,0 +1,71 @@
+--- a/i3bar/src/main.c
b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
+ *
+ */
+ static char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree(&globbuf);
+-return result;
++
++return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+ *
+ */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strcpy(result, head);
+-if (tail) {
+-strcat(result, tail);
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
+ }
+ }
+-globfree(&globbuf);
+
+-return result;
++return sstrdup(path);
+ }
diff --git a/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
new file mode 100644
index 000..0f5113ed0c6
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.17.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools out-of-source
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Airblader/i3";
+SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="
+ dev-libs/glib:2
+ dev-libs/libev
+ dev-libs/libpcre
+ dev-libs/yajl
+ x11-libs/cairo[X,xcb]
+ x11-libs/libxcb[xkb]
+ x11-libs/libxkbcommon[X]
+ x11-libs/pango[X]
+ x11-libs/startup-notification
+ x11-libs/xcb-util
+ x11-libs/xcb-util-cursor
+ x11-libs/xcb-util-keysyms
+ x11-libs/xcb-util-wm
+
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/, x11-wm/i3-gaps/files/
commit: c3da12df17dfa8f7959b80fa2cf7c1bb4d269de3
Author: Johannes Huber gentoo org>
AuthorDate: Sat Nov 17 09:52:33 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Nov 17 09:52:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3da12df
x11-wm/i3-gaps: Version bump 4.16
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Johannes Huber gentoo.org>
x11-wm/i3-gaps/Manifest | 1 +
x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch | 86 +++
x11-wm/i3-gaps/i3-gaps-4.16.ebuild | 87
3 files changed, 174 insertions(+)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index fe96407b113..302cf42bc0e 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1 +1,2 @@
DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
SHA512
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
+DIST i3-gaps-4.16.tar.gz 3985226 BLAKE2B
da61ab6b476a30a4acab24590cd5ca51f0f51318988890e66530fdd76d99236378d9c678e1e37da99e22e70b0e5e0e5895b8146bd5a93b23957cb1e0178e08b1
SHA512
64a392d2b4175e063f0740ee04885156dbd2571262c22df6276e8eaac36765cd03822723208118a1998ff6cbbcd973fb7f6305df9744c477262d5d33b792ee23
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
b/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
new file mode 100644
index 000..1e67ec2a3c4
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
@@ -0,0 +1,86 @@
+From: Natanael Copa
+Patch-Source:
https://git.alpinelinux.org/cgit/aports/tree/community/i3wm/musl.patch
+Project-Bug-URL: https://github.com/i3/i3/issues/1859
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=609306
+
+Musl doesn't implement GLOB_TILDE, which is used by i3 when expanding paths.
+
+This patch replaces usage of GLOB_TILDE in glob() by replacing tilde
+with the content of $HOME - if set - manually.
+
+As mentioned in the i3 bugtracker this is an issue that should be solved by
musl.
+
+A patch has been sent to musl upstream, but it hasn't been merged yet:
+http://www.openwall.com/lists/musl/2017/01/17/1
+---
+--- a/i3bar/src/main.c
b/i3bar/src/main.c
+@@ -48,14 +48,20 @@ void debuglog(char *fmt, ...) {
+ *
+ */
+ static char *expand_path(char *path) {
+-static glob_t globbuf;
+-if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
+-ELOG("glob() failed\n");
+-exit(EXIT_FAILURE);
++char *home, *expanded;
++
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
++}
+ }
+-char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
+-globfree(&globbuf);
+-return result;
++
++return sstrdup(path);
+ }
+
+ void print_usage(char *elf_name) {
+--- a/libi3/resolve_tilde.c
b/libi3/resolve_tilde.c
+@@ -19,28 +19,18 @@
+ *
+ */
+ char *resolve_tilde(const char *path) {
+-static glob_t globbuf;
+-char *head, *tail, *result;
++char *home, *expanded;
+
+-tail = strchr(path, '/');
+-head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
+-
+-int res = glob(head, GLOB_TILDE, NULL, &globbuf);
+-free(head);
+-/* no match, or many wildcard matches are bad */
+-if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
+-result = sstrdup(path);
+-else if (res != 0) {
+-err(EXIT_FAILURE, "glob() failed");
+-} else {
+-head = globbuf.gl_pathv[0];
+-result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
+-strcpy(result, head);
+-if (tail) {
+-strcat(result, tail);
++if (strncmp(path, "~/", 2) == 0) {
++home = getenv("HOME");
++if (home != NULL) {
++/* new length: sum - 1 (omit '~') + 1 (for '\0') */
++expanded = scalloc(strlen(home)+strlen(path), 1);
++strcpy(expanded, home);
++strcat(expanded, path+1);
++return expanded;
+ }
+ }
+-globfree(&globbuf);
+
+-return result;
++return sstrdup(path);
+ }
diff --git a/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
new file mode 100644
index 000..d3e62d0fb17
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.16.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="i3 fork with gaps and some more features"
+HOMEPAGE="https://github.com/Air
