[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/
commit: 0cb1e8bf4d5d641aac0a330a96847815b02bea57
Author: Johannes Huber gentoo org>
AuthorDate: Wed May 9 18:12:47 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed May 9 18:13:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb1e8bf
x11-wm/i3-gaps: New package
A popular clone[1] of the improved dynamic tiling window manager i3
which supports gaps and few additional features[2]. There are several
ebuilds already in user overlays available[3][4][5]. Ebuild taken from
oboeverlay, improved by me. The original ebuild is probably the original
x11-wm/i3.
[1] https://www.reddit.com/r/unixporn/search?q=gaps&restrict_sr=1
[2] https://github.com/Airblader/i3
[3] https://github.com/ChrisOboe/oboeverlay/tree/master/x11-wm/i3-gaps
[4] https://github.com/0x4d4c/gentoo-overlay/tree/master/x11-wm/i3-gaps
[5] https://github.com/SonicFrog/overlay/tree/master/x11-wm/i3-gaps
Closes: https://bugs.gentoo.org/654694
Package-Manager: Portage-2.3.36, Repoman-2.3.9
x11-wm/i3-gaps/Manifest | 1 +
x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch | 73 +++
x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild | 87
x11-wm/i3-gaps/metadata.xml | 11
4 files changed, 172 insertions(+)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
new file mode 100644
index 000..fe96407b113
--- /dev/null
+++ b/x11-wm/i3-gaps/Manifest
@@ -0,0 +1 @@
+DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
SHA512
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
new file mode 100644
index 000..82ad6195b8e
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
@@ -0,0 +1,73 @@
+diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
+--- i3-4.11/i3bar/src/main.c 2015-09-30 07:55:10.0 +0100
i3-4.11.new/i3bar/src/main.c 2016-02-08 20:03:41.777392482 +
+@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
+ *
+ */
+ 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) {
+diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
+--- i3-4.11/libi3/resolve_tilde.c 2015-09-30 07:55:10.0 +0100
i3-4.11.new/libi3/resolve_tilde.c 2016-02-08 20:03:47.849230953 +
+@@ -19,27 +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);
+-strncpy(result, head, strlen(head));
+-if (tail)
+-strncat(result, tail, strlen(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.15.0.1.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
new file mode 100644
index 000..54936b5b78b
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eapi7-ver
+
+DESCRIPTION="i
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/
commit: af6ac2bd830d76d871559261adb215f06cec3218
Author: Johannes Huber gentoo org>
AuthorDate: Tue May 14 16:56:07 2019 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue May 14 16:56:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6ac2bd
x11-wm/i3-gaps: Remove 4.15.0.1
Package-Manager: Portage-2.3.66, 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.15-musl.patch | 73 ---
x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild | 87
3 files changed, 161 deletions(-)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index b401a04fccb..4d354175686 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,2 +1 @@
-DIST i3-gaps-4.15.0.1.tar.gz 3965631 BLAKE2B
ea65886c40f377125bafbd80e2d56c1d66a4c5c06d942d645b2cb226323a0903e98aa58b67da9c31c60240b5d99d10ecc20864aeede95a5039ea0ffdff8dcb8b
SHA512
76ff860e4ca0edd0e22bdff9ae9b1bc150df2b5bc15b0d7ea7a63d373e8d156a43bd91f8a40c48b4c771603f7de7c18c6d16c53fef582e53f51c53a197fa7a0a
DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
SHA512
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
diff --git a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
b/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
deleted file mode 100644
index 82ad6195b8e..000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
i3-4.11/i3bar/src/main.c 2015-09-30 07:55:10.0 +0100
-+++ i3-4.11.new/i3bar/src/main.c 2016-02-08 20:03:41.777392482 +
-@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
- *
- */
- 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) {
-diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
i3-4.11/libi3/resolve_tilde.c 2015-09-30 07:55:10.0 +0100
-+++ i3-4.11.new/libi3/resolve_tilde.c 2016-02-08 20:03:47.849230953 +
-@@ -19,27 +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);
--strncpy(result, head, strlen(head));
--if (tail)
--strncat(result, tail, strlen(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.15.0.1.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
deleted file mode 100644
index a4357937c21..000
--- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eapi7-ver
-
-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=""
-
-CDEPEND="
- dev-libs/glib:2
- dev-libs/libev
- dev-libs/libpcre
- dev-libs/yajl
-
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/
commit: 5b8611b7bb94f56f25cff9dffd56d9b59a1923e4
Author: John Helmert III gentoo org>
AuthorDate: Mon May 24 23:19:10 2021 +
Commit: John Helmert III gentoo org>
CommitDate: Mon May 24 23:37:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b8611b7
x11-wm/i3-gaps: drop 4.18.2, 4.19
Signed-off-by: John Helmert III gentoo.org>
x11-wm/i3-gaps/Manifest| 2 -
.../files/i3-gaps-4.18.2-drop-branch-test.patch| 11 ---
x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild | 101 -
x11-wm/i3-gaps/i3-gaps-4.19.ebuild | 91 ---
4 files changed, 205 deletions(-)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 44c70ad8330..a50c19c767e 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,3 +1 @@
-DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B
d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd
SHA512
86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
DIST i3-gaps-4.19.1.tar.gz 4189285 BLAKE2B
91dcf3024cfdc01f52eefc53912d5d2264c51683ae1249761fa848593ffea94ee67d7638d07e078477074fa57158d099f668a27f88b7ad3c10e56efb464bb6d9
SHA512
200610a221655beee5c204dca1b2d8fe37c64d9054713605a403ba8973b30460bbc64f9172aa3b262f2f8b477584fca667137147ac076bb06745130f31750a9a
-DIST i3-gaps-4.19.tar.gz 4192134 BLAKE2B
cc70e36fd01e777e1e4357d1799777eb42c21f1666759d8730c548773c87e4c2806ae5376703956761a8fc036c5e847a4734cddd695067f684038c1cc9a8905e
SHA512
db09203256172cc4807189bbf16d793c9203c908d2e75cbb7d973d1f0338f6e3734afe68ffe1c43ef3e43e5b2c6dba1ab9135625e4d42d10a9ea6f44f673d384
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
deleted file mode 100644
index f6312fd0bf8..000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.18.2-drop-branch-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 61451b2c94d..000
--- a/x11-wm/i3-gaps/i3-gaps-4.18.2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# 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 ~ppc64 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}-$(ver_cut 1-2)-musl.patch"
- "${FILESDIR}/${PN}-4.18.2-drop-branch-test.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-my_src_configure() {
- # disable sanitizer: otherwise injects -O0 -g
- local myeconfargs=(
- $(use_enable doc docs)
- --enable-debug=no
- --enable-mans
- --disable-sanitizers
- )
- econf "${myeconfargs[@]}"
-}
-
-my_src_install_all() {
- doman "${BUILD_DIR}"/man/*.1
- einstalldocs
-
- exeinto /etc/X11/Sessions
- newexe - i3wm <<- EOF
- #!/usr/bi
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/
commit: bb970234d6ee3c7ee325e6a71ef67eea03166dc4
Author: John Helmert III posteo net>
AuthorDate: Tue Nov 10 00:33:52 2020 +
Commit: Patrice Clement gentoo org>
CommitDate: Thu Nov 12 21:27:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb970234
x11-wm/i3-gaps: drop old unstable.
Closes: https://bugs.gentoo.org/743088
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: John Helmert III posteo.net>
Signed-off-by: Patrice Clement gentoo.org>
x11-wm/i3-gaps/Manifest | 2 -
x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch | 71 ---
x11-wm/i3-gaps/i3-gaps-4.17.1-r1.ebuild | 87
x11-wm/i3-gaps/i3-gaps-4.18.1.ebuild | 87
4 files changed, 247 deletions(-)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 73726782a3d..aade67d8a3a 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,5 +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
DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B
d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd
SHA512
86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
DIST i3-gaps-4.18.3.tar.gz 3998976 BLAKE2B
2512f4e0c8ce05874a63bc498d48a14dc5e3fc2f0d68da0d88fcee7deeed68994f07cd3c2f3f55e5c564d40507546358f93c139bece86090137142ec2d2ba9a6
SHA512
e562ea1d75300cb69005d6f5ee8e3d05c8c7cfe1046154b9798f554fa81946f9ff6f8967d5acae2e2e4cbd4e2bce865119edba5e8c1e12febb6122e9c7f63534
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
deleted file mode 100644
index d4f9113e6b1..000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.17-musl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
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;
-+ret
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/
commit: 5f5d596563c6940c2e5e0e6e3aa608988d16a76a
Author: John Helmert III posteo net>
AuthorDate: Wed Nov 18 01:23:45 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Nov 24 06:34:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f5d5965
x11-wm/i3-gaps: add 4.19
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: John Helmert III posteo.net>
Signed-off-by: Joonas Niilola gentoo.org>
x11-wm/i3-gaps/Manifest| 1 +
x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch | 22 ++
x11-wm/i3-gaps/i3-gaps-4.19.ebuild | 91 ++
3 files changed, 114 insertions(+)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index aade67d8a3a..11f4fb73c41 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.18.2.tar.gz 3999555 BLAKE2B
d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd
SHA512
86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
DIST i3-gaps-4.18.3.tar.gz 3998976 BLAKE2B
2512f4e0c8ce05874a63bc498d48a14dc5e3fc2f0d68da0d88fcee7deeed68994f07cd3c2f3f55e5c564d40507546358f93c139bece86090137142ec2d2ba9a6
SHA512
e562ea1d75300cb69005d6f5ee8e3d05c8c7cfe1046154b9798f554fa81946f9ff6f8967d5acae2e2e4cbd4e2bce865119edba5e8c1e12febb6122e9c7f63534
+DIST i3-gaps-4.19.tar.gz 4192134 BLAKE2B
cc70e36fd01e777e1e4357d1799777eb42c21f1666759d8730c548773c87e4c2806ae5376703956761a8fc036c5e847a4734cddd695067f684038c1cc9a8905e
SHA512
db09203256172cc4807189bbf16d793c9203c908d2e75cbb7d973d1f0338f6e3734afe68ffe1c43ef3e43e5b2c6dba1ab9135625e4d42d10a9ea6f44f673d384
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
new file mode 100644
index 000..6917aa091df
--- /dev/null
+++ b/x11-wm/i3-gaps/files/i3-gaps-4.19-fix-docdir.patch
@@ -0,0 +1,22 @@
+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.ebuild
b/x11-wm/i3-gaps/i3-gaps-4.19.ebuild
new file mode 100644
index 000..be6619cfd96
--- /dev/null
+++ b/x11-wm/i3-gaps/i3-gaps-4.19.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 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 ~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() {
+
[gentoo-commits] repo/gentoo:master commit in: x11-wm/i3-gaps/files/, x11-wm/i3-gaps/
commit: ff7d44ac0a3a6ed19ff2e67a7dd2d659bc9f7dbb
Author: John Helmert III posteo net>
AuthorDate: Wed Nov 18 01:25:33 2020 +
Commit: Joonas Niilola gentoo org>
CommitDate: Tue Nov 24 06:34:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff7d44ac
x11-wm/i3-gaps: drop old
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: John Helmert III posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18311
Signed-off-by: Joonas Niilola gentoo.org>
x11-wm/i3-gaps/Manifest | 2 -
x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch | 86 ---
x11-wm/i3-gaps/i3-gaps-4.16.1-r2.ebuild | 87 ---
x11-wm/i3-gaps/i3-gaps-4.18.3.ebuild | 101 ---
4 files changed, 276 deletions(-)
diff --git a/x11-wm/i3-gaps/Manifest b/x11-wm/i3-gaps/Manifest
index 11f4fb73c41..654e5e79c89 100644
--- a/x11-wm/i3-gaps/Manifest
+++ b/x11-wm/i3-gaps/Manifest
@@ -1,4 +1,2 @@
-DIST i3-gaps-4.16.1.tar.gz 3983420 BLAKE2B
f0d5a85b06ce33e1cc177af6da29f9cdf42ed754bb767aa9eaa5ab52f3b9f4f688d251f2a16fb222fc8cf5052e79859891c4185b1325b2ef6c1a813aa220468c
SHA512
904c2f63c6a35573f13fd216625c1349ac71de70ae8f0440667c9d76048cdaf30a398ab358f2366d5f46502d87e801713b625cb509a05f39dbca1371d2b8d0e9
DIST i3-gaps-4.18.2.tar.gz 3999555 BLAKE2B
d825bb4acb76a7909569aa10c6cab517ff08ee4d4d29175c9a84686c83f225a8a090c26ad4bf4ef03e2062bf4d48c7e2e2bf70b49f7a67ecad386597fc1602bd
SHA512
86c76340d1df40bbd7e804515ae9dda350458d22651bee508f9f141acd3f4ea4025c8f40ddf0cdfe1fc3c6b26cbf5c3900204545468776721857bb104200ee34
-DIST i3-gaps-4.18.3.tar.gz 3998976 BLAKE2B
2512f4e0c8ce05874a63bc498d48a14dc5e3fc2f0d68da0d88fcee7deeed68994f07cd3c2f3f55e5c564d40507546358f93c139bece86090137142ec2d2ba9a6
SHA512
e562ea1d75300cb69005d6f5ee8e3d05c8c7cfe1046154b9798f554fa81946f9ff6f8967d5acae2e2e4cbd4e2bce865119edba5e8c1e12febb6122e9c7f63534
DIST i3-gaps-4.19.tar.gz 4192134 BLAKE2B
cc70e36fd01e777e1e4357d1799777eb42c21f1666759d8730c548773c87e4c2806ae5376703956761a8fc036c5e847a4734cddd695067f684038c1cc9a8905e
SHA512
db09203256172cc4807189bbf16d793c9203c908d2e75cbb7d973d1f0338f6e3734afe68ffe1c43ef3e43e5b2c6dba1ab9135625e4d42d10a9ea6f44f673d384
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
deleted file mode 100644
index 1e67ec2a3c4..000
--- a/x11-wm/i3-gaps/files/i3-gaps-4.16-musl.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 !
