From 73d6a92c55df9130dfaf4d3ab4c399b03fe1225d Mon Sep 17 00:00:00 2001 From: Johannes Huber Date: Mon, 7 May 2018 22:03:29 +0200 Subject: x11-wm/i3-gaps: Rename patch Package-Manager: Portage-2.3.36, Repoman-2.3.9 --- x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch | 73 ++++++++++++++++++++++++++++ x11-wm/i3-gaps/files/musl.patch | 73 ---------------------------- x11-wm/i3-gaps/i3-gaps-4.15.ebuild | 2 +- 3 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 x11-wm/i3-gaps/files/i3-gaps-4.15-musl.patch delete mode 100644 x11-wm/i3-gaps/files/musl.patch 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 0000000..82ad619 --- /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); + } diff --git a/x11-wm/i3-gaps/files/musl.patch b/x11-wm/i3-gaps/files/musl.patch deleted file mode 100644 index 82ad619..0000000 --- a/x11-wm/i3-gaps/files/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.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); - } diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.ebuild b/x11-wm/i3-gaps/i3-gaps-4.15.ebuild index be67bd5..cd8e317 100644 --- a/x11-wm/i3-gaps/i3-gaps-4.15.ebuild +++ b/x11-wm/i3-gaps/i3-gaps-4.15.ebuild @@ -44,7 +44,7 @@ S=${WORKDIR}/i3-${PV} DOCS=( RELEASE-NOTES-${PV} ) -PATCHES=( "${FILESDIR}/musl.patch" ) +PATCHES=( "${FILESDIR}/${P}-musl.patch" ) src_prepare() { default -- cgit v1.2.3-65-gdbad