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

diff -Pdpru OpenCPN_grib_pi.orig/CMakeLists.txt OpenCPN_grib_pi/CMakeLists.txt
--- OpenCPN_grib_pi.orig/CMakeLists.txt	2013-07-23 11:12:42.276691257 +0200
+++ OpenCPN_grib_pi/CMakeLists.txt	2013-07-23 14:41:29.312003938 +0200
@@ -42,16 +42,16 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/
 #ADD_DEFINITIONS( "-Wall -ansi -pedantic -Wno-variadic-macros" )
 #TODO: Should we use  -fno-stack-protector
 #  IF NOT DEBUGGING CFLAGS="-O2 -march=native"
-IF(NOT WIN32 AND NOT APPLE)
-    ADD_DEFINITIONS( "-Wall -O0 -fexceptions -fvisibility=hidden" )
-    SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
-ENDIF(NOT WIN32 AND NOT APPLE)
+IF(NOT WIN32)
+ ADD_DEFINITIONS( "-Wall -O0 -fexceptions -fvisibility=hidden" )
 
-IF( APPLE )
-   ADD_DEFINITIONS( "-O0 -fexceptions -fvisibility=hidden" )
-   ADD_DEFINITIONS("-Wno-unused -Wno-overloaded-virtual")
-   SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
-ENDIF( APPLE )
+ IF(NOT APPLE)
+  SET(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic")
+ ELSE(NOT APPLE)
+  SET(CMAKE_SHARED_LINKER_FLAGS "-Wl -undefined dynamic_lookup")
+ ENDIF(NOT APPLE)
+
+ENDIF(NOT WIN32)
 
 # Add some definitions to satisfy MS
 IF(WIN32)
@@ -65,6 +65,7 @@ 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)
@@ -93,10 +94,6 @@ SET(SRC_GRIB
             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)
@@ -147,7 +144,7 @@ ENDIF(APPLE)
 
 IF(UNIX AND NOT APPLE)
       IF(NOT DEFINED PREFIX_PLUGINS)
-            SET(PREFIX_PLUGINS /usr/local/lib/opencpn)
+            SET(PREFIX_PLUGINS /usr/lib/opencpn)
       ENDIF(NOT DEFINED PREFIX_PLUGINS)
 
       INSTALL(TARGETS ${PACKAGE_NAME} RUNTIME LIBRARY DESTINATION ${PREFIX_PLUGINS})
@@ -157,5 +154,77 @@ IF(WIN32)
 INSTALL(TARGETS ${PACKAGE_NAME} RUNTIME DESTINATION "plugins")
 ENDIF(WIN32)
 
-INCLUDE("../PluginLocalization.cmake")
+FUNCTION(PLUGIN_LOCALIZATION)
+	FIND_PROGRAM(GETTEXT_XGETTEXT_EXECUTABLE xgettext)
+	string(REPLACE "_pi" "" I18N_NAME ${PACKAGE_NAME})
+	IF (GETTEXT_XGETTEXT_EXECUTABLE)
+	ADD_CUSTOM_COMMAND(
+	   OUTPUT po/${PACKAGE_NAME}.pot.dummy
+	   COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} --force-po --package-name=${PACKAGE_NAME} --package-version="${PACKAGE_VERSION}" --output=po/${PACKAGE_NAME}.pot  --keyword=_ --width=80 --files-from=${CMAKE_CURRENT_SOURCE_DIR}/po/POTFILES.in
+	   DEPENDS po/POTFILES.in po/${PACKAGE_NAME}.pot
+	   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+	   COMMENT "${I18N_NAME}-pot-update [${PACKAGE_NAME}]: Generated pot file."
+	)
+	ADD_CUSTOM_TARGET(${I18N_NAME}-pot-update COMMENT "[${PACKAGE_NAME}]-pot-update: Done." DEPENDS po/${PACKAGE_NAME}.pot.dummy)
+
+	ENDIF(GETTEXT_XGETTEXT_EXECUTABLE )
+
+	MACRO(GETTEXT_UPDATE_PO _potFile)
+	   SET(_poFiles ${_potFile})
+	   GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
+
+	   FOREACH (_currentPoFile ${ARGN})
+	      GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
+	      GET_FILENAME_COMPONENT(_poBasename ${_absFile} NAME_WE)
+
+	      ADD_CUSTOM_COMMAND(
+		 OUTPUT ${_absFile}.dummy
+		 COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --width=80 --strict --quiet --update --backup=none --no-location -s ${_absFile} ${_absPotFile}
+		 DEPENDS ${_absPotFile} ${_absFile}
+		 COMMENT "${I18N_NAME}-po-update [${_poBasename}]: Updated po file."
+	      )
+
+	      SET(_poFiles ${_poFiles} ${_absFile}.dummy)
+
+	   ENDFOREACH (_currentPoFile )
+
+	   ADD_CUSTOM_TARGET(${I18N_NAME}-po-update COMMENT "[${PACKAGE_NAME}]-po-update: Done." DEPENDS ${_poFiles})
+	ENDMACRO(GETTEXT_UPDATE_PO)
+
+	IF (GETTEXT_MSGMERGE_EXECUTABLE)
+	FILE(GLOB PACKAGE_PO_FILES po/*.po)
+	GETTEXT_UPDATE_PO(po/${PACKAGE_NAME}.pot ${PACKAGE_PO_FILES})
+	ENDIF(GETTEXT_MSGMERGE_EXECUTABLE)
+
+	SET(_gmoFiles)
+	MACRO(GETTEXT_BUILD_MO)
+	   FOREACH (_poFile ${ARGN})
+	      GET_FILENAME_COMPONENT(_absFile ${_poFile} ABSOLUTE)
+	      GET_FILENAME_COMPONENT(_poBasename ${_absFile} NAME_WE)
+	      SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_poBasename}.mo)
+
+	      ADD_CUSTOM_COMMAND(
+		 OUTPUT ${_gmoFile}
+		 COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} --check -o ${_gmoFile} ${_absFile}
+		 DEPENDS ${_absFile}
+		 COMMENT "${I18N_NAME}-i18n [${_poBasename}]: Created mo file."
+	      )
+
+	IF(APPLE)
+	      INSTALL(FILES ${_gmoFile} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/OpenCPN.app/Contents/Resources/${_poBasename}.lproj RENAME opencpn-${PACKAGE_NAME}.mo )
+	ELSE(APPLE)
+	      INSTALL(FILES ${_gmoFile} DESTINATION ${PREFIX_DATA}/locale/${_poBasename}/LC_MESSAGES RENAME opencpn-${PACKAGE_NAME}.mo )
+	ENDIF(APPLE)
+
+	      SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
+	   ENDFOREACH (_poFile )
+	ENDMACRO(GETTEXT_BUILD_MO)
+
+	if(GETTEXT_MSGFMT_EXECUTABLE)
+	   FILE(GLOB PACKAGE_PO_FILES po/*.po)
+	   GETTEXT_BUILD_MO(${PACKAGE_PO_FILES})
+	   ADD_CUSTOM_TARGET(${I18N_NAME}-i18n COMMENT "${PACKAGE_NAME}-i18n: Done." DEPENDS ${_gmoFiles})
+	   ADD_DEPENDENCIES(${PACKAGE_NAME} ${I18N_NAME}-i18n)
+	ENDIF(GETTEXT_MSGFMT_EXECUTABLE)
+ENDFUNCTION()
 PLUGIN_LOCALIZATION()
diff -Pdpru OpenCPN_grib_pi.orig/src/grib_pi.h OpenCPN_grib_pi/src/grib_pi.h
--- OpenCPN_grib_pi.orig/src/grib_pi.h	2013-07-23 11:12:42.283691350 +0200
+++ OpenCPN_grib_pi/src/grib_pi.h	2013-07-23 15:10:48.200563132 +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 OpenCPN_grib_pi.orig/src/IsoLine.h OpenCPN_grib_pi/src/IsoLine.h
--- OpenCPN_grib_pi.orig/src/IsoLine.h	2013-07-23 11:12:42.281691323 +0200
+++ OpenCPN_grib_pi/src/IsoLine.h	2013-07-23 15:11:03.187778558 +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

Places