evilwm: update to 1.1.0
This commit is contained in:
parent
42dc1c5832
commit
473da961cc
|
|
@ -3,4 +3,7 @@ drwxr-xr-x root/root usr/bin/
|
|||
-rwxr-xr-x root/root usr/bin/evilwm
|
||||
drwxr-xr-x root/root usr/man/
|
||||
drwxr-xr-x root/root usr/man/man1/
|
||||
-rwxr-xr-x root/root usr/man/man1/evilwm.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/evilwm.1.gz
|
||||
drwxr-xr-x root/root usr/share/
|
||||
drwxr-xr-x root/root usr/share/applications/
|
||||
-rw-r--r-- root/root usr/share/applications/evilwm.desktop
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
8fd9256c635cce2289b648a01d54202c evilwm-1.0.1.tar.gz
|
||||
a06a1167dac39392859b5e0da96f13ed evilwm-config.patch
|
||||
5f14cc3019320860c85bb07c60a76bd7 evilwm-1.1.0.tar.gz
|
||||
92689018480b2748d995d042e64da8af evilwm-config.patch
|
||||
99456f8f44a7918c27ec40425bef2a10 evilwm-maximise.patch
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
# Depends on: xorg-libxext xorg-libxrandr xorg-font-misc-misc xorg-font-alias
|
||||
|
||||
name=evilwm
|
||||
version=1.0.1
|
||||
release=2
|
||||
version=1.1.0
|
||||
release=1
|
||||
source=(http://www.6809.org.uk/$name/$name-$version.tar.gz \
|
||||
$name-config.patch $name-maximise.patch)
|
||||
|
||||
build () {
|
||||
cd $name-$version
|
||||
patch -p1 -i $SRC/$name-config.patch
|
||||
patch -p1 -i $SRC/$name-maximise.patch
|
||||
make
|
||||
make DESTDIR=$PKG install
|
||||
#patch -p1 -i $SRC/$name-maximise.patch
|
||||
make CFLAGS="$CFLAGS"
|
||||
make DESTDIR=$PKG mandir=/usr/man install
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,43 +1,19 @@
|
|||
diff -Nru evilwm-1.0.1.orig/Makefile evilwm-1.0.1/Makefile
|
||||
--- evilwm-1.0.1.orig/Makefile 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/Makefile 2009-06-23 10:28:34.000000000 +0200
|
||||
@@ -71,7 +71,7 @@
|
||||
#DEFINES += -DXDEBUG # show some X calls
|
||||
|
||||
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)
|
||||
@@ -92,9 +92,9 @@
|
||||
|
||||
install: evilwm
|
||||
if [ -f evilwm.exe ]; then mv evilwm.exe evilwm; fi
|
||||
- mkdir -p $(prefix)/bin $(prefix)/share/man/man1
|
||||
+ mkdir -p $(prefix)/bin $(prefix)/man/man1
|
||||
install -s evilwm $(prefix)/bin
|
||||
- install evilwm.1 $(prefix)/share/man/man1
|
||||
+ install evilwm.1 $(prefix)/man/man1
|
||||
#gzip -9 $(prefix)/share/man/man1/evilwm.1
|
||||
|
||||
dist:
|
||||
diff -Nru evilwm-1.0.1.orig/evilwm.1 evilwm-1.0.1/evilwm.1
|
||||
--- evilwm-1.0.1.orig/evilwm.1 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/evilwm.1 2009-06-23 10:28:34.000000000 +0200
|
||||
@@ -70,7 +70,7 @@
|
||||
bottom-right of screen.
|
||||
.IP I
|
||||
diff -Nru evilwm-1.1.0.orig/evilwm.1 evilwm-1.1.0/evilwm.1
|
||||
--- evilwm-1.1.0.orig/evilwm.1 2011-07-06 12:35:18.280005418 +0200
|
||||
+++ evilwm-1.1.0/evilwm.1 2011-07-06 12:44:23.853798991 +0200
|
||||
@@ -68,7 +68,7 @@
|
||||
I
|
||||
Show information about current window.
|
||||
-.IP Equals
|
||||
+.IP V
|
||||
.TP
|
||||
-Equals
|
||||
+V
|
||||
Maximise current window vertically (toggle).
|
||||
.IP X
|
||||
Maximise current window (toggle).
|
||||
diff -Nru evilwm-1.0.1.orig/evilwm.h evilwm-1.0.1/evilwm.h
|
||||
--- evilwm-1.0.1.orig/evilwm.h 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/evilwm.h 2009-06-23 10:33:36.000000000 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
.TP
|
||||
X
|
||||
diff -Nru evilwm-1.1.0.orig/evilwm.h evilwm-1.1.0/evilwm.h
|
||||
--- evilwm-1.1.0.orig/evilwm.h 2011-07-06 12:35:18.280005418 +0200
|
||||
+++ evilwm-1.1.0/evilwm.h 2011-07-06 12:47:25.107270644 +0200
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
/* default settings */
|
||||
|
||||
|
|
@ -46,15 +22,15 @@ diff -Nru evilwm-1.0.1.orig/evilwm.h evilwm-1.0.1/evilwm.h
|
|||
#define DEF_FG "goldenrod"
|
||||
#define DEF_BG "grey50"
|
||||
#define DEF_BW 1
|
||||
diff -Nru evilwm-1.0.1.orig/keymap.h evilwm-1.0.1/keymap.h
|
||||
--- evilwm-1.0.1.orig/keymap.h 2009-06-23 10:28:06.000000000 +0200
|
||||
+++ evilwm-1.0.1/keymap.h 2009-06-23 10:28:34.000000000 +0200
|
||||
diff -Nru evilwm-1.1.0.orig/keymap.h evilwm-1.1.0/keymap.h
|
||||
--- evilwm-1.1.0.orig/keymap.h 2011-07-06 12:35:18.280005418 +0200
|
||||
+++ evilwm-1.1.0/keymap.h 2011-07-06 12:43:34.052256271 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
#define KEY_LOWER XK_Insert
|
||||
#define KEY_ALTLOWER XK_KP_Insert
|
||||
#define KEY_INFO XK_i
|
||||
-#define KEY_MAXVERT XK_equal
|
||||
+#define KEY_MAXVERT XK_v
|
||||
#define KEY_MAX XK_x
|
||||
#define KEY_LOWER XK_Insert
|
||||
#define KEY_ALTLOWER XK_KP_Insert
|
||||
#define KEY_INFO XK_i
|
||||
-#define KEY_MAXVERT XK_equal
|
||||
+#define KEY_MAXVERT XK_v
|
||||
#define KEY_MAX XK_x
|
||||
#define KEY_DOCK_TOGGLE XK_d
|
||||
#ifdef VWM
|
||||
# define KEY_FIX XK_f
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
diff -Nru evilwm-1.0.1.orig/screen.c evilwm-1.0.1/screen.c
|
||||
--- evilwm-1.0.1.orig/screen.c 2009-03-30 13:53:24.000000000 +0200
|
||||
+++ evilwm-1.0.1/screen.c 2009-03-30 13:54:00.000000000 +0200
|
||||
@@ -317,8 +317,8 @@
|
||||
} else {
|
||||
c->oldx = c->x;
|
||||
c->oldw = c->width;
|
||||
- c->x = 0;
|
||||
- c->width = DisplayWidth(dpy, c->screen->screen);
|
||||
+ c->x = 1;
|
||||
+ c->width = DisplayWidth(dpy, c->screen->screen) - 2;
|
||||
}
|
||||
}
|
||||
if (hv & MAXIMISE_VERT) {
|
||||
@@ -329,8 +329,8 @@
|
||||
} else {
|
||||
c->oldy = c->y;
|
||||
c->oldh = c->height;
|
||||
- c->y = 0;
|
||||
- c->height = DisplayHeight(dpy, c->screen->screen);
|
||||
+ c->y = 1;
|
||||
+ c->height = DisplayHeight(dpy, c->screen->screen) - 2;
|
||||
}
|
||||
}
|
||||
moveresize(c);
|
||||
Loading…
Reference in New Issue
Block a user