From d6561e7d5982919d9c9e7724195d054edf480e6a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 3 Dec 2011 19:11:21 +0100 Subject: update to latest upstream version --- package/evilwm/patches/patch-Makefile | 77 ++++++++++++++++------------------- package/evilwm/patches/patch-keymap_h | 67 +++++++++++++++--------------- 2 files changed, 71 insertions(+), 73 deletions(-) (limited to 'package/evilwm/patches') diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile index d45dcee52..856d88a33 100644 --- a/package/evilwm/patches/patch-Makefile +++ b/package/evilwm/patches/patch-Makefile @@ -1,46 +1,41 @@ -do not strip by install ---- evilwm-1.0.1.orig/Makefile 2009-03-30 12:37:06.000000000 +0200 -+++ evilwm-1.0.1/Makefile 2010-01-27 08:14:46.000000000 +0100 -@@ -1,11 +1,11 @@ - # If you don't use CC --CC = gcc -+CC ?= gcc +--- evilwm-1.1.0.orig/Makefile 2011-07-03 16:14:21.000000000 +0200 ++++ evilwm-1.1.0/Makefile 2011-12-01 06:25:59.048654953 +0100 +@@ -26,9 +26,13 @@ OPT_CPPFLAGS += -DINFOBANNER + # Uncomment for mouse support. Recommended. + OPT_CPPFLAGS += -DMOUSE - # Edit this line if you don't want evilwm to install under /usr. - # Note that $(DESTDIR) is used by the Debian build process. - prefix = $(DESTDIR)/usr +++XROOT ?= /usr/X11R6 ++OPT_CPPFLAGS += -I$(XROOT)/include ++OPT_LDLIBS += -L$(XROOT)/lib ++ + # Uncomment to support the Xrandr extension (thanks, Yura Semashko). +-OPT_CPPFLAGS += -DRANDR +-OPT_LDLIBS += -lXrandr ++#OPT_CPPFLAGS += -DRANDR ++#OPT_LDLIBS += -lXrandr --XROOT = /usr/X11R6 -+XROOT ?= /usr/X11R6 - INCLUDES = -I$(XROOT)/include - LDPATH = -L$(XROOT)/lib - LIBS = -lX11 -@@ -35,8 +35,8 @@ LIBS += -lXext - # Be sure that libXrandr is in your library search directory (e.g., under - # Solaris, it is in /usr/X11R6/lib, so can be built against with the default - # XPATH above, but won't necessarily be in the library search path). --DEFINES += -DRANDR --LIBS += -lXrandr -+#DEFINES += -DRANDR -+#LIBS += -lXrandr + # Uncomment to support shaped windows. + OPT_CPPFLAGS += -DSHAPE +@@ -74,10 +78,11 @@ OPT_CPPFLAGS += -DWARP_POINTER + # Build tools - # Uncomment for mouse support. You probably want this. - DEFINES += -DMOUSE -@@ -71,7 +71,7 @@ distname = evilwm-$(version) - #DEFINES += -DXDEBUG # show some X calls + # Change this if you don't use gcc: +-CC = gcc ++CC ?= gcc - DEFINES += -DVERSION=\"$(version)\" $(DEBIAN) --CFLAGS += $(INCLUDES) $(DEFINES) -Os -Wall -+CFLAGS += $(INCLUDES) $(DEFINES) -Wall - #CFLAGS += $(INCLUDES) $(DEFINES) -g -Wall - CFLAGS += -W -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls - LDFLAGS += $(LDPATH) $(LIBS) -@@ -93,7 +93,7 @@ evilwm: $(OBJS) - install: evilwm - if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi - mkdir -p $(prefix)/bin $(prefix)/share/man/man1 -- install -s evilwm $(prefix)/bin -+ install evilwm $(prefix)/bin - install evilwm.1 $(prefix)/share/man/man1 - #gzip -9 $(prefix)/share/man/man1/evilwm.1 + # Override if desired: +-CFLAGS = -Os -std=c99 ++CFLAGS ?= ++CFLAGS += -std=c99 + WARN = -Wall -W -Wstrict-prototypes -Wpointer-arith -Wcast-align \ + -Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings \ + -Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls +@@ -95,7 +100,7 @@ INSTALL = install + INSTALL_STRIP = -s + INSTALL_DIR = $(INSTALL) -d -m 0755 + INSTALL_FILE = $(INSTALL) -m 0644 +-INSTALL_PROGRAM = $(INSTALL) -m 0755 $(INSTALL_STRIP) ++INSTALL_PROGRAM = $(INSTALL) -m 0755 + ############################################################################ + # You shouldn't need to change anything beyond this point diff --git a/package/evilwm/patches/patch-keymap_h b/package/evilwm/patches/patch-keymap_h index fe06ccf74..9b8fa0f22 100644 --- a/package/evilwm/patches/patch-keymap_h +++ b/package/evilwm/patches/patch-keymap_h @@ -1,41 +1,44 @@ ---- evilwm-1.0.1.orig/keymap.h 2009-03-30 12:37:06.000000000 +0200 -+++ evilwm-1.0.1/keymap.h 2010-11-27 00:37:21.000000000 +0100 -@@ -2,29 +2,29 @@ +--- evilwm-1.1.0.orig/keymap.h 2011-07-03 16:14:21.000000000 +0200 ++++ evilwm-1.1.0/keymap.h 2011-11-29 19:54:57.437509136 +0100 +@@ -2,23 +2,23 @@ #define _KEYMAP_H - #define KEY_NEXT XK_Tab --#define KEY_NEW XK_Return --#define KEY_TOPLEFT XK_y --#define KEY_TOPRIGHT XK_u --#define KEY_BOTTOMLEFT XK_b --#define KEY_BOTTOMRIGHT XK_n -+#define KEY_NEW XK_e -+#define KEY_TOPLEFT XK_a -+#define KEY_TOPRIGHT XK_s -+#define KEY_BOTTOMLEFT XK_y -+#define KEY_BOTTOMRIGHT XK_x - #define KEY_LEFT XK_h - #define KEY_RIGHT XK_l - #define KEY_DOWN XK_j --#define KEY_UP XK_k -+#define KEY_UP XK_g - #define KEY_LOWER XK_Insert - #define KEY_ALTLOWER XK_KP_Insert - #define KEY_INFO XK_i - #define KEY_MAXVERT XK_equal --#define KEY_MAX XK_x -+#define KEY_MAX XK_m + #define KEY_NEXT XK_Tab +-#define KEY_NEW XK_Return +-#define KEY_TOPLEFT XK_y +-#define KEY_TOPRIGHT XK_u +-#define KEY_BOTTOMLEFT XK_b +-#define KEY_BOTTOMRIGHT XK_n ++#define KEY_NEW XK_e ++#define KEY_TOPLEFT XK_a ++#define KEY_TOPRIGHT XK_s ++#define KEY_BOTTOMLEFT XK_y ++#define KEY_BOTTOMRIGHT XK_x + #define KEY_LEFT XK_h + #define KEY_RIGHT XK_l + #define KEY_DOWN XK_j +-#define KEY_UP XK_k ++#define KEY_UP XK_g + #define KEY_LOWER XK_Insert + #define KEY_ALTLOWER XK_KP_Insert + #define KEY_INFO XK_i + #define KEY_MAXVERT XK_equal +-#define KEY_MAX XK_x +-#define KEY_DOCK_TOGGLE XK_d ++#define KEY_MAX XK_m ++#define KEY_DOCK_TOGGLE XK_f #ifdef VWM --# define KEY_FIX XK_f -+# define KEY_FIX XK_d - # define KEY_PREVDESK XK_Left - # define KEY_NEXTDESK XK_Right - #endif +-# define KEY_FIX XK_f ++# define KEY_FIX XK_d + # define KEY_PREVDESK XK_Left + # define KEY_NEXTDESK XK_Right + # define KEY_TOGGLEDESK XK_a +@@ -26,7 +26,7 @@ /* Mixtures of Ctrl, Alt an Escape are used for things like VMWare and * XFree86/Cygwin, so the KILL key is an option in the Makefile */ #ifndef KEY_KILL --#define KEY_KILL XK_Escape -+#define KEY_KILL XK_k +-# define KEY_KILL XK_Escape ++# define KEY_KILL XK_k #endif #endif -- cgit v1.2.3