Merge lp:~inkscape.dev/inkscape/osx-packaging-update into lp:~inkscape.dev/inkscape/trunk

[su_v]

Rewrite of relocation support for OS X application bundles:

Instead of requiring CWD to be a specific location inside the app bundle (to resolve relative paths to Inkscape's shared resources), use a macro similar to relocation support for Linux and Windows, based on the path of the current executable. This will ease command line usage (bug #181639).

[Martin Owens (doctormo)]

Is this merge request still useful and open? Should we get these changes into trunk?

[su_v (suv-lp)]

The proposed changes in src/ are still useful (the merge proposal was never closed): future packages for macOS with GTK3/Quartz will still benefit if Inkscape had better internal relocation support on that platform than what the current code offers. The details of the proposed changes will have to be reviewed/adapted by whoever will work on future macOS packages of Inkscape with GTK3/Quartz.

Proposing to keep this one open for now.

Unmerged revisions

14484. By su_v on 2015-11-20

packaging/macosx: update comments in launcher scripts about CWD and relocation support

14483. By su_v on 2015-11-20

packaging/macosx: sync quartz launcher script (currently not used)

14482. By su_v on 2015-11-20

packaging/macosx: use new path-prefix macro for poppler relocation support

14481. By su_v on 2015-11-20

packaging/macosx: no need to store bundleId for relocation support with gtk-mac-integration

14480. By su_v on 2015-11-20

packaging/macosx: rewrite relocation support (bug #181639)

14479. By su_v on 2015-11-20

packaging/macosx: ScriptExec - remove unused code

=== modified file 'packaging/macosx/Resources/bin/inkscape'
--- packaging/macosx/Resources/bin/inkscape	2015-11-02 10:14:45 +0000
+++ packaging/macosx/Resources/bin/inkscape	2015-11-20 12:21:31 +0000
@@ -23,17 +23,6 @@
 BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')"
 # e.g. /Applications/Inkscape.app
 
-# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative 
-# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change
-# of working directory is required:
-#
-# Due to changes after 0.48, we have to change working directory in the script named 'inkscape':
-# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or
-# fail (for python-based extensions, inkscape changes the working directory to the 
-# script's directory, and inkscape launched by python script thus can't find resources
-# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory).
-cd "$BASE" || exit 1
-
 # don't prepend to $PATH in recursive calls:
 if [ -z "$INK_PATH_ORIG" ]; then
 
@@ -43,6 +32,7 @@
 	#	Fink
 	#	MacPorts (former DarwinPorts)
 	#	LaTeX distribution for Mac OS X
+	#	LaTeX distribution for OS X El Capitan
 	PATH_OTHER="/Library/TeX/texbin:/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin"
 
 	# Put /usr/bin at beginning of path so we make sure we use Apple's python 
@@ -93,7 +83,6 @@
 export GVFS_DISABLE_FUSE=1
 export XDG_DATA_DIRS="$TOP/share"
 export ASPELL_CONF="prefix $TOP;"
-export POPPLER_DATADIR="$TOP/share/poppler"
 
 # no DBUS for now
 unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
@@ -109,16 +98,14 @@
 export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
 export INKSCAPE_LOCALEDIR="$TOP/share/locale"
 
-# Handle the case where the directory storing Inkscape has special characters
-# ('#', '&', '|') in the name.  These need to be escaped to work properly for 
-# various configuration files.
-ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
-
 # Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
 if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
-	export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc"
+	export GTK2_RC_FILES="$TOP/etc/gtk-2.0/gtkrc"
 fi
 
+# ----------------------------
+# FIXME language detection and conversion into supported locale
+
 # If the AppleCollationOrder preference doesn't exist, we fall back to using
 # the AppleLocale preference.
 LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
@@ -154,6 +141,9 @@
 [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2
 export LC_ALL="$LANG"
 
+# end FIXME language detection
+# ----------------------------
+
 case "$INK_DEBUG" in
 	gdb)
 		EXEC="gdb --args" ;;

=== modified file 'packaging/macosx/Resources/openDoc'
--- packaging/macosx/Resources/openDoc	2014-10-24 05:01:09 +0000
+++ packaging/macosx/Resources/openDoc	2015-11-20 12:21:31 +0000
@@ -14,4 +14,8 @@
 
 source "${CWD}/xdg_setup.sh"
 
+# When launched via Finder, cd into $HOME first (otherwise CWD in
+# GtkFileChooser's Places is '/').
+cd "$HOME"
+
 exec "$CWD/bin/inkscape" "$@"

=== modified file 'packaging/macosx/Resources/script'
--- packaging/macosx/Resources/script	2014-10-24 05:01:09 +0000
+++ packaging/macosx/Resources/script	2015-11-20 12:21:31 +0000
@@ -17,11 +17,10 @@
 source "${CWD}/xdg_setup.sh"
 source "${CWD}/alert_fccache.sh"
 
-# TODO examine whether it would be wisest to move the code from inkscape shell
-# script and getdisplay.sh to here and only keep the real binary in bin. This
-# may make things easier on Leopard and may also help using Inkscape on the
-# command line.
-#
-# See related FIXME in bin/inkscape for requirements to merge the two scripts.
+# When launched via Finder, cd into $HOME first (otherwise CWD in
+# GtkFileChooser's Places is '/'). Direct command line usage of
+# Inkscape.app/Contents/Resources/bin/inkscape is now possible
+# without requiring absolute paths (better relocation support).
+cd "$HOME"
 
 exec "$CWD/bin/inkscape" "$@"

=== modified file 'packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh'
--- packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh	2015-01-10 16:06:20 +0000
+++ packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh	2015-11-20 12:21:31 +0000
@@ -26,17 +26,6 @@
 source "${TOP}/xdg_setup.sh"
 source "${TOP}/alert_fccache.sh"
 
-# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative 
-# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change
-# of working directory is required:
-#
-# Due to changes after 0.48, we have to change working directory in the script named 'inkscape':
-# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or
-# fail (for python-based extensions, inkscape changes the working directory to the 
-# script's directory, and inkscape launched by python script thus can't find resources
-# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory).
-cd "$BASE" || exit 1
-
 # don't prepend to $PATH in recursive calls:
 if [ -z "$INK_PATH_ORIG" ]; then
 
@@ -46,7 +35,8 @@
 	#	Fink
 	#	MacPorts (former DarwinPorts)
 	#	LaTeX distribution for Mac OS X
-	PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin"
+	#	LaTeX distribution for OS X El Capitan
+	PATH_OTHER="/Library/TeX/texbin:/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin"
 
 	# Put /usr/bin at beginning of path so we make sure we use Apple's python 
 	# over one that may be installed be Macports, Fink or some other means.
@@ -96,7 +86,6 @@
 export GVFS_DISABLE_FUSE=1
 export XDG_DATA_DIRS="$TOP/share"
 export ASPELL_CONF="prefix $TOP;"
-export POPPLER_DATADIR="$TOP/share/poppler"
 
 # no DBUS for now
 unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
@@ -112,16 +101,14 @@
 export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
 export INKSCAPE_LOCALEDIR="$TOP/share/locale"
 
-# Handle the case where the directory storing Inkscape has special characters
-# ('#', '&', '|') in the name.  These need to be escaped to work properly for 
-# various configuration files.
-ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
-
 # Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
 if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
-	export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc"
+	export GTK2_RC_FILES="$TOP/etc/gtk-2.0/gtkrc"
 fi
 
+# ----------------------------
+# FIXME language detection and conversion into supported locale
+
 # If the AppleCollationOrder preference doesn't exist, we fall back to using
 # the AppleLocale preference.
 LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
@@ -157,6 +144,9 @@
 [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2
 export LC_ALL="$LANG"
 
+# end FIXME language detection
+# ----------------------------
+
 case "$INK_DEBUG" in
 	gdb)
 		EXEC="gdb --args" ;;
@@ -170,6 +160,7 @@
 unset INK_DEBUG # ignore for recursive calls
 
 if [ "x$INK_DEBUG_SHELL" != "x" ]; then
+	unset INK_DEBUG_SHELL  # ignore for recursive calls
 	exec bash
 else
 	$EXEC "$CWD/inkscape-bin" "$@"

=== modified file 'packaging/macosx/ScriptExec/main.c'
--- packaging/macosx/ScriptExec/main.c	2014-08-21 10:26:09 +0000
+++ packaging/macosx/ScriptExec/main.c	2015-11-20 12:21:31 +0000
@@ -42,8 +42,7 @@
 // Apple stuff
 
 // Note: including Carbon prevents building the launcher app in x86_64
-//       used for StandardAlert in RequestUserAttention(), 
-//       RedFatalAlert()
+//       used for StandardAlert in RedFatalAlert()
 #include <Carbon/Carbon.h>
 
 #include <CoreFoundation/CoreFoundation.h>
@@ -103,8 +102,6 @@
                                  AppleEvent *reply, long refCon);
 static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent,
                                  AppleEvent *reply, long refCon);
-static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall,
-                                 EventRef theEvent, void *userData);
 static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent,
                                    AppleEvent *reply, long refCon);
 
@@ -146,7 +143,6 @@
 int main(int argc, char* argv[])
 {
     OSErr err = noErr;
-    EventTypeSpec FCCacheEvents = { kEventClassRedFatalAlert, kEventKindFCCacheFailed };
 
     InitCursor();
 
@@ -165,16 +161,12 @@
                                  NewAEEventHandlerUPP(AppReopenAppAEHandler),
                                  0, false);
     
-    err += InstallEventHandler(GetApplicationEventTarget(),
-                               NewEventHandlerUPP(FCCacheFailedHandler), 1,
-                               &FCCacheEvents, NULL, NULL);
-
     if (err) RedFatalAlert("\pInitialization Error",
                            "\pError initing Apple Event handlers.");
 
     //create the menu bar
-    if (err = LoadMenuBar(NULL)) RedFatalAlert("\pInitialization Error",
-                                               "\pError loading MenuBar.nib.");
+    if ((err = LoadMenuBar(NULL))) RedFatalAlert("\pInitialization Error",
+                                                 "\pError loading MenuBar.nib.");
     
     GetParameters(); //load data from files containing exec settings
 
@@ -188,86 +180,15 @@
 #pragma mark -
 
 
-static void RequestUserAttention(void)
-{
-    NMRecPtr notificationRequest = (NMRecPtr) NewPtr(sizeof(NMRec));
-
-    memset(notificationRequest, 0, sizeof(*notificationRequest));
-    notificationRequest->qType = nmType;
-    notificationRequest->nmMark = 1;
-    notificationRequest->nmIcon = 0;
-    notificationRequest->nmSound = 0;
-    notificationRequest->nmStr = NULL;
-    notificationRequest->nmResp = NULL;
-
-    verify_noerr(NMInstall(notificationRequest));
-}
-
-
-static void ShowFirstStartWarningDialog(void)
-{
-    SInt16 itemHit;
-
-    AlertStdAlertParamRec params;
-    params.movable = true;
-    params.helpButton = false;
-    params.filterProc = NULL;
-    params.defaultText = (void *) kAlertDefaultOKText;
-    params.cancelText = NULL;
-    params.otherText = NULL;
-    params.defaultButton = kAlertStdAlertOKButton;
-    params.cancelButton = kAlertStdAlertCancelButton;
-    params.position = kWindowDefaultPosition;
-
-    StandardAlert(kAlertNoteAlert, "\pInkscape on Mac OS X",
-            "\pWhile Inkscape is open, its windows can be displayed or hidden by displaying or hiding the X11 application.\n\nThe first time this version of Inkscape is run it may take several minutes before the main window is displayed while font caches are built.",
-            &params, &itemHit);
-}
-
-
-//////////////////////////////////
-// Handler for when fontconfig caches need to be generated
-// TODO: remove (alert and touch moved to launcher script)
-//////////////////////////////////
-static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, 
-                                 EventRef theEvent, void *userData)
-{
-
-    pthread_join(tid, NULL);
-    if (odtid) pthread_join(odtid, NULL);
-
-    // Bounce Inkscape Dock icon
-    RequestUserAttention();
-    // Need to show warning to the user, then carry on.
-    ShowFirstStartWarningDialog();
-
-    // Note that we've seen the warning.
-    system("test -d \"$HOME/.cache/inkscape\" || mkdir -p \"$HOME/.cache/inkscape\"; "
-           "touch \"$HOME/.cache/inkscape/.fccache-new\"");
-    // Rerun now.
-    OSErr err = ExecuteScript(scriptPath, &pid);
-    ExitToShell();
-
-    return noErr;
-}
-
-
 ///////////////////////////////////
 // Execution thread starts here
 ///////////////////////////////////
 static void *Execute (void *arg)
 {
-    EventRef event;
-    
     taskDone = false;
     
-    OSErr err = ExecuteScript(scriptPath, &pid);
-    if (err == (OSErr)12) {
-        CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindFCCacheFailed, 0,
-                    kEventAttributeNone, &event);
-        PostEventToQueue(GetMainEventQueue(), event, kEventPriorityHigh);
-    }
-    else ExitToShell();
+    ExecuteScript(scriptPath, &pid);
+    ExitToShell();
     return 0;
 }
 
@@ -407,8 +328,8 @@
     OSErr err;
     IBNibRef nibRef;
     
-    if (err = CreateNibReference(CFSTR("MenuBar"), &nibRef)) return err;
-    if (err = SetMenuBarFromNib(nibRef, CFSTR("MenuBar"))) return err;
+    if ((err = CreateNibReference(CFSTR("MenuBar"), &nibRef))) return err;
+    if ((err = SetMenuBarFromNib(nibRef, CFSTR("MenuBar")))) return err;
     DisposeNibReference(nibRef);
 
     return noErr;

=== modified file 'src/extension/internal/pdfinput/pdf-input.cpp'
--- src/extension/internal/pdfinput/pdf-input.cpp	2015-10-19 16:01:08 +0000
+++ src/extension/internal/pdfinput/pdf-input.cpp	2015-11-20 12:21:31 +0000
@@ -62,6 +62,10 @@
 
 #include <gdkmm/general.h>
 
+#ifdef ENABLE_OSX_APP_LOCATIONS
+#include "path-prefix.h"
+#endif
+
 namespace Inkscape {
 namespace Extension {
 namespace Internal {
@@ -687,7 +691,8 @@
         // FIXES: Inkscape bug #956282, #1264793
         // TODO: report RFE upstream (full relocation support for OS X packaging)
         //
-        gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR");
+        gchar const *poppler_datadir = OSX_APP_DATADIR( "/poppler" );
+        //g_message("poppler_datadir: %s", poppler_datadir);
         if (poppler_datadir != NULL) {
             globalParams = new GlobalParams(poppler_datadir);
         } else {

=== modified file 'src/path-prefix.h'
--- src/path-prefix.h	2014-10-18 21:44:39 +0000
+++ src/path-prefix.h	2015-11-20 12:21:31 +0000
@@ -66,23 +66,23 @@
 #    define CREATE_PALETTESDIR    WIN32_DATADIR("create\\swatches")
 #    define CREATE_PATTERNSDIR    WIN32_DATADIR("create\\patterns\\vector")
 #  elif defined ENABLE_OSX_APP_LOCATIONS
-#    define INKSCAPE_APPICONDIR   "Contents/Resources/share/pixmaps"
-#    define INKSCAPE_ATTRRELDIR   "Contents/Resources/share/inkscape/attributes"
-#    define INKSCAPE_BINDDIR      "Contents/Resources/share/inkscape/bind"
-#    define INKSCAPE_EXAMPLESDIR  "Contents/Resources/share/inkscape/examples"
-#    define INKSCAPE_EXTENSIONDIR "Contents/Resources/share/inkscape/extensions"
-#    define INKSCAPE_FILTERDIR    "Contents/Resources/share/inkscape/filters"
-#    define INKSCAPE_GRADIENTSDIR "Contents/Resources/share/inkscape/gradients"
-#    define INKSCAPE_KEYSDIR      "Contents/Resources/share/inkscape/keys"
-#    define INKSCAPE_PIXMAPDIR    "Contents/Resources/share/inkscape/icons"
-#    define INKSCAPE_MARKERSDIR   "Contents/Resources/share/inkscape/markers"
-#    define INKSCAPE_PALETTESDIR  "Contents/Resources/share/inkscape/palettes"
-#    define INKSCAPE_PATTERNSDIR  "Contents/Resources/share/inkscape/patterns"
-#    define INKSCAPE_SCREENSDIR   "Contents/Resources/share/inkscape/screens"
-#    define INKSCAPE_SYMBOLSDIR   "Contents/Resources/share/inkscape/symbols"
-#    define INKSCAPE_TUTORIALSDIR "Contents/Resources/share/inkscape/tutorials"
-#    define INKSCAPE_TEMPLATESDIR "Contents/Resources/share/inkscape/templates"
-#    define INKSCAPE_UIDIR        "Contents/Resources/share/inkscape/ui"
+#    define INKSCAPE_APPICONDIR   OSX_APP_DATADIR( "/pixmaps" )
+#    define INKSCAPE_ATTRRELDIR   OSX_APP_DATADIR( "/inkscape/attributes" )
+#    define INKSCAPE_BINDDIR      OSX_APP_DATADIR( "/inkscape/bind" )
+#    define INKSCAPE_EXAMPLESDIR  OSX_APP_DATADIR( "/inkscape/examples" )
+#    define INKSCAPE_EXTENSIONDIR OSX_APP_DATADIR( "/inkscape/extensions" )
+#    define INKSCAPE_FILTERDIR    OSX_APP_DATADIR( "/inkscape/filters" )
+#    define INKSCAPE_GRADIENTSDIR OSX_APP_DATADIR( "/inkscape/gradients" )
+#    define INKSCAPE_KEYSDIR      OSX_APP_DATADIR( "/inkscape/keys" )
+#    define INKSCAPE_PIXMAPDIR    OSX_APP_DATADIR( "/inkscape/icons" )
+#    define INKSCAPE_MARKERSDIR   OSX_APP_DATADIR( "/inkscape/markers" )
+#    define INKSCAPE_PALETTESDIR  OSX_APP_DATADIR( "/inkscape/palettes" )
+#    define INKSCAPE_PATTERNSDIR  OSX_APP_DATADIR( "/inkscape/patterns" )
+#    define INKSCAPE_SCREENSDIR   OSX_APP_DATADIR( "/inkscape/screens" )
+#    define INKSCAPE_SYMBOLSDIR   OSX_APP_DATADIR( "/inkscape/symbols" )
+#    define INKSCAPE_TUTORIALSDIR OSX_APP_DATADIR( "/inkscape/tutorials" )
+#    define INKSCAPE_TEMPLATESDIR OSX_APP_DATADIR( "/inkscape/templates" )
+#    define INKSCAPE_UIDIR        OSX_APP_DATADIR( "/inkscape/ui" )
 //CREATE V0.1 support
 #    define CREATE_GRADIENTSDIR  "/Library/Application Support/create/gradients/gimp"
 #    define CREATE_PALETTESDIR   "/Library/Application Support/create/swatches"

=== modified file 'src/prefix.cpp'
--- src/prefix.cpp	2014-10-08 02:22:03 +0000
+++ src/prefix.cpp	2015-11-20 12:21:31 +0000
@@ -491,5 +491,80 @@
 
 
 
+#ifdef ENABLE_OSX_APP_LOCATIONS
+
+/*
+ * Provide a similar mechanism for osxapp.  Enable a macro,
+ * OSX_APP_DATADIR, that can look up subpaths for inkscape resources 
+ */ 
+
+static Glib::ustring osxapp_getDataDir()
+{
+    const gchar *dir = NULL;
+
+#ifdef WITH_MAC_INTEGRATION  // Quartz-based app bundle with gtk-mac-integration
+    if (gtkosx_application_get_bundle_id()) {
+        dir = g_build_filename(gtkosx_application_get_resource_path(), "share", NULL);
+    } else  {
+        dir = INKSCAPE_DATADIR;
+    }
+#else // for X11- or Quartz-based app bundle without gtk-mac-integration
+    char exe_path[PATH_MAX + 1];
+    uint32_t  bufsize = sizeof(exe_path);
+    gchar *real_path;
+    gchar *bin_dir;
+
+    if ( _NSGetExecutablePath(exe_path, &bufsize) == 0 ) {
+        real_path = realpath(exe_path, NULL);
+        if (real_path) {
+            bin_dir = g_path_get_dirname(real_path);
+#ifdef GDK_WINDOWING_QUARTZ
+            // from Inkscape.app/Contents/MacOS
+            //   to Inkscape.app/Contents/Resources/share
+            dir = g_build_path(G_DIR_SEPARATOR_S, g_path_get_dirname(bin_dir), "Resources", "share", NULL);
+#else
+            // from Inkscape.app/Contents/Resources/bin
+            //   to Inkscape.app/Contents/Resources/share
+            dir = g_build_path(G_DIR_SEPARATOR_S, g_path_get_dirname(bin_dir), "share", NULL);
+#endif /* GDK_WINDOWING_QUARTZ */
+            //g_message("DataDir: %s", dir);
+            g_free(real_path);
+            g_free(bin_dir);
+        }
+    }
+#endif /* WITH_MAC_INTEGRATION */
+    Glib::ustring ret( dir );
+    return ret;
+}
+
+
+static Glib::ustring osxapp_getResourcePath(const Glib::ustring &childPath)
+{
+    Glib::ustring dir = osxapp_getDataDir();
+    if (childPath.size() > 0) {
+        dir += childPath;
+    }
+    return dir;
+}
+
+/*
+ * This is the visible utility function
+ */ 
+char *osxapp_relative_path(const char *childPath)
+{
+    static char *returnPath = 0;
+    if (!childPath)
+        childPath = "";
+    Glib::ustring resourcePath = osxapp_getResourcePath(childPath);
+    if (returnPath)
+        free(returnPath);
+    returnPath = strdup(resourcePath.c_str());
+    return returnPath;
+}
+
+#endif /* ENABLE_OSX_APP_LOCATIONS */
+
+
+
 
 #endif /* _PREFIX_C */

=== modified file 'src/prefix.h'
--- src/prefix.h	2014-10-08 02:22:03 +0000
+++ src/prefix.h	2015-11-20 12:21:31 +0000
@@ -129,4 +129,21 @@
 
 #endif
 
+#ifdef ENABLE_OSX_APP_LOCATIONS
+
+#ifdef WITH_MAC_INTEGRATION
+#include <gtkmacintegration/gtkosxapplication.h>
+#else
+#include <mach-o/dyld.h>
+#endif /* WITH_MAC_INTEGRATION */
+
+#include <glib.h>
+#include <glibmm/ustring.h>
+
+char *osxapp_relative_path(const char *childPath);
+
+#define OSX_APP_DATADIR(suffix) (osxapp_relative_path(suffix))
+
+#endif /* ENABLE_OSX_APP_LOCATIONS */
+
 #endif /* _PREFIX_H_ */

=== modified file 'src/ui/dialog/inkscape-preferences.cpp'
--- src/ui/dialog/inkscape-preferences.cpp	2015-11-01 12:50:42 +0000
+++ src/ui/dialog/inkscape-preferences.cpp	2015-11-20 12:21:31 +0000
@@ -1987,7 +1987,15 @@
         _sys_tmp_files.set_editable(false);
         _page_system.add_line(true, _("Temporary files: "), _sys_tmp_files, "", _("Location of the temporary files used for autosave"), true);
 
+#ifdef ENABLE_BINRELOC
+        _sys_data.set_text( BR_DATADIR("") );
+#elif defined WIN32
+        _sys_data.set_text( WIN32_DATADIR("share") );
+#elif defined ENABLE_OSX_APP_LOCATIONS
+        _sys_data.set_text( OSX_APP_DATADIR("") );
+#else
         _sys_data.set_text( INKSCAPE_DATADIR );
+#endif
         _sys_data.set_editable(false);
         _page_system.add_line(true, _("Inkscape data: "), _sys_data, "", _("Location of Inkscape data"), true);