Fix for #1088 Macos build issues

CMakeLists.txt

@@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 3.2)
 
 set(MACOSX_BUNDLE_GUI_IDENTIFIER "org.navitproject.navit")
 set(MACOSX_BUNDLE_BUNDLE_NAME "Navit")
+set(MACOSX_BUNDLE_ICON_FILE "Default.png")
+execute_process(COMMAND git describe --tags OUTPUT_VARIABLE MACOSX_BUNDLE_INFO_STRING)
 message(STATUS "Building with CMake V${CMAKE_VERSION}")
+message(STATUS "Git Version: ${MACOSX_BUNDLE_INFO_STRING}")
+
 if (DISABLE_CXX)
 	project(navit C)
 else(DISABLE_CXX)
@@ -714,12 +718,15 @@ if(WINCE)
 	set_with_reason(support/espeak "Windows detected" TRUE)
 endif()
 if (APPLE OR USE_UIKIT)
-	set_with_reason(vehicle/iphone "apple detected" TRUE)
+	if (EXISTS "${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks/UIKit.framework")
+		set_with_reason(vehicle/iphone "apple detected" TRUE)
+	endif()
 	set_with_reason(graphics/cocoa "apple detected" TRUE)
 	if (EXISTS "${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks/VoiceServices.framework")
 		set_with_reason(speech/iphone "apple detected" TRUE)
 	endif()
 	set(BUILD_BUNDLE TRUE CACHE BOOLEAN "build an osx bundle")
+	set(NAVIT_COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS} -ObjC")
 endif()
 
 if(CMAKE_SIZEOF_VOID_P LESS 8)

contrib/macos/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.2)
+project(macosbundle C)
+
+include(ExternalProject)
+ExternalProject_Add(navit CMAKE_ARGS
+		-Dbinding/python=false  SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../)
+ExternalProject_Get_Property(navit BINARY_DIR)
+ExternalProject_Get_Property(navit SOURCE_DIR)
+
+install(DIRECTORY /usr/local/lib/navit/ DESTINATION ${BINARY_DIR}/navit.app/Contents/Resources)
+install(DIRECTORY ${BINARY_DIR}/navit/resources/share/navit/ DESTINATION ${BINARY_DIR}/navit.app/Contents/Resources/share)
+install(DIRECTORY ${BINARY_DIR}/navit//resources/share/locale DESTINATION ${BINARY_DIR}/navit.app/Contents/Resources/share)
+install(DIRECTORY ${BINARY_DIR}/navit/icons DESTINATION ${BINARY_DIR}/navit.app/Contents/Resources/share)
+install(DIRECTORY ${BINARY_DIR}/navit/textures DESTINATION ${BINARY_DIR}/navit.app/Contents/Resources/share)
+install(DIRECTORY ${BINARY_DIR}/navit/maps DESTINATION ${BINARY_DIR}/navit.app/Contents/Resources/share)
+install(DIRECTORY ${BINARY_DIR}/navit.app DESTINATION /usr/local/bin)
+Install(FILES ${SOURCE_DIR}navit/navit_shipped_gtkgui.xml DESTINATION ~/.navit RENAME navit.xml)

docs/development/macos_development.rst

@@ -4,86 +4,61 @@ MacOS Development
 
 Here are some notes about running navit under Apple Mac OSX.
 
-================================================================================================================================
-WARNING: These instructions are currently unmaintained. Please feel free to submit a PR if you manage to build navit on Mac OSX.
-================================================================================================================================
-
 What you will need
 ==================
 
-You need Xcode Tools and MacPorts in order to install navit.
-
-MacPorts developers suggest to install Xcode Tools from http://developer.apple.com/tools/xcode/ and not from the Mac OSX install disk.
-See `Mac-How <http://www.mac-how.net/>`_
-
-Make sure you don't have fink installed on your system, it can confuse MacPorts package building and installation.
+You need Xcode Tools and homebrew in order to install navit.
 
- * GTK Gui: You should only need gtk2 and glib2 via macPorts
- * SDL Gui: Untested yet.
+.. code-block:: bash ⚠️ Warning:
 
-Installation instruction
-========================
+If you have macports or fink installed create and use a new user account to build navit.
 
-Download Xcode Tools from http://developer.apple.com/tools/xcode/ and install it with X11 SDK
-
-Download and Install MacPorts from http://www.macports.org/, or update your version
+For convinience there is the script prepare_navit_macos.sh available under the navit/scripts directory.
 
 .. code-block:: bash
 
-    sudo port -d selfupdate
-
-Open up a terminal
+ $ curl https://raw.githubusercontent.com/OLFDB/navit/macosbuild/scripts/prepare_navit_macos.sh  -o prepare_navit_macos.sh
 
-make sure your PATH variables has `/opt/local/bin` and `/opt/local/sbin` in it:
+ Then start the installation procedure:
 
-.. code-block:: bash
+ .. code-block:: bash
 
-    echo $PATH
+ $ sh prepare_navit_macos.sh
 
 
-Install automake, wget, libtool, gpsd (if you want gps support), gtk2 and glib2 (for gkt GUI) with
+What is working
+===============
+* internal Gui: 	Working, but problems with window refresh
+* GTK Gui: Working.
+* SDL Gui: Untested yet.
 
-.. code-block:: bash
-
-    sudo port install automake wget gpsd gtk2 glib2 libtool
-
-Download navit or checkout it from Git
-
-.. code-block:: bash
+GPSD
+====
 
-    git clone [email protected]:navit-gps/navit.git
+You have to add the GPS receiver device to gpsd:
 
-You may also need a header file to handle endian issues (for PPC only)
-
-.. code-block:: bash
-
-    wget https://navit.svn.sourceforge.net/svnroot/navit/tags/R0_1_0/navit/projs/CodeBlocks/Win32Extra/byteswap.h
-
-If you want to install navit along the MacPorts packages, you need to use the /opt/local directory as prefix:
-
-.. code-block:: bash
-
-  ./autogen.sh && ./configure --prefix=/opt/local --disable-binding-python
-
-type `make` to build NavIt, and `sudo make install` to install it.
-
-Then, you may edit and adapt your `navit.xml` file. The XML maptype is not supported, however normal Navit binfile works perfectly.
+GPSD_SOCKET="/usr/local/var/gpsd.sock" /usr/local/opt/gpsd/sbin/gpsdctl add /dev/tty.usbserial-XYZ
 
 Speech
 ======
 
-If you want (spoken) directions, get espeak from http://espeak.sourceforge.net, install as advised and use the following snippet in your navit.xml:
+If you want (spoken) directions, use the following snippet in your navit.xml:
 
 .. code-block:: xml
 
-           <speech type="cmdline" data="speak -vde+f4 '%s'"/>
+           <speech type="cmdline" data="say '%s'"/>
 
-This will tell speak to use a female (f) german (de) voice.
+This will use the native say command. You can list all available voices by typing say -v ? in a terminal.
+Change the command to say -v <voicename> if you would like a non standard voice to be used. New voices can be added in system preferences->keyboard->dictation
 
 
 Using xcode
 ===========
 
+========================================================================================================================================
+WARNING: These instructions are currently outdated. Please feel free to submit a PR if you manage to build navit on Mac OSX using Xcode.
+========================================================================================================================================
+
 Download one of the `Git sources <https://github.com/navit-gps/navit>`_ that don't contain autogen.sh.
 
 Open X-Code and create a new project. Cocoa will suffice

navit/CMakeLists.txt

@@ -6,6 +6,11 @@ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/support")
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/THIS_IS_THE_NAVIT_WORKING_DIR "\r\nThis File should never appear on binary distributions\r\n" )
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/THIS_IS_THE_NAVIT_WORKING_DIR "\r\nOnly Devs should ever see this file" )
 
+IF(APPLE)
+    # Fix linking on 10.14+. See https://stackoverflow.com/questions/54068035
+    LINK_DIRECTORIES(/usr/local/lib)
+ENDIF()
+
 # navit core
 set(NAVIT_SRC announcement.c atom.c attr.c cache.c callback.c command.c config_.c coord.c country.c data_window.c debug.c
 	event.c file.c geom.c graphics.c gui.c item.c layout.c log.c main.c map.c maps.c
@@ -77,20 +82,23 @@ if(NOT ANDROID)
 		endif()
 	endif()
 	if (BUILD_BUNDLE)
+		set(EXECUTABLE_NAME navit)
+		set(APP_ICON_FILE Default.png)
 		list(APPEND NAVIT_START_SRC resources/share resources/Icon.png resources/Default.png)
-		add_custom_command(OUTPUT resources/Icon.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Icon.png)
-		add_custom_command(OUTPUT resources/Default.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Default.png)
+		add_custom_command(OUTPUT resources/Icon.png COMMAND convert -scale 79x79   ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Icon.png)
+		add_custom_command(OUTPUT resources/Default.png COMMAND convert -scale 79x79  ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Default.png)
 	endif()
 	add_executable(navit ${NAVIT_START_SRC})
 	target_link_libraries (navit ${NAVIT_LIBNAME})
 	if(DEFINED NAVIT_BINARY)
 		set_target_properties(navit PROPERTIES OUTPUT_NAME ${NAVIT_BINARY})
 	endif(DEFINED NAVIT_BINARY)
 	if (BUILD_BUNDLE)
+		target_link_libraries(navit stdc++ "-framework Foundation"  objc)
 		add_custom_command(OUTPUT resources/share COMMAND mkdir -p resources/share)
-		set_source_files_properties(resources/share resources/Icon.png resources/Default.png PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+		set_source_files_properties(${NAVIT_SUPPORT_LIBS} resources/share resources/Icon.png resources/Default.png PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 		set_target_properties(navit PROPERTIES MACOSX_BUNDLE TRUE)
-		set_target_properties(navit PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
+#set_target_properties(navit PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
 		add_dependencies(navit navit_config_xml_resource)
 		add_dependencies(navit images_resource)
 		add_dependencies(navit locale_resource)

navit/android.c

@@ -7,7 +7,7 @@
 #include "config_.h"
 #include "command.h"
 #include "debug.h"
-#include "event.h"
+#include "navit/event.h"
 #include "callback.h"
 #include "country.h"
 #include "projection.h"

navit/binding/dbus/binding_dbus.c

@@ -49,7 +49,7 @@
 #include "roadprofile.h"
 #include "util.h"
 #include "transform.h"
-#include "event.h"
+#include "navit/event.h"
 #include "traffic.h"
 
 static DBusConnection *connection;

navit/command.c

@@ -13,7 +13,7 @@
 #include "debug.h"
 #include "callback.h"
 #include "command.h"
-#include "event.h"
+#include "navit/event.h"
 #include "navit_nls.h"
 
 /*

navit/event.c

@@ -19,7 +19,7 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "event.h"
+#include "navit/event.h"
 #include "plugin.h"
 #include "debug.h"
 

navit/event_glib.c

@@ -18,7 +18,7 @@
  */
 
 #include <glib.h>
-#include "event.h"
+#include "navit/event.h"
 #include "event_glib.h"
 #include "debug.h"
 #include "callback.h"

navit/graphics.c

@@ -50,7 +50,7 @@
 #include "util.h"
 #include "callback.h"
 #include "file.h"
-#include "event.h"
+#include "navit/event.h"
 #include "navit.h"
 
 /**

navit/graphics/android/graphics_android.c

@@ -28,7 +28,7 @@
 #include "item.h"
 #include "xmlconfig.h"
 #include "plugin.h"
-#include "event.h"
+#include "navit/event.h"
 #include "debug.h"
 #include "callback.h"
 #include "android.h"

navit/graphics/cocoa/graphics_cocoa.m

@@ -6,7 +6,7 @@
 #include "point.h"
 #include "window.h"
 #include "graphics.h"
-#include "event.h"
+#include "navit/event.h"
 #include "item.h"
 #include "callback.h"
 #include "color.h"

navit/graphics/egl/graphics_egl.c

@@ -31,7 +31,7 @@
 #include "graphics.h"
 #include "color.h"
 #include "plugin.h"
-#include "event.h"
+#include "navit/event.h"
 #include "debug.h"
 #include "callback.h"
 #include "keys.h"

navit/graphics/gtk_drawing_area/graphics_gtk_drawing_area.c

@@ -25,19 +25,26 @@
 #include <math.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+
 #include <cairo.h>
 #include <locale.h> /* For WIN32 */
 #if !defined(GDK_KEY_Book) || !defined(GDK_Book) || !defined(GDK_Calendar)
+#if !defined(__APPLE__)
 #include <X11/XF86keysym.h>
 #endif
+#endif
 #ifdef HAVE_IMLIB2
 #include <Imlib2.h>
 #endif
 
 #ifndef _WIN32
+#if !defined(__APPLE__)
 #include <gdk/gdkx.h>
+#else
+#include <gdk/gdkquartz.h>
+#endif
 #endif
-#include "event.h"
+#include "navit/event.h" /* in case espeak is enabled the system finds the wrong event.h without navit/ prefix */
 #include "debug.h"
 #include "point.h"
 #include "graphics.h"
@@ -625,7 +632,11 @@ static gint configure(GtkWidget * widget, GdkEventConfigure * event, gpointer us
     if (! gra->visible)
         return TRUE;
 #ifndef _WIN32
+#if defined(__APPLE__)
+    dbg(lvl_debug,"window=%lu", GDK_WINDOW(widget->window));
+#else
     dbg(lvl_debug,"window=%lu", GDK_WINDOW_XID(widget->window));
+#endif
 #endif
     gra->width=widget->allocation.width;
     gra->height=widget->allocation.height;
@@ -1016,7 +1027,11 @@ static void *get_data(struct graphics_priv *this, char const *type) {
         return this->widget;
 #ifndef _WIN32
     if (!strcmp(type,"xwindow_id"))
+#if defined(__APPLE__)
+        return (void *)GDK_WINDOW(this->win ? this->win->window : this->widget->window);
+#else
         return (void *)GDK_WINDOW_XID(this->win ? this->win->window : this->widget->window);
+#endif
 #endif
     if (!strcmp(type,"window")) {
         char *cp = getenv("NAVIT_XID");
@@ -1112,7 +1127,7 @@ static struct graphics_priv *graphics_gtk_drawing_area_new(struct navit *nav, st
     GtkWidget *draw;
     struct attr *attr;
 
-    if (! event_request_system("glib","graphics_gtk_drawing_area_new"))
+    if (event_request_system((const char *)"glib",(const char *)"graphics_gtk_drawing_area_new")==0)
         return NULL;
 
     draw=gtk_drawing_area_new();

navit/graphics/null/graphics_null.c

@@ -27,7 +27,7 @@
 #include "graphics.h"
 #include "color.h"
 #include "plugin.h"
-#include "event.h"
+#include "navit/event.h"
 #include "debug.h"
 #include "window.h"
 #include "callback.h"

navit/graphics/opengl/graphics_opengl.c

@@ -34,7 +34,7 @@
 #include "graphics.h"
 #include "color.h"
 #include "plugin.h"
-#include "event.h"
+#include "navit/event.h"
 #include "debug.h"
 #include "callback.h"
 #include "keys.h"
@@ -79,6 +79,7 @@ typedef double GLdouble;
 #define USE_FLOAT 1
 #ifdef __APPLE__
 #include <GLUT/glut.h>
+#  define APIENTRY
 #else
 #include <GL/glut.h>		/* glut.h includes gl.h and glu.h */
 #endif

navit/graphics/opengl/graphics_opengl_x11.c

@@ -2,7 +2,7 @@
 #include <X11/Xutil.h>
 #include <glib.h>
 #include "debug.h"
-#include "event.h"
+#include "navit/event.h"
 #include "callback.h"
 #include "graphics_opengl.h"
 

navit/graphics/qt5/QNavitQuick.cpp

@@ -28,7 +28,7 @@ extern "C" {
 #include "callback.h"
 #include "color.h"
 #include "debug.h"
-#include "event.h"
+#include "navit/event.h"
 
 #include "point.h" /* needs to be before graphics.h */
 

navit/graphics/qt5/QNavitWidget.cpp

@@ -28,7 +28,7 @@ extern "C" {
 #include "callback.h"
 #include "color.h"
 #include "debug.h"
-#include "event.h"
+#include "navit/event.h"
 
 #include "point.h" /* needs to be before graphics.h */