From 32eaedf730723796ee833bad67618cc0c24acef8 Mon Sep 17 00:00:00 2001 From: Mason Loring Bliss Date: Wed, 3 Feb 2016 22:34:50 -0600 Subject: desktop/wmctrl: Fix for x86_64 Signed-off-by: Robby Workman --- desktop/wmctrl/patch-64bit.diff | 12 ++++++++++++ desktop/wmctrl/wmctrl.SlackBuild | 5 ++++- desktop/wmctrl/wmctrl.info | 4 ++-- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 desktop/wmctrl/patch-64bit.diff diff --git a/desktop/wmctrl/patch-64bit.diff b/desktop/wmctrl/patch-64bit.diff new file mode 100644 index 0000000000..4af039d3cd --- /dev/null +++ b/desktop/wmctrl/patch-64bit.diff @@ -0,0 +1,12 @@ +--- main.c.orig 2005-01-29 03:31:33.000000000 +0000 ++++ main.c 2010-12-20 11:09:11.000000000 +0000 +@@ -1441,6 +1441,9 @@ + + /* null terminate the result to make string handling easier */ + tmp_size = (ret_format / 8) * ret_nitems; ++ /* Correct 64 Architecture implementation of 32 bit data */ ++ if (ret_format == 32) ++ tmp_size *= sizeof(long)/4; + ret = g_malloc(tmp_size + 1); + memcpy(ret, ret_prop, tmp_size); + ret[tmp_size] = '\0'; diff --git a/desktop/wmctrl/wmctrl.SlackBuild b/desktop/wmctrl/wmctrl.SlackBuild index 3e628d93cb..0b88252f8c 100644 --- a/desktop/wmctrl/wmctrl.SlackBuild +++ b/desktop/wmctrl/wmctrl.SlackBuild @@ -3,11 +3,12 @@ # Slackware build script for wmctrl # Written by Vasilis Papavasileiou # Modified by the SlackBuilds.org project +# Modified by Mason Loring Bliss. # (assumed to be public domain per our submission policy) PRGNAM=wmctrl VERSION=1.07 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -62,6 +63,8 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux +patch -p0 < $CWD/patch-64bit.diff + make make install DESTDIR=$PKG diff --git a/desktop/wmctrl/wmctrl.info b/desktop/wmctrl/wmctrl.info index ed0858cf3c..facf6772c1 100644 --- a/desktop/wmctrl/wmctrl.info +++ b/desktop/wmctrl/wmctrl.info @@ -6,5 +6,5 @@ MD5SUM="1fe3c7a2caa6071e071ba34f587e1555" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Vasilis Papavasileiou" -EMAIL="el03020@mail.ntua.gr" +MAINTAINER="Mason Loring Bliss" +EMAIL="mason@blisses.org" -- cgit v1.2.3