From owner-svn-ports-all@FreeBSD.ORG Sun Mar 16 07:03:45 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D715DD8; Sun, 16 Mar 2014 07:03:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 670CC88A; Sun, 16 Mar 2014 07:03:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2G73jUu022781; Sun, 16 Mar 2014 07:03:45 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2G73jHs022779; Sun, 16 Mar 2014 07:03:45 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201403160703.s2G73jHs022779@svn.freebsd.org> From: Kubilay Kocak Date: Sun, 16 Mar 2014 07:03:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348393 - in head/games/live-f1: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Mar 2014 07:03:45 -0000 Author: koobs Date: Sun Mar 16 07:03:44 2014 New Revision: 348393 URL: http://svnweb.freebsd.org/changeset/ports/348393 QAT: https://qat.redports.org/buildarchive/r348393/ Log: games/live-f1: Backport fix for missing sector times and weather - Backport revision 114 [1] for issue 1292481 [2] that fixes "M-b~" characters in the sector time fields and removes the weather section who's data is no longer provided on the free FOM feed. - Use new LIB_DEPENDS convention [1] http://bazaar.launchpad.net/~davepusey/live-f1/live-f1/revision/114 [2] https://bugs.launchpad.net/live-f1/+bug/1292481 Added: head/games/live-f1/files/ head/games/live-f1/files/patch-issue-1292481 (contents, props changed) Modified: head/games/live-f1/Makefile Modified: head/games/live-f1/Makefile ============================================================================== --- head/games/live-f1/Makefile Sun Mar 16 06:49:21 2014 (r348392) +++ head/games/live-f1/Makefile Sun Mar 16 07:03:44 2014 (r348393) @@ -3,6 +3,7 @@ PORTNAME= live-f1 PORTVERSION= 0.2.11 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/ EXTRACT_SUFX= .tgz @@ -12,7 +13,7 @@ COMMENT= Native client for the official LICENSE= GPLv2 -LIB_DEPENDS= neon:${PORTSDIR}/www/neon29 +LIB_DEPENDS= libneon.so:${PORTSDIR}/www/neon29 WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} Added: head/games/live-f1/files/patch-issue-1292481 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/live-f1/files/patch-issue-1292481 Sun Mar 16 07:03:44 2014 (r348393) @@ -0,0 +1,72 @@ +# Backport fix for missing sector time data +# Issue: https://bugs.launchpad.net/live-f1/+bug/1292481 +# Changeset: http://bazaar.launchpad.net/~davepusey/live-f1/live-f1/revision/114 + +=== modified file 'src/display.c' (properties changed: -x to +x) +--- src/display.c 2014-03-15 09:32:53 +0000 ++++ src/display.c 2014-03-15 10:39:36 +0000 +@@ -247,10 +247,10 @@ + int car, + int type) + { +- int y, x, sz, align, attr; +- CarAtom *atom; +- const char *text; +- size_t len, pad; ++ int y, x, sz, align, attr; ++ CarAtom *atom; ++ unsigned const char *text; ++ size_t len, pad; + + y = state->car_position[car - 1]; + if (! y) +@@ -415,17 +415,17 @@ + break; + case QUALIFYING_SECTOR_1: + x = 48; +- sz = 5; ++ sz = 3; + align = 1; + break; + case QUALIFYING_SECTOR_2: + x = 54; +- sz = 5; ++ sz = 3; + align = 1; + break; + case QUALIFYING_SECTOR_3: + x = 60; +- sz = 5; ++ sz = 3; + align = 1; + break; + case QUALIFYING_LAP: +@@ -444,6 +444,9 @@ + atom = &state->car_info[car - 1][type]; + attr = attrs[atom->data]; + text = atom->text; ++ ++ if (text[0] == 0xE2) text = "*"; ++ + len = strlen ((const char *) text); + + /* Check for over-long atoms */ +@@ -646,7 +649,7 @@ + } + + /* Display weather */ +- ++/* + int wline = 5; + wattrset (statwin, attrs[COLOUR_DATA]); + +@@ -698,7 +701,7 @@ + wprintw(statwin, "%-2s%6dmb", "", state->pressure); + wmove (statwin, wline, 6); + waddch (statwin, '.'); +- ++*/ + /* Update fastest lap line (race only) */ + + if (state->event_type == RACE_EVENT) +