desktop/vwm: Updated for version 2.1.3, new maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

5 files changed, 116 insertions, 46 deletions

diff --git a/desktop/vwm/patches/paths.diff b/desktop/vwm/patches/paths.diff
new file mode 100644
index 0000000000..486135ebff
--- /dev/null
+++ b/desktop/vwm/patches/paths.diff
@@ -0,0 +1,90 @@
+diff -Naur vwm.orig/Makefile vwm/Makefile
+--- vwm.orig/Makefile	2009-10-20 15:57:55.000000000 -0400
++++ vwm/Makefile	2017-08-25 17:11:58.787940216 -0400
+@@ -8,8 +8,8 @@
+ headerdir = ${prefix}/include
+ includedir = -I${headerdir} -I./
+ bindir = ${prefix}/bin
+-moddir = /usr/lib/vwm/modules
+-moddir_wide = /usr/lib/vwm/modules_wide
++moddir = ${libdir}/vwm/modules
++moddir_wide = ${libdir}/vwm/modules_wide
+ 
+ makefile: all
+ 
+@@ -24,7 +24,7 @@
+ 	gcc $(CFLAGS) $(DEFS) $(WLIBS) $(PKG_CFG) $(includedir) -D_VIPER_WIDE *.c -o vwm_wide
+ 
+ vwm:
+-	gcc $(CFLAGS) $(DEFS) $(LIBS) $(PKG_CFG) $(includdir) *.c -o vwm
++	gcc $(CFLAGS) $(DEFS) $(LIBS) $(PKG_CFG) $(includedir) *.c -o vwm
+ 
+ vwmterm:
+ 	cd modules/vwmterm3 && $(MAKE)
+@@ -45,9 +45,10 @@
+ 	rm -f vwm_wide.h
+ 
+ install:
+-	mkdir -p $(moddir)
++	mkdir -p $(moddir) $(bindir) $(headerdir) $(libdir)
+ 	chmod 644 vwm.h
+ 	cp -f vwm.h $(headerdir)
++	strip vwm
+ 	chmod 755 vwm
+ 	cp -f vwm $(bindir)
+ 	cd modules/vwmterm3 && $(MAKE) install
+diff -Naur vwm.orig/modules/sysmon/Makefile vwm/modules/sysmon/Makefile
+--- vwm.orig/modules/sysmon/Makefile	2009-06-23 14:41:32.000000000 -0400
++++ vwm/modules/sysmon/Makefile	2017-08-25 17:12:41.742937932 -0400
+@@ -4,8 +4,8 @@
+ libdir = ${prefix}/lib
+ includedir = ${prefix}/include -I../..
+ bindir = ${prefix}/bin
+-moddir = /usr/lib/vwm/modules
+-moddir_wide = /usr/lib/vwm/modules_wide
++moddir = ${libdir}/vwm/modules
++moddir_wide = ${libdir}/vwm/modules_wide
+ 
+ makefile: all
+ 
+diff -Naur vwm.orig/modules/vwmterm3/Makefile vwm/modules/vwmterm3/Makefile
+--- vwm.orig/modules/vwmterm3/Makefile	2009-10-20 16:02:05.000000000 -0400
++++ vwm/modules/vwmterm3/Makefile	2017-08-25 17:11:25.953941962 -0400
+@@ -2,11 +2,11 @@
+ PKG_CFG = `pkg-config --cflags glib-2.0 gmodule-2.0`
+ DEFS = -D_REENTRANT -D_GNU_SOURCE
+ prefix = /usr/local
+-libdir = ${prefix}/lib
++libdir = ${prefix}/lib${arch}
+ includedir = -I${prefix}/include -I../..
+ bindir = ${prefix}/bin
+-moddir = /usr/lib/vwm/modules
+-moddir_wide = /usr/lib/vwm/modules_wide
++moddir = ${libdir}/vwm/modules
++moddir_wide = ${libdir}/vwm/modules_wide
+ 
+ makefile: all
+ 
+diff -Naur vwm.orig/vwm.h vwm/vwm.h
+--- vwm.orig/vwm.h	2009-11-04 17:10:01.000000000 -0500
++++ vwm/vwm.h	2017-08-25 17:16:32.528925658 -0400
+@@ -22,11 +22,17 @@
+ #define _VWM_SCREENSAVER_TIMEOUT 5
+ #endif
+ 
++#ifdef __amd64__
++#define LIBDIRSUFFIX "64"
++#else
++#define LIBDIRSUFFIX ""
++#endif
++
+ #ifndef _VWM_SHARED_MODULES
+ #ifdef _VIPER_WIDE
+-#define _VWM_SHARED_MODULES      "/usr/lib/vwm/modules_wide/"
++#define _VWM_SHARED_MODULES      "/usr/lib" LIBDIRSUFFIX "/vwm/modules_wide/"
+ #else
+-#define _VWM_SHARED_MODULES      "/usr/lib/vwm/modules/"
++#define _VWM_SHARED_MODULES      "/usr/lib" LIBDIRSUFFIX "/vwm/modules/"
+ #endif
+ #endif
+ 
diff --git a/desktop/vwm/patches/vterm_static.diff b/desktop/vwm/patches/vterm_static.diff
new file mode 100644
index 0000000000..b3356a17bc
--- /dev/null
+++ b/desktop/vwm/patches/vterm_static.diff
@@ -0,0 +1,26 @@
+diff -Naur vwm.orig/modules/vwmterm3/Makefile vwm/modules/vwmterm3/Makefile
+--- vwm.orig/modules/vwmterm3/Makefile	2009-10-20 16:02:05.000000000 -0400
++++ vwm/modules/vwmterm3/Makefile	2017-08-25 19:55:30.380418408 -0400
+@@ -20,7 +20,7 @@
+ 
+ vwmterm3:
+ 	gcc $(CFLAGS) $(DEFS) $(PKG_CFG) $(includedir) -c -fpic *.c 
+-	gcc $(CFLAGS) -shared -o vwmterm3.so *.o
++	gcc $(CFLAGS) -shared -o vwmterm3.so *.o $(VTERM_A)
+ 
+ vwmterm3_wide:
+ 	gcc $(CFLAGS) $(DEFS) $(PKG_CFG) $(includedir) -D_VIPER_WIDE -c -fpic *.c 
+diff -Naur vwm.orig/modules/vwmterm3/init.c vwm/modules/vwmterm3/init.c
+--- vwm.orig/modules/vwmterm3/init.c	2009-10-30 17:31:44.000000000 -0400
++++ vwm/modules/vwmterm3/init.c	2017-08-25 19:56:03.036416671 -0400
+@@ -36,10 +36,6 @@
+ 	if(g_module_open("libutil.so",G_MODULE_BIND_LAZY)==NULL)
+  		return "\ncould not preload libutil.so";
+ 
+-   // preload libvterm for use with this module
+-   if(g_module_open("libvterm.so",G_MODULE_BIND_LAZY)==NULL)
+-      return "\ncould not preload libvterm.so";
+-
+ 	/*	register with vwm 	*/
+ 	libfilename=(gchar*)g_module_name(module);
+ 	vwm_module_add("Tools","VTerm",vwmterm_init,NULL,libfilename);
diff --git a/desktop/vwm/patches/vwm-2.0.2-Makefile-sysmon.patch b/desktop/vwm/patches/vwm-2.0.2-Makefile-sysmon.patch
deleted file mode 100644
index a77cd3245a..0000000000
--- a/desktop/vwm/patches/vwm-2.0.2-Makefile-sysmon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/sysmon/Makefile.orig	2009-05-22 15:26:39.000000000 +0100
-+++ modules/sysmon/Makefile	2009-05-22 15:27:08.000000000 +0100
-@@ -4,7 +4,7 @@
- libdir = ${prefix}/lib
- includedir = ${prefix}/include -I../..
- bindir = ${prefix}/bin
--moddir = /usr/lib/vwm/modules
-+moddir = ${libdir}/vwm/modules
- 
- makefile: all
- 
diff --git a/desktop/vwm/patches/vwm-2.0.2-Makefile-vwmterm2.patch b/desktop/vwm/patches/vwm-2.0.2-Makefile-vwmterm2.patch
deleted file mode 100644
index 06ef84b2d3..0000000000
--- a/desktop/vwm/patches/vwm-2.0.2-Makefile-vwmterm2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- vwm/modules/vwmterm2/Makefile	2009-04-21 23:55:19.000000000 +0100
-+++ vwm/modules/vwmterm2/Makefile.new	2010-01-19 19:57:52.754821551 +0000
-@@ -2,10 +2,10 @@
- PKG_CFG = `pkg-config --cflags glib-2.0 gmodule-2.0`
- DEFS = -D_REENTRANT -D_GNU_SOURCE
- prefix = /usr/local
--libdir = ${prefix}/lib
-+libdir = ${prefix}/lib${arch}
- includedir = -I${prefix}/include -I../..
- bindir = ${prefix}/bin
--moddir = /usr/lib/vwm/modules
-+moddir = ${libdir}/vwm/modules
- 
- makefile: all
- 
diff --git a/desktop/vwm/patches/vwm-2.0.2-Makefile.patch b/desktop/vwm/patches/vwm-2.0.2-Makefile.patch
deleted file mode 100644
index 7790ed5817..0000000000
--- a/desktop/vwm/patches/vwm-2.0.2-Makefile.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2009-05-22 14:47:31.000000000 +0100
-+++ Makefile	2009-05-22 15:54:30.000000000 +0100
-@@ -8,7 +8,7 @@
- includedir = ${prefix}/include -I./
- bindir = ${prefix}/bin
- headerdir = ${prefix}/include
--moddir = /usr/lib/vwm/modules
-+moddir = ${libdir}/vwm/modules
- 
- makefile: all
- 
-@@ -32,7 +32,7 @@
- 	rm -f vwm
- 
- install:
--	mkdir -p $(moddir)
-+	mkdir -p $(moddir) $(bindir) $(headerdir) $(libdir)
- 	chmod 644 vwm.h
- 	cp -f vwm.h $(headerdir)
- 	chmod 755 vwm