[103867] trunk/dports/kde/marble

[nicos at macports.org]

Revision: 103867
          https://trac.macports.org/changeset/103867
Author:   nicos at macports.org
Date:     2013-03-08 22:10:41 -0800 (Fri, 08 Mar 2013)
Log Message:
-----------
marble: solve opportunistic linking and symbol issue (ticket #38330)

Modified Paths:
--------------
    trunk/dports/kde/marble/Portfile

Added Paths:
-----------
    trunk/dports/kde/marble/files/patch-GpsdSymbols.diff

Modified: trunk/dports/kde/marble/Portfile
===================================================================
--- trunk/dports/kde/marble/Portfile	2013-03-09 04:55:20 UTC (rev 103866)
+++ trunk/dports/kde/marble/Portfile	2013-03-09 06:10:41 UTC (rev 103867)
@@ -6,6 +6,7 @@
 
 name                marble
 version             4.10.1
+revision            1
 categories          kde kde4
 maintainers         sharky nicos
 license             LGPL-2.1+ GFDL-1.2
@@ -14,7 +15,6 @@
 homepage            http://www.kde.org
 
 platforms           darwin
-depends_lib-append  port:libkdeedu
 
 master_sites        kde:stable/${version}/src/
 use_xz              yes
@@ -22,8 +22,13 @@
 checksums           rmd160  a044dd8508613db9912a686341226dcd08e296ed \
                     sha256  112d09761052650498e114534312f234b241cf81f2283322f6d55728d27b6c72
 
+depends_lib-append  port:libkdeedu \
+                    port:gpsd
+
+patchfiles-append   patch-GpsdSymbols.diff
+
 if {![variant_isset docs]} {
-    patchfiles      patch-CMakeLists.txt.diff
+    patchfiles-append   patch-CMakeLists.txt.diff
 }
 
 configure.args-append   -DCMAKE_MODULES_INSTALL_PATH=${cmake_share_module_dir}

Added: trunk/dports/kde/marble/files/patch-GpsdSymbols.diff
===================================================================
--- trunk/dports/kde/marble/files/patch-GpsdSymbols.diff	                        (rev 0)
+++ trunk/dports/kde/marble/files/patch-GpsdSymbols.diff	2013-03-09 06:10:41 UTC (rev 103867)
@@ -0,0 +1,11 @@
+--- src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.orig	2013-03-01 15:49:42.000000000 +0900
++++ src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp	2013-03-09 14:38:01.000000000 +0900
+@@ -14,6 +14,8 @@
+ #include "MarbleDebug.h"
+ #include <math.h>
+ 
++#define isnan std::isnan
++
+ using namespace Marble;
+ /* TRANSLATOR Marble::GpsdPositionProviderPlugin */
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130308/12b2da3d/attachment.html>