summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2018-05-09 20:12:47 +0200
committerJohannes Huber <johu@gentoo.org>2018-05-09 20:13:05 +0200
commit0cb1e8bf4d5d641aac0a330a96847815b02bea57 (patch)
tree21487e5f81d8b6fbc24b8b07a8ab7886875bef99 /x11-wm/i3-gaps/files
parentapp-dicts/myspell-es: add myself as proxy maintainer (diff)
downloadgentoo-0cb1e8bf4d5d641aac0a330a96847815b02bea57.tar.gz
gentoo-0cb1e8bf4d5d641aac0a330a96847815b02bea57.tar.bz2
gentoo-0cb1e8bf4d5d641aac0a330a96847815b02bea57.zip
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
Diffstat (limited to 'x11-wm/i3-gaps/files')
-rw-r--r--x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch73
1 files changed, 73 insertions, 0 deletions
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 000000000000..82ad6195b8e5
--- /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.000000000 +0100
++++ i3-4.11.new/i3bar/src/main.c 2016-02-08 20:03:41.777392482 +0000
+@@ -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.000000000 +0100
++++ i3-4.11.new/libi3/resolve_tilde.c 2016-02-08 20:03:47.849230953 +0000
+@@ -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);
+ }