File OpenCPN_grib_pi.devel-include.patch of Package OpenCPN_grib_pi

Overview Repositories Revisions Requests Users Attributes Meta

File OpenCPN_grib_pi.devel-include.patch of Package OpenCPN_grib_pi (Revision e25383fd70b1af23a2b1430ae06be0b4)

Currently displaying revision e25383fd70b1af23a2b1430ae06be0b4 , Show latest

diff -Pdpru grib_pi.orig/CMakeLists.txt grib_pi/CMakeLists.txt
--- grib_pi.orig/CMakeLists.txt	2013-07-08 21:19:57.096021284 +0200
+++ grib_pi/CMakeLists.txt	2013-07-08 21:38:21.261466618 +0200
@@ -65,11 +65,12 @@ IF(NOT DEFINED wxWidgets_USE_FILE)
   FIND_PACKAGE(wxWidgets REQUIRED)
 ENDIF(NOT DEFINED wxWidgets_USE_FILE)
 
+FIND_PACKAGE(wxWidgets REQUIRED)
   INCLUDE(${wxWidgets_USE_FILE})
 
 FIND_PACKAGE(Gettext REQUIRED)
 
-# For convenience we define the sources as a variable. You can add 
+# For convenience we define the sources as a variable. You can add
 # header files and cpp/c files and CMake will sort them out
 
 
@@ -84,19 +85,15 @@ SET(SRC_GRIB
             src/GribUIDialog.h
             src/GribSettingsDialog.cpp
             src/GribSettingsDialog.h
-            src/icons.h 
+            src/icons.h
             src/msg.h
             src/email.h
             src/email.cpp
             src/icons.cpp
-            src/GribReader.cpp 
-            src/GribRecord.cpp  
-            src/zuFile.cpp 
+            src/GribReader.cpp
+            src/GribRecord.cpp
+            src/zuFile.cpp
             src/IsoLine.cpp
-
-            ../../src/wxJSON/jsonval.cpp
-            ../../src/wxJSON/jsonreader.cpp
-            ../../src/wxJSON/jsonwriter.cpp
 )
 IF(WIN32)
            SET(SRC_GRIB ${SRC_GRIB} src/smapi.h)
@@ -106,12 +103,12 @@ ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC
 
 IF(NOT UNIX)
     SET(SRC_BZIP
-            src/bzip2/bzlib.c 
-            src/bzip2/blocksort.c 
-            src/bzip2/compress.c 
-            src/bzip2/crctable.c 
-            src/bzip2/decompress.c 
-            src/bzip2/huffman.c 
+            src/bzip2/bzlib.c
+            src/bzip2/blocksort.c
+            src/bzip2/compress.c
+            src/bzip2/crctable.c
+            src/bzip2/decompress.c
+            src/bzip2/huffman.c
             src/bzip2/randtable.c
     )
     ADD_LIBRARY(LIB_BZIP ${SRC_BZIP})
@@ -156,6 +153,6 @@ ENDIF(UNIX AND NOT APPLE)
 IF(WIN32)
 INSTALL(TARGETS ${PACKAGE_NAME} RUNTIME DESTINATION "plugins")
 ENDIF(WIN32)
- 	  	 
-INCLUDE("../PluginLocalization.cmake")
-PLUGIN_LOCALIZATION()
+
+#INCLUDE("../PluginLocalization.cmake")
+#PLUGIN_LOCALIZATION()
diff -Pdpru grib_pi.orig/src/grib_pi.h grib_pi/src/grib_pi.h
--- grib_pi.orig/src/grib_pi.h	2013-07-08 21:19:57.154022042 +0200
+++ grib_pi/src/grib_pi.h	2013-07-08 21:35:54.660548701 +0200
@@ -40,10 +40,10 @@
 #define     MY_API_VERSION_MAJOR    1
 #define     MY_API_VERSION_MINOR    7
 
-#include "../../../include/ocpn_plugin.h"
+#include <opencpn/ocpn_plugin.h>
 
-#include "../../../include/wx/jsonreader.h"
-#include "../../../include/wx/jsonwriter.h"
+#include <opencpn/wx/jsonreader.h>
+#include <opencpn/wx/jsonwriter.h>
 
 #include "GribSettingsDialog.h"
 #include "GribOverlayFactory.h"
@@ -141,7 +141,7 @@ private:
       wxString         m_bMailAddresses;
       wxString         m_ZyGribLogin;
       wxString         m_ZyGribCode;
-      
+
       bool             m_bGRIBShowIcon;
 
       int              m_height;
diff -Pdpru grib_pi.orig/src/IsoLine.h grib_pi/src/IsoLine.h
--- grib_pi.orig/src/IsoLine.h	2013-07-08 21:19:57.136021807 +0200
+++ grib_pi/src/IsoLine.h	2013-07-08 21:21:44.120421439 +0200
@@ -29,7 +29,7 @@ Dessin des données GRIB (avec QT)
 #include <list>
 #include <set>
 
-#include "../../../include/ocpn_plugin.h"
+#include <opencpn/ocpn_plugin.h>
 
 #include "GribReader.h"
 
@@ -45,7 +45,7 @@ WX_DECLARE_LIST(MySegList, MySegListList
 //  Cohen & Sutherland Line clipping algorithms
 //-------------------------------------------------------------------------------------------------------
 /*
- * 
+ *
  * Copyright (C) 1999,2000,2001,2002,2003 Percy Zahl
  *
  * Authors: Percy Zahl <zahl@users.sf.net>

Places

File OpenCPN_grib_pi.devel-include.patch of Package OpenCPN_grib_pi (Revision e25383fd70b1af23a2b1430ae06be0b4)

Places