From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 7 10:30:06 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BC341065678 for ; Sat, 7 Aug 2010 10:30:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 598288FC12 for ; Sat, 7 Aug 2010 10:30:06 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o77AU6Aq000679 for ; Sat, 7 Aug 2010 10:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o77AU6Zi000678; Sat, 7 Aug 2010 10:30:06 GMT (envelope-from gnats) Resent-Date: Sat, 7 Aug 2010 10:30:06 GMT Resent-Message-Id: <201008071030.o77AU6Zi000678@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gennady Proskurin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1A0981065679 for ; Sat, 7 Aug 2010 10:25:05 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 091448FC08 for ; Sat, 7 Aug 2010 10:25:05 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o77AP4Q4073530 for ; Sat, 7 Aug 2010 10:25:04 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o77AP42t073529; Sat, 7 Aug 2010 10:25:04 GMT (envelope-from nobody) Message-Id: <201008071025.o77AP42t073529@www.freebsd.org> Date: Sat, 7 Aug 2010 10:25:04 GMT From: Gennady Proskurin To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/149394: games/magiccube4d - make it usable on 64-bit arch X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2010 10:30:06 -0000 >Number: 149394 >Category: ports >Synopsis: games/magiccube4d - make it usable on 64-bit arch >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sat Aug 07 10:30:05 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Gennady Proskurin >Release: 9.0-CURRENT amd64 >Organization: >Environment: FreeBSD gpr.nnz-home.ru 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r209892M: Sun Jul 11 15:04:28 MSD 2010 gpr@gpr.nnz-home.ru:/usr/obj/usr/src/freebsd-head/sys/GPR amd64 >Description: games/magiccube4d converts from pointer to int which causes compiler errors on architectures with 64-bit pointers. Attached patch fixes the problem and make port usable. Probably some other bugs exist, sometimes I see message "WARNING: some of the twists look like garbage (sorry).", usually during auto-solving. For now, I see no impact on application by this. >How-To-Repeat: >Fix: Apply attached patch in games/magiccube4d directory. Patch attached with submission follows: diff --git Makefile Makefile index 5ecddf8..5fb567d 100644 --- Makefile +++ Makefile @@ -22,10 +22,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-src-${PORTVERSION:S/./_/} DOCS= ChangeLog Intro.txt MagicCube4D-unix.txt \ ideas.txt readme-unix.txt -post-patch: - @${REINPLACE_CMD} -e 's/stickers)()/stickers)(0)/' \ - ${WRKSRC}/EventHandler.cpp - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/magiccube4d ${PREFIX}/bin .if !defined(NOPORTDOCS) @@ -37,10 +33,4 @@ do-install: .include -.if ${OSVERSION} >= 700042 -.if ${ARCH} == "amd64" || ${ARCH} == "sparc64" -BROKEN= Does not compile with GCC 4.2 -.endif -.endif - .include diff --git files/patch-EventHandler.cpp files/patch-EventHandler.cpp new file mode 100644 index 0000000..057e0a9 --- /dev/null +++ files/patch-EventHandler.cpp @@ -0,0 +1,65 @@ +diff --git EventHandler.cpp EventHandler.cpp +index 398fcb7..f5fe00a 100644 +--- EventHandler.cpp ++++ EventHandler.cpp +@@ -31,6 +31,9 @@ DESCRIPTION: + #include "MacroManager.h" + #include "PostScriptWriter.h" + ++#include ++static intptr_t ptr2int(const void* p) { return reinterpret_cast(p); } ++ + float const EventHandler::DEF_TWIST_INCREMENT = 0.5; + + EventHandler::EventHandler(int argc, char **argv, char const* machine_type) : +@@ -326,7 +329,7 @@ EventHandler::getAReferenceSticker(Event *event, void *) + number_of_reference_stickers_needed--; + reference_stickers_needed++; + if (number_of_reference_stickers_needed == 0) +- (this->*what_to_do_after_got_reference_stickers)(); ++ (this->*what_to_do_after_got_reference_stickers)(NULL); + } + } + +@@ -415,7 +418,7 @@ EventHandler::buttonDown_handler(Event *event, void *arg) + void + EventHandler::undo_cb(void* argp) + { +- int arg = (int) argp; ++ int arg = ptr2int(argp); + struct stickerspec grip; + int dir; + int slicesmask; +@@ -461,7 +464,7 @@ EventHandler::undo_cb(void* argp) + void + EventHandler::redo_cb(void* argp) + { +- int arg = (int) argp; ++ int arg = ptr2int(argp); + struct stickerspec grip; + int dir; + int slicesmask; +@@ -507,7 +510,7 @@ EventHandler::redo_cb(void* argp) + void + EventHandler::scramble_cb(void *arg = NULL) + { +- int n = (int)arg; ++ int n = ptr2int(arg); + struct stickerspec grip; + int i, previous_face = -1; + int ngrips = NFACES * 3 * 3 * 3; +@@ -855,12 +858,12 @@ EventHandler::toggleFast_cb(void *) + void + EventHandler::newPuzzle_cb(void* arg) + { +- if ((int)arg == preferences.getLength()) ++ if (ptr2int(arg) == preferences.getLength()) + { + reset_cb(0); + return; + } +- preferences.setLength((int)arg); ++ preferences.setLength(ptr2int(arg)); + int length = preferences.getLength(); + + polymgr->reset(length); >Release-Note: >Audit-Trail: >Unformatted: