diff options
Diffstat (limited to 'desktop/icewm')
-rw-r--r-- | desktop/icewm/icewm.SlackBuild | 8 | ||||
-rw-r--r-- | desktop/icewm/icewm.info | 10 | ||||
-rw-r--r-- | desktop/icewm/patches/tweak-default-configs.diff | 47 |
3 files changed, 7 insertions, 58 deletions
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild index 7f8e4c137d..4ed0b42b60 100644 --- a/desktop/icewm/icewm.SlackBuild +++ b/desktop/icewm/icewm.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=icewm -VERSION=${VERSION:-2.3.2} +VERSION=${VERSION:-3.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -79,8 +76,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Tweak default configs for keybindings and power management commands -patch -p1 < $CWD/patches/tweak-default-configs.diff CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -102,6 +97,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true gzip -9 $PKG/usr/man/man1/*.1 +gzip -9 $PKG/usr/man/man5/*.5 # Include some extra configs mkdir -p $PKG/usr/share/icewm diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info index d0675132d3..bc08f9cfca 100644 --- a/desktop/icewm/icewm.info +++ b/desktop/icewm/icewm.info @@ -1,10 +1,10 @@ PRGNAM="icewm" -VERSION="2.3.2" +VERSION="3.6.0" HOMEPAGE="https://ice-wm.org/" -DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/2.3.2/icewm-2.3.2.tar.lz" -MD5SUM="66342eb6b50abe76ce3b905370bb0d50" +DOWNLOAD="https://github.com/ice-wm/icewm/releases/download/3.6.0/icewm-3.6.0.tar.lz" +MD5SUM="25d1868bb79f22cd780268a60e4381ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="imlib2" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" +MAINTAINER="Luna Jernberg" +EMAIL="droidbittin@gmail.com" diff --git a/desktop/icewm/patches/tweak-default-configs.diff b/desktop/icewm/patches/tweak-default-configs.diff deleted file mode 100644 index f772c2a540..0000000000 --- a/desktop/icewm/patches/tweak-default-configs.diff +++ /dev/null @@ -1,47 +0,0 @@ -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 - --key "Super+KP_Subtract" amixer sset Master 5%- --key "Super+KP_Add" amixer sset Master 5%+ -+key "Super+KP_Subtract" pamixer -d 5 -+key "Super+KP_Add" pamixer -i 5 - - # "Multimedia key" bindings for Xorg. Gather the keycodes of your - # advanced function keys by watching the output of the xev command whilest -@@ -22,11 +22,11 @@ - # Note: some of them might have unwanted side effects through concurrency with - # other listeners like systemd for the suspend key events - # --# key "XF86Standby" /bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:" --# key "XF86Sleep" /bin/sh -c "{ test -e /run/systemd/system && systemctl suspend; } ||:" --key "XF86AudioLowerVolume" amixer sset Master 5%- --key "XF86AudioRaiseVolume" amixer sset Master 5%+ --key "XF86AudioMute" amixer sset Master toggle -+# 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-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 __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, "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) |