diff options
Diffstat (limited to 'source/xap/windowmaker')
-rwxr-xr-x | source/xap/windowmaker/windowmaker.SlackBuild | 7 | ||||
-rw-r--r-- | source/xap/windowmaker/windowmaker.url | 2 | ||||
-rw-r--r-- | source/xap/windowmaker/wmaker.inst.diff | 46 |
3 files changed, 4 insertions, 51 deletions
diff --git a/source/xap/windowmaker/windowmaker.SlackBuild b/source/xap/windowmaker/windowmaker.SlackBuild index b18507211..71f76c59d 100755 --- a/source/xap/windowmaker/windowmaker.SlackBuild +++ b/source/xap/windowmaker/windowmaker.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2015, 2018, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=windowmaker VERSION=${VERSION:-$(echo WindowMaker-0*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -78,9 +78,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# This should be non-interactive where possible. -zcat $CWD/wmaker.inst.diff.gz | patch -p1 --verbose || exit 1 - # Get rid of OpenSUSE menu: zcat $CWD/WindowMaker.noopensusemenu.diff.gz | patch -p1 --verbose || exit 1 diff --git a/source/xap/windowmaker/windowmaker.url b/source/xap/windowmaker/windowmaker.url new file mode 100644 index 000000000..eb7d4fdd1 --- /dev/null +++ b/source/xap/windowmaker/windowmaker.url @@ -0,0 +1,2 @@ +https://github.com/window-maker/wmaker +https://github.com/window-maker/wmaker/releases/download/wmaker-0.96.0/WindowMaker-0.96.0.tar.gz diff --git a/source/xap/windowmaker/wmaker.inst.diff b/source/xap/windowmaker/wmaker.inst.diff deleted file mode 100644 index 3fdfe6431..000000000 --- a/source/xap/windowmaker/wmaker.inst.diff +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nur WindowMaker-0.95.2.orig/util/wmaker.inst.in WindowMaker-0.95.2/util/wmaker.inst.in ---- WindowMaker-0.95.2.orig/util/wmaker.inst.in 2012-02-14 13:36:01.000000000 -0600 -+++ WindowMaker-0.95.2/util/wmaker.inst.in 2012-02-14 18:25:28.213206250 -0600 -@@ -33,20 +33,7 @@ - - make_script() { - ISCRIPT="$1" -- -- cat << EOF >> "$ISCRIPT" --# Window Maker default X session startup script -- --PATH="\$PATH:$BINDIR" -- --# If you login from xdm, uncomment this to make error messages appear --# in the console window. --# --# tail -f "$HOME"/.xsession-errors > /dev/console & -- --exec wmaker -- --EOF -+ cat /etc/X11/xinit/xinitrc.wmaker >> $ISCRIPT - chmod +rx "$ISCRIPT" - } - -@@ -298,19 +285,7 @@ - - trap "show_end_message;exit" 2 - --echo --echo "Now the .xinitrc, .Xclients or .xsession script must be updated so that" --echo "it calls wmaker when you start an X session." --echo "Type the name of the file that must be changed (normally .xinitrc)." --echo "If the file already exists, it will be backed up with a .old.$DATE " --echo "extension" --echo "If you want to edit it by hand, hit <Control>-C now." --read file -- --if test "x$file" = "x"; then -- echo "Using .xinitrc as a default value" -- file=.xinitrc --fi -+file=.xinitrc - - if [ -f "$USERDIR/$file" ]; then - mv "$USERDIR/$file" "$USERDIR/$file.old.$DATE" |