system/imwheel: Build bump.

  Fixed broken ETCDIR so it now points to $PKG/etc.
  Added patch to disable the auto configuration window that
  interfered with workspace switching in fluxbox etc.
  Thanks to David Woodfall.

5 files changed, 55 insertions, 12 deletions

diff --git a/system/imwheel/README b/system/imwheel/README
index d8edb91f76..e0892b04ee 100644
--- a/system/imwheel/README
+++ b/system/imwheel/README
@@ -5,3 +5,13 @@ some servers, such as XFree86.  Utilizing the input from gpm or X  Win-
 dows,  imwheel translates mouse wheel and mouse stick actions into key-
 board events using the XTest extension to X.  Use xdpyinfo for informa-
 tion on the supported extensions in your X server.
+
+This build script has a patch that disables the configurator appearing
+when you mouse up and down on the root window. I did this because it
+stopped the ability for workspace changing in fluxbox and other WMs
+and it would also pop up at the most annoying times ;)
+
+The configurator window can still be found however with the -c switch.
+
+To stop this patch from applying you only need edit the line in the
+slackbuild script.
diff --git a/system/imwheel/imwheel.SlackBuild b/system/imwheel/imwheel.SlackBuild
index 0b2a97f959..2036945601 100644
--- a/system/imwheel/imwheel.SlackBuild
+++ b/system/imwheel/imwheel.SlackBuild
@@ -5,8 +5,6 @@
 # Copyright 2009  David Woodfall <dave@unrealize.co.uk>
 # All rights reserved.
 #
-# aka dive in #slackware on freenode.net
-#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -22,14 +20,12 @@
 # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. FURTHERMORE I AM NOT LIABLE IF
-# YOUR DATA IS DESTROYED, YOUR HOUSE BURNS DOWN OR YOUR DOG RUNS OFF.
-
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=imwheel
 VERSION=${VERSION:-1.0.0pre12}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -56,6 +52,9 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
+
+patch -p1 < $CWD/noautoconfigurator.patch
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -73,8 +72,8 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
-make
-make install DESTDIR=$PKG
+make 
+make install DESTDIR=$PKG ETCDIR=$PKG/etc/X11/imwheel
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
diff --git a/system/imwheel/imwheel.info b/system/imwheel/imwheel.info
index 02d2fcfd78..0e2fd7cdfa 100644
--- a/system/imwheel/imwheel.info
+++ b/system/imwheel/imwheel.info
@@ -6,5 +6,5 @@ MD5SUM="21d81db739ae95d96f9b650f7b826a14"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
-EMAIL="dave@unrealize.co.uk"
+EMAIL="info@davidwoodfall.co.uk"
 APPROVED="Erik Hanson"
diff --git a/system/imwheel/noautoconfigurator.patch b/system/imwheel/noautoconfigurator.patch
new file mode 100644
index 0000000000..932c70eee2
--- /dev/null
+++ b/system/imwheel/noautoconfigurator.patch
@@ -0,0 +1,28 @@
+diff -Naur imwheel-1.0.0pre12-orig/imwheel.c imwheel-1.0.0pre12/imwheel.c
+--- imwheel-1.0.0pre12-orig/imwheel.c	2004-08-29 11:22:03.000000000 +0100
++++ imwheel-1.0.0pre12/imwheel.c	2010-02-26 14:36:08.000000000 +0000
+@@ -586,6 +586,8 @@
+ 				}
+ 				history[HISTORY_LENGTH-1].motion=button;
+ 				history[HISTORY_LENGTH-1].t     =time(NULL);
++
++				// patching this out
+ 				// Configure if in root and toggling wheel
+ 				if(!pointer_window)
+ 				{
+@@ -595,6 +597,7 @@
+ 						if(strcmp(wap->id,"\\(root\\)"))
+ 							continue; //no root action defined!
+ 					}
++/*
+ 					else
+ 					{
+ 						for(j=1,i=0;j&&i<HISTORY_LENGTH;i++)
+@@ -608,6 +611,7 @@
+ 							Printf("No config...\n");
+ 						continue; // No wheel actions needed in root window!
+ 					}
++*/
+ 				}
+ 				else
+ 					wap=findWA(d,button,wname,xch.res_name,xch.res_class,xmk,km);
diff --git a/system/imwheel/slack-desc b/system/imwheel/slack-desc
index 0259d3b9df..6385a5e985 100644
--- a/system/imwheel/slack-desc
+++ b/system/imwheel/slack-desc
@@ -1,6 +1,13 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+ 
        |-----handy-ruler------------------------------------------------------|
 imwheel: imwheel (a mouse wheel and stick interpreter for X Windows)
-imwheel: 
+imwheel:
 imwheel: IMWheel is a universal mouse wheel and mouse stick translator for the
 imwheel: X Windows System. Using either a special version of gpm and 
 imwheel: it's /dev/gpmwheel FIFO, or the support for a ZAxis on the mouse 
@@ -8,6 +15,5 @@ imwheel: built into some servers, such as XFree86. Utilizing the input from
 imwheel: gpm or X Windows, imwheel translates mouse wheel and mouse stick 
 imwheel: actions into keyboard events using the XTest extension to X. Use 
 imwheel: xdpyinfo for information on the supported extensions in your X server
-imwheel: 
+imwheel:
 imwheel: Homepage: http://imwheel.sourceforge.net/
-