From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Apr 19 07:00:21 2011 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 C22C31065674 for ; Tue, 19 Apr 2011 07:00:21 +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 217F18FC18 for ; Tue, 19 Apr 2011 07:00:20 +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 p3J70JYg085655 for ; Tue, 19 Apr 2011 07:00:19 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p3J70Jo1085654; Tue, 19 Apr 2011 07:00:19 GMT (envelope-from gnats) Resent-Date: Tue, 19 Apr 2011 07:00:19 GMT Resent-Message-Id: <201104190700.p3J70Jo1085654@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, Christoph Moench-Tegeder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7736E106566C for ; Tue, 19 Apr 2011 06:52:26 +0000 (UTC) (envelope-from cmt@reindeer.exwg.net) Received: from smtp.burggraben.net (ns.exwg.net [88.198.69.35]) by mx1.freebsd.org (Postfix) with ESMTP id 22DFE8FC13 for ; Tue, 19 Apr 2011 06:52:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id 216A56002ED for ; Tue, 19 Apr 2011 08:44:21 +0200 (CEST) Received: from smtp.burggraben.net ([127.0.0.1]) by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZRHLRH+xL6zg for ; Tue, 19 Apr 2011 08:44:20 +0200 (CEST) Received: from reindeer.exwg.net (port-92-198-130-130.static.qsc.de [92.198.130.130]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "reindeer.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK)) by smtp.burggraben.net (Postfix) with ESMTPS for ; Tue, 19 Apr 2011 08:44:20 +0200 (CEST) Received: by reindeer.exwg.net (Postfix, from userid 1000) id C569BA1029; Tue, 19 Apr 2011 08:44:19 +0200 (CEST) Message-Id: <20110419064419.C569BA1029@reindeer.exwg.net> Date: Tue, 19 Apr 2011 08:44:19 +0200 (CEST) From: Christoph Moench-Tegeder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/156489: [PATCH] fix build of astro/qlandkartegt with astro/gpsd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christoph Moench-Tegeder List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Apr 2011 07:00:21 -0000 >Number: 156489 >Category: ports >Synopsis: [PATCH] fix build of astro/qlandkartegt with astro/gpsd >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Apr 19 07:00:19 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Christoph Moench-Tegeder >Release: FreeBSD 8.2-RELEASE amd64 >Organization: >Environment: System: FreeBSD reindeer.exwg.net 8.2-RELEASE FreeBSD 8.2-RELEASE #7: Thu Feb 17 09:12:56 CET 2011 cmt@reindeer.exwg.net:/usr/obj/usr/src/sys/CMT amd64 astro/qlandkartegt qlandkartegt-1.1.1 astro/gpsd gpsd-2.96 >Description: The libgps API changed (i.e. deprecated functions where finally removed) in gpsd 2.90 (as of their documentation), which causes the build of astro/qlandkartegt to fail with: [ 59%] Building CXX object src/CMakeFiles/qlandkartegt.dir/CDBus.cpp.o /usr/local/include/gps.h: In member function 'virtual void CGPSDThread::run()': /usr/local/include/gps.h:1431: error: too few arguments to function 'int gps_open(const char*, const char*, gps_data_t*)' /usr/ports/astro/qlandkartegt/work/qlandkartegt-1.1.1/src/CDeviceGPSD.cpp:152: error: at this point in file /usr/ports/astro/qlandkartegt/work/qlandkartegt-1.1.1/src/CDeviceGPSD.cpp:190: error: 'gps_poll' was not declared in this scope >How-To-Repeat: Install astro/gpsd, then try to build astro/qlandkartegt. >Fix: The following patch fixes the API as described in http://gpsd.berlios.de/protocol-transition.html . I submitted that patch to the qlandkartegt-users mailing list last week, but got no response yet http://sourceforge.net/mailarchive/forum.php?thread_name=20110411185343.GB1916%40elch.exwg.net&forum_name=qlandkartegt-users diff -Nru astro/qlandkartegt.orig/files/patch-src-CDeviceGPSD.cpp astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp --- astro/qlandkartegt.orig/files/patch-src-CDeviceGPSD.cpp 1970-01-01 01:00:00.000000000 +0100 +++ astro/qlandkartegt/files/patch-src-CDeviceGPSD.cpp 2011-04-19 08:24:35.000000000 +0200 @@ -0,0 +1,47 @@ +Index: src/CDeviceGPSD.cpp +=================================================================== +--- src/CDeviceGPSD.cpp (revision 2719) ++++ src/CDeviceGPSD.cpp (working copy) +@@ -138,6 +138,7 @@ + log_mutex( new QMutex() ), + pipe_fd( _pipe_fd ) + { ++ gpsdata = NULL; + } + + +@@ -149,7 +150,14 @@ + + void CGPSDThread::run() + { ++#if GPSD_API_MAJOR_VERSION >= 5 ++ int socket; ++ ++ if( gpsdata = new gps_data_t ) ++ socket = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata ); ++#else + gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT ); ++#endif + if( !gpsdata ) + { + // TODO: message box (from other thread) +@@ -187,13 +195,20 @@ + } // if + else if( FD_ISSET( gpsdata->gps_fd, &fds ) ) + { ++#if GPSD_API_MAJOR_VERSION >= 5 ++ gps_read( gpsdata ); ++#else + gps_poll( gpsdata ); ++#endif + if( !decodeData() ) break; + } // else if + } // else if + } // while + + gps_close( gpsdata ); ++#if GPSD_API_MAJOR_VERSION >= 5 ++ delete gpsdata; ++#endif + qDebug() << "thread done"; + } Regards, Christoph >Release-Note: >Audit-Trail: >Unformatted: