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 <[email protected]>
---- 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 <[email protected]>
---- 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 <[email protected]>
-
---- 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

Reply via email to