summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/i3/files/i3-4.0.1-gentoo.diff')
-rw-r--r--x11-wm/i3/files/i3-4.0.1-gentoo.diff125
1 files changed, 125 insertions, 0 deletions
diff --git a/x11-wm/i3/files/i3-4.0.1-gentoo.diff b/x11-wm/i3/files/i3-4.0.1-gentoo.diff
new file mode 100644
index 000000000000..5d3c6ec082af
--- /dev/null
+++ b/x11-wm/i3/files/i3-4.0.1-gentoo.diff
@@ -0,0 +1,125 @@
+--- a/common.mk
++++ b/common.mk
+@@ -1,5 +1,5 @@
+ UNAME=$(shell uname)
+-DEBUG=1
++DEBUG=0
+ COVERAGE=0
+ INSTALL=install
+ ifndef PREFIX
+@@ -12,7 +12,7 @@
+ SYSCONFDIR=$(PREFIX)/etc
+ endif
+ endif
+-TERM_EMU=xterm
++TERM_EMU=urxvt
+ # The escaping is absurd, but we need to escape for shell, sed, make, define
+ GIT_VERSION:="4.0 (2011-07-31, branch \\\"master\\\")"
+ VERSION:=4.0
+@@ -103,9 +103,6 @@
+ # Extended debugging flags, macros shall be available in gcc
+ CFLAGS += -gdwarf-2
+ CFLAGS += -g3
+-else
+-CFLAGS += -O2
+-CFLAGS += -freorder-blocks-and-partition
+ endif
+
+ ifeq ($(COVERAGE),1)
+@@ -113,9 +110,6 @@
+ LIBS += -lgcov
+ endif
+
+-# Don’t print command lines which are run
+-.SILENT:
+-
+ # Always remake the following targets
+ .PHONY: install clean dist distclean
+
+--- a/Makefile
++++ b/Makefile
+@@ -22,24 +22,19 @@
+
+ # Depend on the specific file (.c for each .o) and on all headers
+ src/%.o: src/%.c ${HEADERS}
+- echo "CC $<"
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="((uint64_t)1 << $(shell awk '/$(shell basename $< .c)/ { print NR; exit 0; }' loglevels.tmp))" -c -o $@ $<
+
+ all: i3 subdirs
+
+ i3: src/cfgparse.y.o src/cfgparse.yy.o src/cmdparse.y.o src/cmdparse.yy.o ${FILES}
+- echo "LINK i3"
+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ subdirs:
+ for dir in $(SUBDIRS); do \
+- echo ""; \
+- echo "MAKE $$dir"; \
+ $(MAKE) -C $$dir; \
+ done
+
+ loglevels.h:
+- echo "LOGLEVELS"
+ for file in $$(ls src/*.c src/*.y src/*.l | grep -v 'cfgparse.\(tab\|yy\).c'); \
+ do \
+ echo $$(basename $$file .c); \
+@@ -51,29 +46,24 @@
+ echo "};") > include/loglevels.h;
+
+ src/cfgparse.yy.o: src/cfgparse.l src/cfgparse.y.o ${HEADERS}
+- echo "LEX $<"
+ flex -i -o$(@:.o=.c) $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
+
+ src/cmdparse.yy.o: src/cmdparse.l src/cmdparse.y.o ${HEADERS}
+- echo "LEX $<"
+ flex -Pcmdyy -i -o$(@:.o=.c) $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.l/ { print NR }' loglevels.tmp))" -c -o $@ $(@:.o=.c)
+
+
+ src/cfgparse.y.o: src/cfgparse.y ${HEADERS}
+- echo "YACC $<"
+ bison --debug --verbose -b $(basename $< .y) -d $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cfgparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
+
+ src/cmdparse.y.o: src/cmdparse.y ${HEADERS}
+- echo "YACC $<"
+ bison -p cmdyy --debug --verbose -b $(basename $< .y) -d $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -DLOGLEVEL="(1 << $(shell awk '/cmdparse.y/ { print NR }' loglevels.tmp))" -c -o $@ $(<:.y=.tab.c)
+
+
+ install: all
+- echo "INSTALL"
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/i3
+ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
+@@ -88,6 +78,7 @@
+ for dir in $(SUBDIRS); do \
+ $(MAKE) -C $$dir install; \
+ done
++ $(MAKE) -C man
+
+ dist: distclean
+ [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
+--- a/man/Makefile
++++ b/man/Makefile
+@@ -1,6 +1,8 @@
+ A2M:=a2x -f manpage --asciidoc-opts="-f asciidoc.conf"
+
+-all: i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1
++mans=i3.1 i3-msg.1 i3-input.1 i3-nagbar.1 i3-wsbar.1 i3-config-wizard.1 i3-migrate-config-to-v4.1
++
++all: $(mans)
+
+ %.1: %.man asciidoc.conf
+ ${A2M} $<
+@@ -16,3 +18,9 @@
+
+ distclean: clean
+ rm -f *.1
++
++install:
++ $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/man/man1
++ for man in $(mans); do \
++ $(INSTALL) -m 0644 $$man $(DESTDIR)$(PREFIX)/share/man/man1
++ done