From 89db0ccfed077a7dce12657786bb7377d8a35e58 Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Sun, 7 Jan 2018 15:49:29 -0800
Subject: [PATCH] Fix some environment file issues.

* newlines at the end of the pythonpath insertions.
* Get the DBI block out from the middle of the XDG stuff.
* Make the installed XDG_DATA_DIRS relocatable.
* Add GDK_PIXBUF_MODULE_FILE, allows running the Mac bundle without a
  launcher script.
---
 gnucash/CMakeLists.txt | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 29784aa1c0..39b830e3fe 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -135,8 +135,10 @@ SET(XDG_TEXT "
 
 IF (NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/share") AND NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/local/share"))
   FILE(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
-  FILE(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS=${CMAKE_INSTALL_FULL_DATADIR};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
+  FILE(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
 ENDIF()
+FILE(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
+FILE(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
 
 if (LIBDBI_LIBRARY AND LIBDBI_DRIVERS_DIR)
   get_filename_component(libdir ${LIBDBI_LIBRARY} DIRECTORY)
@@ -146,21 +148,23 @@ if (LIBDBI_LIBRARY AND LIBDBI_DRIVERS_DIR)
   endif()
 ENDIF()
 
-FILE(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
-FILE(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
-
-SET(PYTHON_TEXT "
+IF (WITH_PYTHON)
+  SET(PYTHON_TEXT "
 # Define PYTHONPATH for non default installation path.\n"
  )
-IF (NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") AND NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local"))
+  IF (NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") AND NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local"))
 
-  FILE(APPEND ${ENV_FILE_OUT} ${PYTHON_TEXT})
-  FILE(APPEND ${ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_OUTPUT};{PYTHONPATH}")
-ENDIF()
+    FILE(APPEND ${ENV_FILE_OUT} ${PYTHON_TEXT})
+    FILE(APPEND ${ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_OUTPUT};{PYTHONPATH}\n")
+  ENDIF()
 
-FILE(APPEND ${BUILD_ENV_FILE_OUT} ${PYTHON_TEXT})
-FILE(APPEND ${BUILD_ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_BUILD};{PYTHONPATH}")
+  FILE(APPEND ${BUILD_ENV_FILE_OUT} ${PYTHON_TEXT})
+  FILE(APPEND ${BUILD_ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_BUILD};{PYTHONPATH}\n")
+ENDIF()
 
+IF (MAC_INTEGRATION)
+  file(APPEND ${ENV_FILE_OUT} "GDK_PIXBUF_MODULE_FILE={SYS_LIB}/gdk-pixbuf-2.0/2.10.0/loaders.cache\n")
+ENDIF()
 
 FILE(COPY ${BUILD_ENV_FILE_OUT}
   DESTINATION ${SYSCONFDIR_BUILD}/gnucash