From: Hugo Villeneuve <hugo@hugovil.com>
Date: Wed, 26 Nov 2014 01:49:29 +0000 (-0500)
Subject: Add autostart file for WindowMaker
X-Git-Url: http://gitweb.hugovil.com/?a=commitdiff_plain;h=44eadbc908f4895d1a7cd28de1139283b4f9f1e6;p=hvlinux.git

Add autostart file for WindowMaker

Upgrade to WindowMaker-0.95.6.
---

diff --git a/config/packages-list b/config/packages-list
index 95875f2..caf8406 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -415,7 +415,7 @@ VTE="vte-0.28.2"
 WEBKIT="webkit-1.8.3"
 WGET="wget-1.14"
 WHICH="which-2.20"
-WINDOWMAKER="WindowMaker-0.95.5"
+WINDOWMAKER="WindowMaker-0.95.6"
 WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
 WIRELESS_TOOLS="wireless_tools.29"
 WMNOTIFY="wmnotify-1.0.1"
diff --git a/stage4/misc/WindowMaker/autostart b/stage4/misc/WindowMaker/autostart
new file mode 100644
index 0000000..cfe2966
--- /dev/null
+++ b/stage4/misc/WindowMaker/autostart
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+xscreensaver -no-splash &
diff --git a/stage4/patches/common/WindowMaker-0.95.5-remove-inexistent-icons-path.patch b/stage4/patches/common/WindowMaker-0.95.5-remove-inexistent-icons-path.patch
deleted file mode 100644
index 6f3e13a..0000000
--- a/stage4/patches/common/WindowMaker-0.95.5-remove-inexistent-icons-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur WindowMaker-0.95.4.orig/WindowMaker/Defaults/WindowMaker.in WindowMaker-0.95.4.new/WindowMaker/Defaults/WindowMaker.in
---- WindowMaker-0.95.4.orig/WindowMaker/Defaults/WindowMaker.in	2013-01-09 16:42:39.000000000 -0500
-+++ WindowMaker-0.95.4.new/WindowMaker/Defaults/WindowMaker.in	2013-06-01 12:14:57.943106756 -0400
-@@ -12,11 +12,9 @@
-     "~/GNUstep/Library/Icons",
-     "#pkgdatadir#/Icons",
-     "#pkgdatadir#/Pixmaps",
--    "/usr/include/X11/pixmaps",
-     "~/GNUstep/Library/WindowMaker/Pixmaps",
-     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-     "/usr/share/icons",
--    "/usr/local/share/pixmaps",
-     "/usr/share/pixmaps"
-   );
-   PixmapPath = (
-@@ -25,8 +23,6 @@
-     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-     "#pkgdatadir#/Pixmaps",
-     "#pkgdatadir#/Backgrounds",
--    "/usr/include/X11/pixmaps",
--    "/usr/local/share/pixmaps",
-     "/usr/share/pixmaps"
-   );
-   WindowTitleBalloons = YES;
diff --git a/stage4/patches/common/WindowMaker-0.95.6-remove-inexistent-icons-path.patch b/stage4/patches/common/WindowMaker-0.95.6-remove-inexistent-icons-path.patch
new file mode 100644
index 0000000..6f3e13a
--- /dev/null
+++ b/stage4/patches/common/WindowMaker-0.95.6-remove-inexistent-icons-path.patch
@@ -0,0 +1,24 @@
+diff -Naur WindowMaker-0.95.4.orig/WindowMaker/Defaults/WindowMaker.in WindowMaker-0.95.4.new/WindowMaker/Defaults/WindowMaker.in
+--- WindowMaker-0.95.4.orig/WindowMaker/Defaults/WindowMaker.in	2013-01-09 16:42:39.000000000 -0500
++++ WindowMaker-0.95.4.new/WindowMaker/Defaults/WindowMaker.in	2013-06-01 12:14:57.943106756 -0400
+@@ -12,11 +12,9 @@
+     "~/GNUstep/Library/Icons",
+     "#pkgdatadir#/Icons",
+     "#pkgdatadir#/Pixmaps",
+-    "/usr/include/X11/pixmaps",
+     "~/GNUstep/Library/WindowMaker/Pixmaps",
+     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
+     "/usr/share/icons",
+-    "/usr/local/share/pixmaps",
+     "/usr/share/pixmaps"
+   );
+   PixmapPath = (
+@@ -25,8 +23,6 @@
+     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
+     "#pkgdatadir#/Pixmaps",
+     "#pkgdatadir#/Backgrounds",
+-    "/usr/include/X11/pixmaps",
+-    "/usr/local/share/pixmaps",
+     "/usr/share/pixmaps"
+   );
+   WindowTitleBalloons = YES;
diff --git a/stage4/pkg/WindowMaker b/stage4/pkg/WindowMaker
index d5b0e2c..572a2a4 100644
--- a/stage4/pkg/WindowMaker
+++ b/stage4/pkg/WindowMaker
@@ -6,4 +6,6 @@ hvbuild_post()
     var_export   "GNUSTEP_USER_ROOT" /etc/profile
 
     mkdir -p /etc/skel/.GNUstep/{Defaults,Library/WindowMaker}
+
+    install -v -m744 ${SCRDIR}/misc/WindowMaker/autostart /etc/skel/.GNUstep/Library/WindowMaker
 }