evilwm: update to 1.4.3

3 files changed, 10 insertions, 65 deletions

diff --git a/package/evilwm/Makefile b/package/evilwm/Makefile
index 908bfa3f0..11230e356 100644
--- a/package/evilwm/Makefile
+++ b/package/evilwm/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		evilwm
-PKG_VERSION:=		1.1.1
+PKG_VERSION:=		1.4.3
 PKG_RELEASE:=		1
-PKG_HASH:=		79589c296a5915ee0bae1d231e8912601fc794d9f0a9cacb6b648ff9a5f2602a
+PKG_HASH:=		d5945b20b12c91db2412fac0dbda3fb9c3ec8debb8e1b109838992b2b1bbe5d4
 PKG_DESCR:=		minimalist window manager
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libx11 libxext libxrandr
diff --git a/package/evilwm/patches/patch-Makefile b/package/evilwm/patches/patch-Makefile
index 3c24aa646..4abd6cdb0 100644
--- a/package/evilwm/patches/patch-Makefile
+++ b/package/evilwm/patches/patch-Makefile
@@ -1,17 +1,6 @@
---- evilwm-1.1.1.orig/Makefile	2015-07-13 12:19:36.000000000 +0200
-+++ evilwm-1.1.1/Makefile	2016-11-10 02:38:08.961425099 +0100
-@@ -17,6 +17,10 @@ desktopfilesdir = $(datarootdir)/applica
- ############################################################################
- # Features
- 
-+XROOT    ?= /usr/X11R6 
-+OPT_CPPFLAGS += -I$(XROOT)/include 
-+OPT_LDLIBS += -L$(XROOT)/lib
-+
- # Uncomment to enable info banner on holding Ctrl+Alt+I.
- OPT_CPPFLAGS += -DINFOBANNER
- 
-@@ -71,10 +75,10 @@ OPT_CPPFLAGS += -DVWM
+--- evilwm-1.4.3.orig/Makefile	2024-03-09 11:20:46.000000000 +0100
++++ evilwm-1.4.3/Makefile	2025-04-12 11:03:24.427876287 +0200
+@@ -83,10 +83,10 @@ OPT_CPPFLAGS += -DNDEBUG  # disable asse
  # Build tools
  
  # Change this if you don't use gcc:
@@ -24,12 +13,12 @@
  WARN = -Wall -W -Wstrict-prototypes -Wpointer-arith -Wcast-align \
  	-Wshadow -Waggregate-return -Wnested-externs -Winline -Wwrite-strings \
  	-Wundef -Wsign-compare -Wmissing-prototypes -Wredundant-decls
-@@ -89,7 +93,7 @@ WARN = -Wall -W -Wstrict-prototypes -Wpo
+@@ -100,7 +100,7 @@ WARN = -Wall -W -Wstrict-prototypes -Wpo
+ #EXEEXT = .exe
  
- # Override INSTALL_STRIP if you don't want a stripped binary
  INSTALL = install
--INSTALL_STRIP = -s
-+INSTALL_STRIP =
+-STRIP = strip
++STRIP ?= strip
  INSTALL_DIR = $(INSTALL) -d -m 0755
  INSTALL_FILE = $(INSTALL) -m 0644
- INSTALL_PROGRAM = $(INSTALL) -m 0755 $(INSTALL_STRIP)
+ INSTALL_PROGRAM = $(INSTALL) -m 0755
diff --git a/package/evilwm/patches/patch-keymap_h b/package/evilwm/patches/patch-keymap_h
deleted file mode 100644
index 9b8fa0f22..000000000
--- a/package/evilwm/patches/patch-keymap_h
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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_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
- # 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
- #endif
- 
- #endif