summaryrefslogtreecommitdiffstats
path: root/desktop/evilwm
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/evilwm')
-rw-r--r--desktop/evilwm/doinst.sh3
-rw-r--r--desktop/evilwm/evilwm.SlackBuild14
-rw-r--r--desktop/evilwm/evilwm.info10
-rw-r--r--desktop/evilwm/fix-undef-soliddrag.patch76
4 files changed, 93 insertions, 10 deletions
diff --git a/desktop/evilwm/doinst.sh b/desktop/evilwm/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/desktop/evilwm/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/desktop/evilwm/evilwm.SlackBuild b/desktop/evilwm/evilwm.SlackBuild
index 806d2b6796..c1621bf153 100644
--- a/desktop/evilwm/evilwm.SlackBuild
+++ b/desktop/evilwm/evilwm.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for evilwm
-# Copyright 2013 Marek Buras Silesia,Poland
+# Copyright 2023 spaceman
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,8 +25,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=evilwm
-VERSION=${VERSION:-1.1.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-1.4.3}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -79,7 +79,10 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-sed -ie "s/^CFLAGS = .*/CFLAGS = $SLKCFLAGS/" Makefile
+patch -p1 < "$CWD/fix-undef-soliddrag.patch" || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+./configure
make
make install DESTDIR=$PKG
@@ -93,12 +96,13 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- ChangeLog INSTALL README TODO doc/standards.html \
+ ChangeLog INSTALL README TODO \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
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
diff --git a/desktop/evilwm/evilwm.info b/desktop/evilwm/evilwm.info
index 7f9a0b644b..312b1e8619 100644
--- a/desktop/evilwm/evilwm.info
+++ b/desktop/evilwm/evilwm.info
@@ -1,10 +1,10 @@
PRGNAM="evilwm"
-VERSION="1.1.1"
+VERSION="1.4.3"
HOMEPAGE="http://www.6809.org.uk/evilwm/"
-DOWNLOAD="http://www.6809.org.uk/evilwm/evilwm-1.1.1.tar.gz"
-MD5SUM="fbd6a9bdfe90e51832fce48c5038714b"
+DOWNLOAD="https://www.6809.org.uk/evilwm/dl/evilwm-1.4.3.tar.gz"
+MD5SUM="c8a8641fb53f03542bb2de4d55dd6933"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Marek Buras"
-EMAIL="cyfr0n@onet.pl"
+MAINTAINER="spaceman"
+EMAIL="spaceman@antispaceman.com"
diff --git a/desktop/evilwm/fix-undef-soliddrag.patch b/desktop/evilwm/fix-undef-soliddrag.patch
new file mode 100644
index 0000000000..de7f97ba44
--- /dev/null
+++ b/desktop/evilwm/fix-undef-soliddrag.patch
@@ -0,0 +1,76 @@
+diff --git a/ChangeLog b/ChangeLog
+index 8c31b4d..0127038 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,5 @@
++ * Fix compilation with SOLIDDRAG undefined [jake]
++
+ Version 1.4.3, Sat Mar 9 2024
+
+ * Force dock windows to have _NET_WM_STATE_FOCUSED
+diff --git a/client_move.c b/client_move.c
+index 1dacd6e..3c7140a 100644
+--- a/client_move.c
++++ b/client_move.c
+@@ -230,7 +230,7 @@ void client_move_drag(struct client *c, unsigned button) {
+ #ifdef INFOBANNER_MOVERESIZE
+ create_info_window(c);
+ #endif
+- if (option.no_solid_drag) {
++ if (OPTION_NO_SOLID_DRAG) {
+ XGrabServer(display.dpy);
+ draw_outline(c); // draw
+ }
+@@ -242,7 +242,7 @@ void client_move_drag(struct client *c, unsigned button) {
+ case MotionNotify:
+ if (ev.xmotion.root != c->screen->root)
+ break;
+- if (option.no_solid_drag) {
++ if (OPTION_NO_SOLID_DRAG) {
+ draw_outline(c); // erase
+ XUngrabServer(display.dpy);
+ }
+@@ -254,7 +254,7 @@ void client_move_drag(struct client *c, unsigned button) {
+ #ifdef INFOBANNER_MOVERESIZE
+ update_info_window(c);
+ #endif
+- if (option.no_solid_drag) {
++ if (OPTION_NO_SOLID_DRAG) {
+ XSync(display.dpy, False);
+ XGrabServer(display.dpy);
+ draw_outline(c); // draw
+@@ -269,7 +269,7 @@ void client_move_drag(struct client *c, unsigned button) {
+ case ButtonRelease:
+ if (ev.xbutton.button != button)
+ continue;
+- if (option.no_solid_drag) {
++ if (OPTION_NO_SOLID_DRAG) {
+ draw_outline(c); // erase
+ XUngrabServer(display.dpy);
+ }
+@@ -277,7 +277,7 @@ void client_move_drag(struct client *c, unsigned button) {
+ remove_info_window();
+ #endif
+ XUngrabPointer(display.dpy, CurrentTime);
+- if (option.no_solid_drag) {
++ if (OPTION_NO_SOLID_DRAG) {
+ // For solid drags, the client was
+ // moved with the mouse. For non-solid
+ // drags, we need a final move/raise:
+diff --git a/evilwm.h b/evilwm.h
+index e46cb78..7f2aedf 100644
+--- a/evilwm.h
++++ b/evilwm.h
+@@ -52,8 +52,10 @@ struct options {
+
+ extern struct options option;
+
+-#ifndef SOLIDDRAG
+-# define option.no_solid_drag 1
++#ifdef SOLIDDRAG
++# define OPTION_NO_SOLID_DRAG (option.no_solid_drag)
++#else
++# define OPTION_NO_SOLID_DRAG (1)
+ #endif
+
+ extern unsigned numlockmask;