diff options
Diffstat (limited to 'desktop/icewm')
| -rw-r--r-- | desktop/icewm/icewm.SlackBuild | 26 | ||||
| -rw-r--r-- | desktop/icewm/icewm.info | 12 | ||||
| -rw-r--r-- | desktop/icewm/patches/tweak-default-configs.diff | 47 | ||||
| -rw-r--r-- | desktop/icewm/xinitrc.icewm | 4 |
4 files changed, 24 insertions, 65 deletions
diff --git a/desktop/icewm/icewm.SlackBuild b/desktop/icewm/icewm.SlackBuild index cde8702d8d..d8ffb3d557 100644 --- a/desktop/icewm/icewm.SlackBuild +++ b/desktop/icewm/icewm.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # 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 @@ -22,26 +22,33 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=icewm -VERSION=${VERSION:-1.6.6} +VERSION=${VERSION:-3.4.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + 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" @@ -69,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" \ @@ -92,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 @@ -119,4 +125,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/desktop/icewm/icewm.info b/desktop/icewm/icewm.info index 396edc52fd..bb750da2b9 100644 --- a/desktop/icewm/icewm.info +++ b/desktop/icewm/icewm.info @@ -1,10 +1,10 @@ PRGNAM="icewm" -VERSION="1.6.6" +VERSION="3.4.7" 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/3.4.7/icewm-3.4.7.tar.lz" +MD5SUM="bbac75194d5d78c5948730c794c90d6b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" +REQUIRES="imlib2" +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 4c51139db0..0000000000 --- a/desktop/icewm/patches/tweak-default-configs.diff +++ /dev/null @@ -1,47 +0,0 @@ -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 -@@ -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" /bin/sh -c "{ sudo /usr/sbin/pm-suspend; } ||:" -+# key "XF86Sleep" /bin/sh -c "{ sudo /usr/sbin/pm-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 @@ - XSV(const char *, logoutCommand, 0) - XSV(const char *, logoutCancelCommand, 0) - #if defined(__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") - #else - XSV(const char *, shutdownCommand, 0) - XSV(const char *, rebootCommand, 0) diff --git a/desktop/icewm/xinitrc.icewm b/desktop/icewm/xinitrc.icewm index f4ca6237ec..1fe33c1389 100644 --- a/desktop/icewm/xinitrc.icewm +++ b/desktop/icewm/xinitrc.icewm @@ -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 |