* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/
@ 2017-02-18 22:09 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2017-02-18 22:09 UTC (permalink / raw
To: gentoo-commits
commit: 163219191179b1453217963b796b6850ef1df78b
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 18 15:47:07 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 22:08:59 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16321919
x11-wm/i3: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/4024
x11-wm/i3/files/i3-4.6-missing_include.patch | 15 ----------
x11-wm/i3/files/i3-4.7.2-cflags.patch | 16 ----------
x11-wm/i3/files/i3-4.7.2-parallel_make.patch | 45 ----------------------------
3 files changed, 76 deletions(-)
diff --git a/x11-wm/i3/files/i3-4.6-missing_include.patch b/x11-wm/i3/files/i3-4.6-missing_include.patch
deleted file mode 100644
index 77147d264e..0000000000
--- a/x11-wm/i3/files/i3-4.6-missing_include.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Include float.h for DBL_EPSILON
-
-https://bugs.gentoo.org/show_bug.cgi?id=480272
-
-Patch was written by Jeroen Roovers <jer@gentoo.org>
---- a/src/handlers.c
-+++ b/src/handlers.c
-@@ -13,6 +13,7 @@
- #include "all.h"
-
- #include <time.h>
-+#include <float.h>
- #include <sys/time.h>
- #include <xcb/randr.h>
- #include <X11/XKBlib.h>
diff --git a/x11-wm/i3/files/i3-4.7.2-cflags.patch b/x11-wm/i3/files/i3-4.7.2-cflags.patch
deleted file mode 100644
index ed9256f441..0000000000
--- a/x11-wm/i3/files/i3-4.7.2-cflags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Respect CFLAGS in linking command
-
-https://bugs.gentoo.org/show_bug.cgi?id=508426
-
-Patch written by Julian Ospald <hasufell@gentoo.org>
---- a/src/i3.mk
-+++ b/src/i3.mk
-@@ -64,7 +64,7 @@ i3-config-parser.stamp: generate-command-parser.pl parser-specs/config.spec
-
- i3: libi3.a $(i3_OBJECTS)
- echo "[i3] Link i3"
-- $(CC) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_LIBS)
-+ $(CC) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -o $@ $(filter-out libi3.a,$^) $(LIBS) $(i3_LIBS)
-
- install-i3: i3
- echo "[i3] Install"
diff --git a/x11-wm/i3/files/i3-4.7.2-parallel_make.patch b/x11-wm/i3/files/i3-4.7.2-parallel_make.patch
deleted file mode 100644
index 8e6eee75a9..0000000000
--- a/x11-wm/i3/files/i3-4.7.2-parallel_make.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Fix parallel build
-
-https://bugs.gentoo.org/show_bug.cgi?id=508304
-
-Patch written by Julian Ospald <hasufell@gentoo.org>
-
---- a/src/i3.mk
-+++ b/src/i3.mk
-@@ -1,4 +1,4 @@
--ALL_TARGETS += i3
-+ALL_TARGETS += i3 test-tools
- INSTALL_TARGETS += install-i3
- CLEAN_TARGETS += clean-i3
-
-@@ -36,20 +36,22 @@ src/%.o: src/%.c $(i3_HEADERS_DEP)
- echo "[i3] CC $<"
- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(PCH_FLAGS) -c -o $@ ${canonical_path}/$<
-
--# This target compiles the command parser twice:
--# Once with -DTEST_PARSER, creating a stand-alone executable used for tests,
--# and once as an object file for i3.
-+test-tools: src/test.commands_parser src/test.config_parser
-+
-+src/test.commands_parser: src/commands_parser.c $(i3_HEADERS_DEP) i3-command-parser.stamp libi3.a
-+ echo "[i3] Link test.commands_parser"
-+ $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o test.commands_parser $< $(LIBS) $(i3_LIBS)
-+
-+src/test.config_parser: src/config_parser.c $(i3_HEADERS_DEP) i3-config-parser.stamp libi3.a
-+ echo "[i3] Link test.config_parser"
-+ $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o test.config_parser $< $(LIBS) $(i3_LIBS)
-+
- src/commands_parser.o: src/commands_parser.c $(i3_HEADERS_DEP) i3-command-parser.stamp
- echo "[i3] CC $<"
-- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o test.commands_parser $< $(LIBS) $(i3_LIBS)
- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ ${canonical_path}/$<
-
--# This target compiles the command parser twice:
--# Once with -DTEST_PARSER, creating a stand-alone executable used for tests,
--# and once as an object file for i3.
- src/config_parser.o: src/config_parser.c $(i3_HEADERS_DEP) i3-config-parser.stamp
- echo "[i3] CC $<"
-- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) $(I3_LDFLAGS) $(LDFLAGS) -DTEST_PARSER -g -o test.config_parser $< $(LIBS) $(i3_LIBS)
- $(CC) $(I3_CPPFLAGS) $(XCB_CPPFLAGS) $(CPPFLAGS) $(i3_CFLAGS) $(I3_CFLAGS) $(CFLAGS) -c -o $@ ${canonical_path}/$<
-
- i3-command-parser.stamp: generate-command-parser.pl parser-specs/commands.spec
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/
@ 2021-10-06 16:17 Jakov Smolić
0 siblings, 0 replies; 3+ messages in thread
From: Jakov Smolić @ 2021-10-06 16:17 UTC (permalink / raw
To: gentoo-commits
commit: 2c4a8afd9d1b9af9298a3913b7a7474c4acd6aad
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Oct 6 16:08:27 2021 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Oct 6 16:16:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c4a8afd
x11-wm/i3: remove unused patch
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22506
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch b/x11-wm/i3/files/i3-gaps-4.19-fix-docdir.patch
deleted file mode 100644
index 6917aa091df..00000000000
--- a/x11-wm/i3/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
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/
@ 2023-05-08 18:41 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2023-05-08 18:41 UTC (permalink / raw
To: gentoo-commits
commit: c03adc90935f7b105c83500a495619d3090d54eb
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon May 8 16:22:12 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon May 8 18:41:05 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03adc90
x11-wm/i3: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30934
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch | 86 ---------------------------
1 file changed, 86 deletions(-)
diff --git a/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch b/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch
deleted file mode 100644
index 1e67ec2a3c4f..000000000000
--- a/x11-wm/i3/files/i3-4.16-musl-GLOB_TILDE.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Natanael Copa <ncopa@alpinelinux.org>
-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);
- }
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-08 18:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-06 16:17 [gentoo-commits] repo/gentoo:master commit in: x11-wm/i3/files/ Jakov Smolić
-- strict thread matches above, loose matches on Subject: below --
2023-05-08 18:41 Conrad Kostecki
2017-02-18 22:09 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox