desktop/icewm: Updated for version 2.3.2.

This commit is contained in:
Robby Workman 2021-04-22 23:03:37 -05:00
parent ebf53c5b22
commit 4e2019d72f
4 changed files with 24 additions and 24 deletions

View File

@ -2,7 +2,7 @@
# Slackware build script for icewm
# Copyright 2006-2020 Robby Workman Northport, Alabama, USA
# Copyright 2006-2021, Robby Workman, Tuscaloosa, Alabama, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=icewm
VERSION=${VERSION:-1.6.6}
VERSION=${VERSION:-2.3.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
i?86) ARCH=i486 ;;
i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"

View File

@ -1,10 +1,10 @@
PRGNAM="icewm"
VERSION="1.6.6"
VERSION="2.3.2"
HOMEPAGE="https://ice-wm.org/"
DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/1.6.6/icewm-1.6.6.tar.lz"
MD5SUM="45e772e781a0d71d998367f8f5d8c9b4"
DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/2.3.2/icewm-2.3.2.tar.lz"
MD5SUM="66342eb6b50abe76ce3b905370bb0d50"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
REQUIRES="imlib2"
MAINTAINER="Robby Workman"
EMAIL="rworkman@slackbuilds.org"

View File

@ -1,6 +1,6 @@
diff -Nur icewm-1.6.6.orig/lib/keys.in icewm-1.6.6/lib/keys.in
--- icewm-1.6.6.orig/lib/keys.in 2020-05-29 11:47:00.000000000 -0500
+++ icewm-1.6.6/lib/keys.in 2020-05-30 00:37:31.279645822 -0500
diff -Nur icewm-2.3.2.orig/lib/keys.in icewm-2.3.2/lib/keys.in
--- icewm-2.3.2.orig/lib/keys.in 2021-04-14 18:25:05.000000000 -0500
+++ icewm-2.3.2/lib/keys.in 2021-04-22 22:48:28.552699156 -0500
@@ -12,8 +12,8 @@
key "Alt+Ctrl+b" xdg-open about:blank
key "Alt+Ctrl+s" xdg-open https://www.google.com
@ -21,27 +21,27 @@ diff -Nur icewm-1.6.6.orig/lib/keys.in icewm-1.6.6/lib/keys.in
-key "XF86AudioLowerVolume" amixer sset Master 5%-
-key "XF86AudioRaiseVolume" amixer sset Master 5%+
-key "XF86AudioMute" amixer sset Master toggle
+# key "XF86Standby" /bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
+# key "XF86Sleep" /bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:"
+# key "XF86Standby" loginctl suspend
+# key "XF86Sleep" loginctl suspend
+key "XF86AudioLowerVolume" pamixer -d 5
+key "XF86AudioRaiseVolume" pamixer -i 5
+key "XF86AudioMute" pamixer -t
key "XF86HomePage" xdg-open about:blank
key "XF86Search" xdg-open https://www.google.com
key "XF86Eject" eject
diff -Nur icewm-1.6.6.orig/src/default.h icewm-1.6.6/src/default.h
--- icewm-1.6.6.orig/src/default.h 2020-05-29 11:47:00.000000000 -0500
+++ icewm-1.6.6/src/default.h 2020-05-30 00:38:53.408234561 -0500
@@ -184,9 +184,9 @@
diff -Nur icewm-2.3.2.orig/src/default.h icewm-2.3.2/src/default.h
--- icewm-2.3.2.orig/src/default.h 2021-04-14 18:25:05.000000000 -0500
+++ icewm-2.3.2/src/default.h 2021-04-22 22:50:18.359898408 -0500
@@ -187,9 +187,9 @@
XSV(const char *, logoutCommand, 0)
XSV(const char *, logoutCancelCommand, 0)
#if defined(__linux__)
#if __linux__
-XSV(const char *, shutdownCommand, "test -e /run/systemd/system && systemctl poweroff")
-XSV(const char *, rebootCommand, "test -e /run/systemd/system && systemctl reboot")
-XSV(const char *, suspendCommand, "test -e /run/systemd/system && systemctl suspend")
+XSV(const char *, shutdownCommand, "sudo /sbin/halt")
+XSV(const char *, rebootCommand, "sudo /sbin/reboot")
+XSV(const char *, suspendCommand, "sudo /usr/sbin/pm-suspend")
+XSV(const char *, shutdownCommand, "test -e /run/elogind/users && loginctl poweroff")
+XSV(const char *, rebootCommand, "test -e /run/elogind/users && loginctl reboot")
+XSV(const char *, suspendCommand, "test -e /run/elogind/users && loginctl suspend")
#else
XSV(const char *, shutdownCommand, 0)
XSV(const char *, rebootCommand, 0)

View File

@ -23,8 +23,8 @@ done
icewmbg &
icewmtray &
if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
ck-launch-session dbus-launch --exit-with-session icewm-session
if [ -z "$DESKTOP_SESSION" ]; then
dbus-launch --exit-with-session icewm-session
else
exec icewm-session
fi