summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authordholland <dholland@pkgsrc.org>2010-11-13 00:08:55 +0000
committerdholland <dholland@pkgsrc.org>2010-11-13 00:08:55 +0000
commit19fdeade219ab2001d4c1ee0529786fe722e34d8 (patch)
tree572818047b4b2adfe8e7bae3d3df93cf329746c6 /games
parentb31ecdc18f6e9727143e176169115a7bc89c2c18 (diff)
downloadpkgsrc-19fdeade219ab2001d4c1ee0529786fe722e34d8.tar.gz
Fix crash on LP64 platforms, caused by improper mixing of integer types
and no type safety in XtVa[GS]etValues(). PKGREVISION <- 6
Diffstat (limited to 'games')
-rw-r--r--games/xfrisk/Makefile4
-rw-r--r--games/xfrisk/distinfo3
-rw-r--r--games/xfrisk/patches/patch-ae26
3 files changed, 30 insertions, 3 deletions
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index abc4b573302..91c2b298e38 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/05/23 15:14:21 dholland Exp $
+# $NetBSD: Makefile,v 1.24 2010/11/13 00:08:55 dholland Exp $
#
DISTNAME= xfrisk-1.2
-PKGREVISION= 5
+PKGREVISION= 6
CATEGORIES= games
MASTER_SITES= http://www.tuxick.net/xfrisk/files/
diff --git a/games/xfrisk/distinfo b/games/xfrisk/distinfo
index 20fe9d9285e..7da8799a1e9 100644
--- a/games/xfrisk/distinfo
+++ b/games/xfrisk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2009/05/23 15:14:21 dholland Exp $
+$NetBSD: distinfo,v 1.8 2010/11/13 00:08:55 dholland Exp $
SHA1 (xfrisk-1.2.tar.gz) = 2a82c4be95e151fd34f816aaa125f3eb237c28be
RMD160 (xfrisk-1.2.tar.gz) = 7e55be2742bf9b2db40cc10156a6ff615bc37e7a
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = bfaca880c2d88125628d0b724638eb54e27bf96d
SHA1 (patch-ab) = 8c458f0fa7db8e2a032f592b857f4024769cb4f1
SHA1 (patch-ac) = ed2194b764c3d78eedabceb9136814cffcb8f25f
SHA1 (patch-ad) = abd57e121edccbf1f3f78d8f124fbc198722dfcd
+SHA1 (patch-ae) = 173820eabda55fce02fedae4be2d853ba7d5b31f
diff --git a/games/xfrisk/patches/patch-ae b/games/xfrisk/patches/patch-ae
new file mode 100644
index 00000000000..a9c64586435
--- /dev/null
+++ b/games/xfrisk/patches/patch-ae
@@ -0,0 +1,26 @@
+$NetBSD: patch-ae,v 1.1 2010/11/13 00:08:56 dholland Exp $
+
+Fix crash on 64-bit platforms. (Pixel is an X typedef for "long".)
+
+--- registerPlayers.c~ 2000-01-10 22:47:41.000000000 +0000
++++ registerPlayers.c
+@@ -73,8 +73,8 @@ static XtActionsRec actionTable[] =
+ { NULL, NULL }
+ };
+
+-static Int32 piPositionToPlayer[MAX_PLAYERS];
+-static Int32 iSelectColor, iUnselectColor;
++static Pixel piPositionToPlayer[MAX_PLAYERS];
++static Pixel iSelectColor, iUnselectColor;
+ static Cursor normalCursor, handCursor;
+
+ static Widget wRegisterShell, wRegisterForm, wPlayerViewport, wPlayerForm;
+@@ -645,7 +645,7 @@ void REG_RenderSlot(Int32 iSlot, Int32 i
+ ************************************************************************/
+ Flag REG_IsSelected(Int32 iSlot)
+ {
+- Int32 iBorderColor;
++ Pixel iBorderColor;
+
+ /* If out of bounds then call it unselected */
+ if (iSlot<0 || iSlot>=MAX_PLAYERS)