Update to trunk

(bzr r13645.1.165)

9 files changed, 574 insertions, 210 deletions

diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index 453ceef21..fa2362cd2 100644
--- a/CMakeScripts/ConfigCompileFlags.cmake
+++ b/CMakeScripts/ConfigCompileFlags.cmake
@@ -1,26 +1,19 @@
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-add_definitions(-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch)
-add_definitions(-O2)
-
 # Define the flags for profiling if desired:
 if(WITH_PROFILING)
     set(COMPILE_PROFILING_FLAGS "-pg")
     set(LINK_PROFILING_FLAGS "-pg")
 endif()
 
-add_definitions(-DVERSION=\\\"${INKSCAPE_VERSION}\\\")
+# add_definitions(-DVERSION=\\\"${INKSCAPE_VERSION}\\\")
 add_definitions(${DEFINE_FLAGS} -DHAVE_CONFIG_H -D_INTL_REDIRECT_INLINE)
 
 if(WIN32)
     add_definitions(-DXP_WIN)
 endif(WIN32)
 
-# For Inkboard:
-add_definitions(-DHAVE_SSL "-DRELAYTOOL_SSL=\"static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }\"")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_PROFILING_FLAGS} ")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILE_PROFILING_FLAGS} ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 ${COMPILE_PROFILING_FLAGS} ")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 ${COMPILE_PROFILING_FLAGS} ")
 
 set(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ")
 
-# message(STATUS "${CMAKE_CXX_FLAGS}")
+message(STATUS "${CMAKE_CXX_FLAGS}")
diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake
new file mode 100644
index 000000000..ebd005cb3
--- /dev/null
+++ b/CMakeScripts/ConfigEnv.cmake
@@ -0,0 +1,54 @@
+# -----------------------------------------------------------------------------

+# Set platform defaults (originally copied from darktable)

+# -----------------------------------------------------------------------------

+if(WIN32)

+  message("-- Windows build detected, setting default features")

+

+  include(mingwenv.cmake)

+  

+  list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH})

+  list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH})

+  

+  set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe")

+  set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe")

+  set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe")

+  set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe")

+  set(CMAKE_CXX_STANDARD 11)

+  

+  # Setup Windows resource files compiler.

+  set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe")

+  set(CMAKE_RC_COMPILER_INIT windres)

+  enable_language(RC)

+  set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -i <SOURCE> -o <OBJECT>")

+  

+  # These options are required for having i18n support on Windows.

+  option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON)

+  option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON)

+  

+  # Does not compile on Windows with these options.

+  option(BR_PTHREADS "Use binreloc thread support" OFF)

+  option(ENABLE_BINRELOC "Use AutoPackage" OFF)

+endif()

+

+if(APPLE)

+  message("-- Mac OS X build detected, setting default features")

+  

+  # prefer macports and/or user-installed libraries over system ones

+  #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local)

+  set(CMAKE_FIND_FRAMEWORK "LAST")

+

+  # test and display relevant env variables

+  if(DEFINED ENV{CMAKE_PREFIX_PATH})

+    message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}")

+  endif()

+  

+  if(DEFINED ENV{GTKMM_BASEPATH})

+    message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}")

+  endif()

+

+  # detect current GTK+ backend

+  pkg_check_variable(gtk+-2.0 target)

+  message("GTK2 backend: ${GTK+_2.0_TARGET}")

+endif()

+

+include(CMakeScripts/ConfigPaths.cmake)
\ No newline at end of file
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 3b13a7734..fae8ceea6 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -1,16 +1,30 @@
 message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")
 
 if(WIN32)
-    set(PACKAGE_LOCALE_DIR "locale")
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/inkscape")
+  
+  set(INKSCAPE_LIBDIR "\\\\lib")
+  set(INKSCAPE_DATADIR "")
+  
+  set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale")
+  
+  set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
+  set(INKSCAPE_SHARE_INSTALL "${SHARE_INSTALL}") # share/inkscape goes directly into /share on Windows
+  
+  mark_as_advanced(SHARE_INSTALL)
+else()
+  set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
+  set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+
+  # TODO: check and change this to correct value:
+  if(NOT PACKAGE_LOCALE_DIR)
+    set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this
+  endif(NOT PACKAGE_LOCALE_DIR)
+
+  if(NOT SHARE_INSTALL)
     set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
-else(WIN32)
-    # TODO: check and change this to correct value:
-    if(NOT PACKAGE_LOCALE_DIR)
-	set(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this
-    endif(NOT PACKAGE_LOCALE_DIR)
+  endif(NOT SHARE_INSTALL)
+  set(INKSCAPE_SHARE_INSTALL "${SHARE_INSTALL}/inkscape")
 
-    if(NOT SHARE_INSTALL)
-	set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
-    endif(NOT SHARE_INSTALL)
-    mark_as_advanced(SHARE_INSTALL)
-endif(WIN32)
+  mark_as_advanced(SHARE_INSTALL)
+endif()
\ No newline at end of file
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 706860a00..ad2d51724 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -12,78 +12,47 @@ list(APPEND INKSCAPE_INCS ${PROJECT_SOURCE_DIR}
 )
 
 # ----------------------------------------------------------------------------
+# Add C++11 standard compliance
+# TODO: Add a proper check for compiler compliance here
+# ----------------------------------------------------------------------------
+list(APPEND INKSCAPE_CXX_FLAGS "-std=c++11")
+
+# ----------------------------------------------------------------------------
 # Files we include
 # ----------------------------------------------------------------------------
 if(WIN32)
-message("---------------- BEGIN: Win32 ----------------")
-
- # The name of the target operating system
- set(CMAKE_SYSTEM_NAME Windows)
-
- message("CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME})
-
- set(CMAKE_C_COMPILER gcc)
- set(CMAKE_CXX_COMPILER g++)
- set(CMAKE_RC_COMPILER windres)
-
- # Adjust the command line parameters for windres to the verion of MinGW.
- set(CMAKE_RC_COMPILER_INIT windres)
- enable_language(RC)
- set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -i <SOURCE> -o <OBJECT>")
-
- # Here is the target environment located
- set(CMAKE_FIND_ROOT_PATH $ENV{MINGW_PATH}/)
-
- message("CMAKE_FIND_ROOT_PATH: " ${CMAKE_FIND_ROOT_PATH})
-
- # Tweak CMake into using Unix-style library names.
- set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll")
-
- message("CMAKE_FIND_LIBRARY_PREFIXES: " ${CMAKE_FIND_LIBRARY_PREFIXES})
- message("CMAKE_FIND_LIBRARY_SUFFIXES: " ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
- set(SDL_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}x86_64-w64-mingw32/include/c++)
-
- message("SDL_INCLUDE_DIR: " ${SDL_INCLUDE_DIR})
-
- #if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64")
- link_directories($ENV{MINGW_PATH}/lib)
- link_directories($ENV{DEVLIBS_PATH}/lib)
- link_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/lib)
- link_directories($ENV{WINDIR}/system32)
-
- include_directories($ENV{MINGW_PATH}/include)
-
- include_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/include)
- include_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/include/c++)
- #endif ()
-
- get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
-
- foreach(dir ${dirs})
-   message("CMAKE_INCLUDE_DIR:" ${dir})
- endforeach()
-
- add_definitions(-DFLT_EPSILON=1e-9)
- add_definitions(-DFLT_MAX=1e+37)
- add_definitions(-DFLT_MIN=1e-37)
-
- list(APPEND INKSCAPE_LIBS "-lgomp")
- list(APPEND INKSCAPE_LIBS "-lwinpthread")
- list(APPEND INKSCAPE_LIBS "-lmscms")
-
- list(APPEND INKSCAPE_CXX_FLAGS "-mwindows")
- list(APPEND INKSCAPE_CXX_FLAGS "-mthreads")
- list(APPEND INKSCAPE_CXX_FLAGS "-m64")
-
- # Try to compile using C++ 11.
- set(CMAKE_CXX_STANDARD 11)
-
- message("---------------- END: Win32 ----------------")
+	# Set the link and include directories
+	get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
+	
+	# MinGW supplied STL does not define these floating point constants.. :/
+	add_definitions(-DFLT_EPSILON=1e-9)
+	add_definitions(-DFLT_MAX=1e+37)
+	add_definitions(-DFLT_MIN=1e-37)
+
+	list(APPEND INKSCAPE_LIBS "-lmscms")
+
+	list(APPEND INKSCAPE_CXX_FLAGS "-mwindows")
+	list(APPEND INKSCAPE_CXX_FLAGS "-mthreads")
+	
+	if(HAVE_MINGW64)
+		list(APPEND INKSCAPE_LIBS "-lgomp")
+		list(APPEND INKSCAPE_LIBS "-lwinpthread")
+	
+		list(APPEND INKSCAPE_CXX_FLAGS "-m64")
+	else()
+		list(APPEND INKSCAPE_CXX_FLAGS "-m32")
+	endif()
 endif()
 
-pkg_check_modules(INKSCAPE_DEP REQUIRED pangocairo pangoft2 fontconfig gthread-2.0 gsl gmodule-2.0)
+pkg_check_modules(INKSCAPE_DEP REQUIRED
+	          harfbuzz
+	          pangocairo
+		  pangoft2
+		  fontconfig
+		  gthread-2.0
+		  gsl
+		  gmodule-2.0)
+
 list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS})
 list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LIBRARIES})
@@ -281,7 +250,6 @@ endif()
 set(TRY_GTKSPELL 1)
 # Include dependencies:
 # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added
-if("${WITH_GTK3_EXPERIMENTAL}")
     pkg_check_modules(
         GTK3
         REQUIRED
@@ -291,11 +259,7 @@ if("${WITH_GTK3_EXPERIMENTAL}")
         gdk-3.0>=3.8
         gdl-3.0>=3.4
         )
-    message("Using EXPERIMENTAL Gtkmm 3 build")
     list(APPEND INKSCAPE_CXX_FLAGS ${GTK3_CFLAGS_OTHER})
-    set(WITH_GTKMM_3_0 1)
-    message("Using external GDL")
-    set(WITH_EXT_GDL 1)
 
     # Check whether we can use new features in Gtkmm 3.10
     # TODO: Drop this test and bump the version number in the GTK test above
@@ -335,32 +299,6 @@ if("${WITH_GTK3_EXPERIMENTAL}")
         ${GTK3_LIBRARIES}
         ${GTKSPELL3_LIBRARIES}
     )
-else()
-    pkg_check_modules(GTK REQUIRED
-                     gtkmm-2.4>=2.24
-                     gdkmm-2.4
-                     gtk+-2.0
-                     gdk-2.0
-                     )
-    list(APPEND INKSCAPE_CXX_FLAGS ${GTK_CFLAGS_OTHER})
-    pkg_check_modules(GTKSPELL2 gtkspell-2.0)
-    if("${GTKSPELL2_FOUND}")
-        message("Using GtkSpell 2")
-        add_definitions(${GTKSPELL2_CFLAGS_OTHER})
-        set (WITH_GTKSPELL 1)
-    else()
-        unset(WITH_GTKSPELL)
-    endif()
-    list(APPEND INKSCAPE_INCS_SYS
-        ${GTK_INCLUDE_DIRS}
-        ${GTKSPELL2_INCLUDE_DIRS}
-        )
-
-    list(APPEND INKSCAPE_LIBS
-        ${GTK_LIBRARIES}
-        ${GTKSPELL2_LIBRARIES}
-        )
-endif()
 
 find_package(Freetype REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS})
@@ -449,6 +387,17 @@ list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
 
 list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
 
+find_package(yaml)
+if(YAML_FOUND)
+    set (WITH_YAML ON)
+    list(APPEND INKSCAPE_INCS_SYS ${YAML_INCLUDE_DIRS})
+    list(APPEND INKSCAPE_LIBS ${YAML_LIBRARIES})
+    add_definitions(-DWITH_YAML)
+else(YAML_FOUND)
+    set(WITH_YAML OFF)
+    message(STATUS "Could not locate the yaml library headers: xverb feature will be disabled")
+endif()
+
 list(REMOVE_DUPLICATES INKSCAPE_CXX_FLAGS)
 foreach(flag ${INKSCAPE_CXX_FLAGS})
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" CACHE STRING "" FORCE)
diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake
new file mode 100644
index 000000000..01db2644c
--- /dev/null
+++ b/CMakeScripts/Install.cmake
@@ -0,0 +1,258 @@
+if(UNIX)

+    #The install directive for the binaries and libraries are found in src/CMakeList.txt

+    install(FILES

+      ${CMAKE_BINARY_DIR}/inkscape.desktop

+      DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications)

+endif()

+

+if(WIN32)

+  install(PROGRAMS

+    ${EXECUTABLE_OUTPUT_PATH}/inkscape.exe

+    ${EXECUTABLE_OUTPUT_PATH}/inkview.exe

+    DESTINATION ${CMAKE_INSTALL_PREFIX}

+  )

+

+  install(PROGRAMS

+	${EXECUTABLE_OUTPUT_PATH}/inkscape_com.exe

+	DESTINATION ${CMAKE_INSTALL_PREFIX}

+	RENAME inkscape.com

+  )

+

+  install(FILES

+    ${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll

+    DESTINATION ${CMAKE_INSTALL_PREFIX}

+  )

+

+  install(FILES

+    AUTHORS

+    COPYING

+    NEWS

+    README

+    TRANSLATORS

+	GPL2.txt

+	GPL3.txt

+	LGPL2.1.txt

+    DESTINATION ${CMAKE_INSTALL_PREFIX})

+

+  # devlibs and mingw dlls

+

+  # There are differences in the devlibs for 64-Bit and 32-Bit build environments.

+  if(HAVE_MINGW64)

+    install(FILES

+      ${DEVLIBS_BIN}/bz2-1.dll

+      ${DEVLIBS_BIN}/icudt56.dll

+      ${DEVLIBS_BIN}/icuin56.dll

+      ${DEVLIBS_BIN}/icuuc56.dll

+      ${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll

+      ${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll

+      ${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll

+      ${DEVLIBS_BIN}/libaspell-15.dll

+      ${DEVLIBS_BIN}/libatk-1.0-0.dll

+      ${DEVLIBS_BIN}/libatkmm-1.6-1.dll

+      ${DEVLIBS_BIN}/libcairo-2.dll

+      ${DEVLIBS_BIN}/libcairo-gobject-2.dll

+      ${DEVLIBS_BIN}/libcairomm-1.0-1.dll

+      ${DEVLIBS_BIN}/libcdr-0.1.dll

+      ${DEVLIBS_BIN}/libcurl-4.dll

+      ${DEVLIBS_BIN}/libepoxy-0.dll

+      ${DEVLIBS_BIN}/libexif-12.dll

+      ${DEVLIBS_BIN}/libexpat-1.dll

+      ${DEVLIBS_BIN}/libexslt-0.dll

+      ${DEVLIBS_BIN}/libffi-6.dll

+      ${DEVLIBS_BIN}/libfontconfig-1.dll

+      ${DEVLIBS_BIN}/libfreetype-6.dll

+      ${DEVLIBS_BIN}/libgc-1.dll

+      ${DEVLIBS_BIN}/libgdk-3-0.dll

+      ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll

+      ${DEVLIBS_BIN}/libgdkmm-3.0-1.dll

+      ${DEVLIBS_BIN}/libgdl-3-5.dll

+      ${DEVLIBS_BIN}/libgio-2.0-0.dll

+      ${DEVLIBS_BIN}/libgiomm-2.4-1.dll

+      ${DEVLIBS_BIN}/libglib-2.0-0.dll

+      ${DEVLIBS_BIN}/libglibmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libgmodule-2.0-0.dll

+      ${DEVLIBS_BIN}/libgobject-2.0-0.dll

+      ${DEVLIBS_BIN}/libgsl-19.dll

+      ${DEVLIBS_BIN}/libgslcblas-0.dll

+      ${DEVLIBS_BIN}/libgthread-2.0-0.dll

+      ${DEVLIBS_BIN}/libgtk-3-0.dll

+      ${DEVLIBS_BIN}/libgtkmm-3.0-1.dll

+      ${DEVLIBS_BIN}/libharfbuzz-0.dll

+      ${DEVLIBS_BIN}/libiconv-2.dll

+      ${DEVLIBS_BIN}/libintl-8.dll

+      ${DEVLIBS_BIN}/libjpeg-9.dll

+      ${DEVLIBS_BIN}/liblcms2-2.dll

+      ${DEVLIBS_BIN}/liblzma-5.dll

+      ${DEVLIBS_BIN}/libpango-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangomm-1.4-1.dll

+      ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll

+      ${DEVLIBS_BIN}/libpixman-1-0.dll

+      ${DEVLIBS_BIN}/libpng16-16.dll

+      ${DEVLIBS_BIN}/libpoppler-58.dll

+      ${DEVLIBS_BIN}/libpoppler-glib-8.dll

+      ${DEVLIBS_BIN}/libpopt-0.dll

+      ${DEVLIBS_BIN}/libpotrace-0.dll

+      ${DEVLIBS_BIN}/librevenge-0.0.dll

+      ${DEVLIBS_BIN}/librevenge-stream-0.0.dll

+      ${DEVLIBS_BIN}/libsigc-2.0-0.dll

+      ${DEVLIBS_BIN}/libtiff-5.dll

+      ${DEVLIBS_BIN}/libvisio-0.1.dll

+      ${DEVLIBS_BIN}/libwpd-0.10.dll

+      ${DEVLIBS_BIN}/libwpg-0.3.dll

+      ${DEVLIBS_BIN}/libxml2-2.dll

+      ${DEVLIBS_BIN}/libxslt-1.dll

+      ${DEVLIBS_BIN}/zlib1.dll

+      ${MINGW_BIN}/libstdc++-6.dll

+      ${MINGW_BIN}/libwinpthread-1.dll

+      ${MINGW_BIN}/libgcc_s_seh-1.dll

+      ${MINGW_BIN}/libgomp-1.dll

+      DESTINATION ${CMAKE_INSTALL_PREFIX})

+  else()

+    install(FILES

+      ${DEVLIBS_BIN}/bzip2.dll

+      ${DEVLIBS_BIN}/freetype6.dll

+      ${DEVLIBS_BIN}/iconv.dll

+      ${DEVLIBS_BIN}/icudata50.dll

+      ${DEVLIBS_BIN}/icui18n50.dll

+      ${DEVLIBS_BIN}/icuuc50.dll

+      ${DEVLIBS_BIN}/intl.dll

+      ${DEVLIBS_BIN}/libMagick++-3.dll

+      ${DEVLIBS_BIN}/libMagickCore-3.dll

+      ${DEVLIBS_BIN}/libMagickWand-3.dll

+      ${DEVLIBS_BIN}/libatk-1.0-0.dll

+      ${DEVLIBS_BIN}/libatkmm-1.6-1.dll

+      ${DEVLIBS_BIN}/libcairo-2.dll

+      ${DEVLIBS_BIN}/libcairomm-1.0-1.dll

+      ${DEVLIBS_BIN}/libcdr-0.1.dll

+      ${DEVLIBS_BIN}/libexif-12.dll

+      ${DEVLIBS_BIN}/libexpat-1.dll

+      ${DEVLIBS_BIN}/libexslt.dll

+      ${DEVLIBS_BIN}/libfontconfig-1.dll

+      ${DEVLIBS_BIN}/libgcc_s_sjlj-1.dll

+      ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll

+      ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll

+      ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libgio-2.0-0.dll

+      ${DEVLIBS_BIN}/libgiomm-2.4-1.dll

+      ${DEVLIBS_BIN}/libglib-2.0-0.dll

+      ${DEVLIBS_BIN}/libglibmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libgmodule-2.0-0.dll

+      ${DEVLIBS_BIN}/libgobject-2.0-0.dll

+      ${DEVLIBS_BIN}/libgthread-2.0-0.dll

+      ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll

+      ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libintl-8.dll

+      ${DEVLIBS_BIN}/libjpeg-7.dll

+      ${DEVLIBS_BIN}/liblcms-1.dll

+      ${DEVLIBS_BIN}/liblcms2-2.dll

+      ${DEVLIBS_BIN}/libopenjpeg-2.dll

+      ${DEVLIBS_BIN}/libpango-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangomm-1.4-1.dll

+      ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll

+      ${DEVLIBS_BIN}/libpixman-1-0.dll

+      ${DEVLIBS_BIN}/libpng12-0.dll

+      ${DEVLIBS_BIN}/libpng14-14.dll

+      ${DEVLIBS_BIN}/libpoppler-58.dll

+      ${DEVLIBS_BIN}/libpoppler-glib-8.dll

+      ${DEVLIBS_BIN}/libpopt-0.dll

+      ${DEVLIBS_BIN}/librevenge-0.0.dll

+      ${DEVLIBS_BIN}/librevenge-stream-0.0.dll

+      ${DEVLIBS_BIN}/libsigc-2.0-0.dll

+      ${DEVLIBS_BIN}/libtiff-3.dll

+      ${DEVLIBS_BIN}/libvisio-0.1.dll

+      ${DEVLIBS_BIN}/libwpd-0.9.dll

+      ${DEVLIBS_BIN}/libwpd-stream-0.9.dll

+      ${DEVLIBS_BIN}/libwpg-0.2.dll

+      ${DEVLIBS_BIN}/libxml2.dll

+      ${DEVLIBS_BIN}/libxslt.dll

+      ${DEVLIBS_BIN}/msvcr70.dll

+      ${DEVLIBS_BIN}/msvcr71.dll

+      ${DEVLIBS_BIN}/pthreadGC2.dll

+      ${DEVLIBS_BIN}/zlib1.dll

+      ${MINGW_BIN}/mingwm10.dll

+      ${MINGW_BIN}/libgomp-1.dll

+      DESTINATION ${CMAKE_INSTALL_PREFIX})

+  endif()

+

+  # Setup application data directories, poppler files, locales, icons and themes

+  file(MAKE_DIRECTORY

+    data

+    doc

+    modules

+    plugins)

+

+  install(DIRECTORY

+    data

+    doc

+    modules

+    plugins

+    DESTINATION ${CMAKE_INSTALL_PREFIX}

+    PATTERN hicolor/index.theme EXCLUDE   # NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV.

+    PATTERN CMakeLists.txt EXCLUDE

+    PATTERN *.am EXCLUDE)

+

+  install(DIRECTORY ${DEVLIBS_PATH}/share/icons/Adwaita

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons)

+

+  install(DIRECTORY ${DEVLIBS_PATH}/share/themes

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share)

+

+  install(DIRECTORY ${DEVLIBS_PATH}/share/locale

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share

+    PATTERN "*gtk20.mo" EXCLUDE)

+

+  install(DIRECTORY ${DEVLIBS_PATH}/share/poppler

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/share)

+

+  install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/etc)

+

+  # GTK 3.0

+  install(DIRECTORY ${DEVLIBS_LIB}/gtk-3.0

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib

+    FILES_MATCHING

+    PATTERN "*.dll"

+    PATTERN "*.cache")

+

+  install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-3.0

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/etc)

+

+  install(DIRECTORY ${DEVLIBS_LIB}/gdk-pixbuf-2.0

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib

+    FILES_MATCHING

+    PATTERN "*.dll"

+    PATTERN "*.cache")

+

+  # Aspell dictionaries

+  install(DIRECTORY ${DEVLIBS_LIB}/aspell-0.60

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)

+

+  # Necessary to run extensions on windows if it is not in the path

+  if (HAVE_MINGW64)

+    install(FILES

+      ${DEVLIBS_BIN}/gspawn-win64-helper.exe

+      ${DEVLIBS_BIN}/gspawn-win64-helper-console.exe

+      DESTINATION ${CMAKE_INSTALL_PREFIX})

+  else()

+    install(FILES

+      ${DEVLIBS_BIN}/gspawn-win32-helper.exe

+      ${DEVLIBS_BIN}/gspawn-win32-helper-console.exe

+      DESTINATION ${CMAKE_INSTALL_PREFIX})

+  endif()

+

+  # Perl

+  install(FILES

+    ${DEVLIBS_PATH}/perl/bin/perl58.dll

+    DESTINATION ${CMAKE_INSTALL_PREFIX})

+

+  # Python

+  install(DIRECTORY ${DEVLIBS_PATH}/python

+    DESTINATION ${CMAKE_INSTALL_PREFIX}

+    PATTERN "python/include" EXCLUDE

+    PATTERN "python/libs" EXCLUDE

+    PATTERN "*.pyc" EXCLUDE)

+endif()
\ No newline at end of file
diff --git a/CMakeScripts/Modules/Findyaml.cmake b/CMakeScripts/Modules/Findyaml.cmake
new file mode 100644
index 000000000..154f2ed43
--- /dev/null
+++ b/CMakeScripts/Modules/Findyaml.cmake
@@ -0,0 +1,49 @@
+# - Try to find the YAML library
+# Once done this will define
+#
+#  YAML_FOUND - system has yaml
+#  YAML_INCLUDE_DIR - the yaml include directory
+#  YAML_LIBRARIES - the libraries needed to use yaml
+
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
+    # in cache already
+    SET(YAML_FOUND TRUE)
+else (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
+    IF (NOT WIN32)
+		FIND_PACKAGE(PkgConfig)
+        IF (PKG_CONFIG_FOUND)
+            # use pkg-config to get the directories and then use these values
+            # in the FIND_PATH() and FIND_LIBRARY() calls
+            pkg_check_modules(_YAML_PC QUIET yaml-1)
+        ENDIF (PKG_CONFIG_FOUND)
+    ENDIF (NOT WIN32)
+
+    FIND_PATH(YAML_INCLUDE_DIR yaml.h
+        /usr/include
+        /usr/local/include
+    )
+
+    FIND_LIBRARY(YAML_LIBRARIES NAMES yaml
+        PATHS)
+
+    if (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
+        set(YAML_FOUND TRUE)
+    endif (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
+
+
+    if (YAML_FOUND)
+        if (NOT YAML_FIND_QUIETLY)
+            message(STATUS "Found YAML: ${YAML_LIBRARIES}")
+        endif (NOT YAML_FIND_QUIETLY)
+    else (YAML_FOUND)
+        if (YAML_FIND_REQUIRED)
+            message(FATAL_ERROR "Could NOT find YAML")
+        endif (YAML_FIND_REQUIRED)
+    endif (YAML_FOUND)
+
+    MARK_AS_ADVANCED(YAML_INCLUDE_DIR YAML_LIBRARIES)
+
+endif (YAML_INCLUDE_DIR AND YAML_LIBRARIES)
diff --git a/CMakeScripts/Pod2man.cmake b/CMakeScripts/Pod2man.cmake
index 3189192de..21010fb33 100644
--- a/CMakeScripts/Pod2man.cmake
+++ b/CMakeScripts/Pod2man.cmake
@@ -28,10 +28,12 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
             set(MANPAGE_TARGET "man-${NAME}-${LANG}")
             set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${LANG}.tmp")
             set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${LANG}.${SECTION}")
+            set(MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/${LANG}/man${SECTION}")
         else()
             set(MANPAGE_TARGET "man-${NAME}")
             set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.tmp")
             set(MANFILE_FULL "${CMAKE_CURRENT_BINARY_DIR}/man/${NAME}.${SECTION}")
+            set(MANFILE_DEST "${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION}")
         endif()
         add_custom_command(
             OUTPUT ${MANFILE_TEMP}
@@ -48,7 +50,8 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
         )
         install(
             FILES ${MANFILE_FULL}
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION}
+            RENAME ${NAME}.${SECTION}
+            DESTINATION ${MANFILE_DEST}
         )
     endif()
 endmacro(pod2man PODFILE NAME SECTION CENTER)
diff --git a/CMakeScripts/cmake_consistency_check.py b/CMakeScripts/cmake_consistency_check.py
index 53026910e..64419936b 100755
--- a/CMakeScripts/cmake_consistency_check.py
+++ b/CMakeScripts/cmake_consistency_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # $Id: cmake_consistency_check.py 38869 2011-07-31 03:15:37Z campbellbarton $
 # ***** BEGIN GPL LICENSE BLOCK *****
@@ -23,13 +23,22 @@
 
 # <pep8 compliant>
 
-from cmake_consistency_check_config import IGNORE, UTF8_CHECK, SOURCE_DIR
+import sys
+if not sys.version.startswith("3"):
+    print("\nPython3.x needed, found %s.\nAborting!\n" %
+          sys.version.partition(" ")[0])
+    sys.exit(1)
+
+from cmake_consistency_check_config import (
+    IGNORE,
+    UTF8_CHECK,
+    SOURCE_DIR,
+)
+
 
 import os
 from os.path import join, dirname, normpath, splitext
 
-print("Scanning:", SOURCE_DIR)
-
 global_h = set()
 global_c = set()
 global_refs = {}
@@ -53,7 +62,7 @@ def replace_line(f, i, text, keep_indent=True):
 def source_list(path, filename_check=None):
     for dirpath, dirnames, filenames in os.walk(path):
 
-        # skip '.svn'
+        # skip '.bzr'
         if dirpath.startswith("."):
             continue
 
@@ -70,12 +79,12 @@ def is_cmake(filename):
 
 def is_c_header(filename):
     ext = splitext(filename)[1]
-    return (ext in (".h", ".hpp", ".hxx"))
+    return (ext in {".h", ".hpp", ".hxx", ".hh"})
 
 
 def is_c(filename):
     ext = splitext(filename)[1]
-    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+    return (ext in {".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"})
 
 
 def is_c_any(filename):
@@ -87,13 +96,16 @@ def cmake_get_src(f):
     sources_h = []
     sources_c = []
 
-    filen = open(f, "r")
+    filen = open(f, "r", encoding="utf8")
     it = iter(filen)
     found = False
     i = 0
     # print(f)
 
     def is_definition(l, f, i, name):
+        if l.startswith("unset("):
+            return False
+
         if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)):
             if len(l.split()) > 1:
                 raise Exception("strict formatting not kept 'set(%s*' %s:%d" % (name, f, i))
@@ -146,6 +158,7 @@ def cmake_get_src(f):
 
                     # replace dirs
                     l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
+                    l = l.strip('"')
 
                     if not l:
                         pass
@@ -166,13 +179,21 @@ def cmake_get_src(f):
                             elif is_c(new_file):
                                 sources_c.append(new_file)
                                 global_refs.setdefault(new_file, []).append((f, i))
-                            elif l in ("PARENT_SCOPE", ):
+                            elif l in {"PARENT_SCOPE", }:
                                 # cmake var, ignore
                                 pass
                             elif new_file.endswith(".list"):
                                 pass
                             elif new_file.endswith(".def"):
                                 pass
+                            elif new_file.endswith(".cl"):  # opencl
+                                pass
+                            elif new_file.endswith(".cu"):  # cuda
+                                pass
+                            elif new_file.endswith(".osl"):  # open shading language
+                                pass
+                            elif new_file.endswith(".glsl"):
+                                pass
                             else:
                                 raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
 
@@ -183,11 +204,11 @@ def cmake_get_src(f):
                                 if new_path_rel != l:
                                     print("overly relative path:\n  %s:%d\n  %s\n  %s" % (f, i, l, new_path_rel))
 
-                                    ## Save time. just replace the line
+                                    # # Save time. just replace the line
                                     # replace_line(f, i - 1, new_path_rel)
 
                             else:
-                                raise Exception("non existant include %s:%d -> %s" % (f, i, new_file))
+                                raise Exception("non existent include %s:%d -> %s" % (f, i, new_file))
 
                         # print(new_file)
 
@@ -208,90 +229,103 @@ def cmake_get_src(f):
             '''
 
             # reset
-            sources_h[:] = []
-            sources_c[:] = []
+            del sources_h[:]
+            del sources_c[:]
 
     filen.close()
 
 
-for cmake in source_list(SOURCE_DIR, is_cmake):
-    cmake_get_src(cmake)
-
-
-def is_ignore(f):
-    for ig in IGNORE:
+def is_ignore(f, ignore_used):
+    for index, ig in enumerate(IGNORE):
         if ig in f:
+            ignore_used[index] = True
             return True
     return False
 
 
-# First do stupid check, do these files exist?
-print("\nChecking for missing references:")
-is_err = False
-errs = []
-for f in (global_h | global_c):
-    if f.endswith("dna.c"):
-        continue
-
-    if not os.path.exists(f):
-        refs = global_refs[f]
-        if refs:
-            for cf, i in refs:
-                errs.append((cf, i))
-        else:
-            raise Exception("CMake referenecs missing, internal error, aborting!")
-        is_err = True
-
-errs.sort()
-errs.reverse()
-for cf, i in errs:
-    print("%s:%d" % (cf, i))
-    # Write a 'sed' script, useful if we get a lot of these
-    # print("sed '%dd' '%s' > '%s.tmp' ; mv '%s.tmp' '%s'" % (i, cf, cf, cf, cf))
-
-
-if is_err:
-    raise Exception("CMake referenecs missing files, aborting!")
-del is_err
-del errs
-
-# now check on files not accounted for.
-print("\nC/C++ Files CMake doesnt know about...")
-for cf in sorted(source_list(SOURCE_DIR, is_c)):
-    if not is_ignore(cf):
-        if cf not in global_c:
-            print("missing_c: ", cf)
-
-        # check if automake builds a corrasponding .o file.
-        '''
-        if cf in global_c:
-            out1 = os.path.splitext(cf)[0] + ".o"
-            out2 = os.path.splitext(cf)[0] + ".Po"
-            out2_dir, out2_file = out2 = os.path.split(out2)
-            out2 = os.path.join(out2_dir, ".deps", out2_file)
-            if not os.path.exists(out1) and not os.path.exists(out2):
-                print("bad_c: ", cf)
-        '''
-
-print("\nC/C++ Headers CMake doesnt know about...")
-for hf in sorted(source_list(SOURCE_DIR, is_c_header)):
-    if not is_ignore(hf):
-        if hf not in global_h:
-            print("missing_h: ", hf)
-
-if UTF8_CHECK:
-    # test encoding
-    import traceback
-    for files in (global_c, global_h):
-        for f in sorted(files):
-            if os.path.exists(f):
-                # ignore outside of our source tree
-                if "extern" not in f:
-                    i = 1
-                    try:
-                        for l in open(f, "r", encoding="utf8"):
-                            i += 1
-                    except:
-                        print("Non utf8: %s:%d" % (f, i))
-                        if i > 1:
-                            traceback.print_exc()
+def main():
+
+    print("Scanning:", SOURCE_DIR)
+
+    for cmake in source_list(SOURCE_DIR, is_cmake):
+        cmake_get_src(cmake)
+
+    # First do stupid check, do these files exist?
+    print("\nChecking for missing references:")
+    is_err = False
+    errs = []
+    for f in (global_h | global_c):
+
+        if not os.path.exists(f):
+            refs = global_refs[f]
+            if refs:
+                for cf, i in refs:
+                    errs.append((cf, i))
+            else:
+                raise Exception("CMake referenecs missing, internal error, aborting!")
+            is_err = True
+
+    errs.sort()
+    errs.reverse()
+    for cf, i in errs:
+        print("%s:%d" % (cf, i))
+        # Write a 'sed' script, useful if we get a lot of these
+        # print("sed '%dd' '%s' > '%s.tmp' ; mv '%s.tmp' '%s'" % (i, cf, cf, cf, cf))
+
+    if is_err:
+        raise Exception("CMake referenecs missing files, aborting!")
+    del is_err
+    del errs
+
+    ignore_used = [False] * len(IGNORE)
+
+    # now check on files not accounted for.
+    print("\nC/C++ Files CMake doesnt know about...")
+    for cf in sorted(source_list(SOURCE_DIR, is_c)):
+        if not is_ignore(cf, ignore_used):
+            if cf not in global_c:
+                print("missing_c: ", cf)
+
+            # check if automake builds a corrasponding .o file.
+            '''
+            if cf in global_c:
+                out1 = os.path.splitext(cf)[0] + ".o"
+                out2 = os.path.splitext(cf)[0] + ".Po"
+                out2_dir, out2_file = out2 = os.path.split(out2)
+                out2 = os.path.join(out2_dir, ".deps", out2_file)
+                if not os.path.exists(out1) and not os.path.exists(out2):
+                    print("bad_c: ", cf)
+            '''
+
+    print("\nC/C++ Headers CMake doesnt know about...")
+    for hf in sorted(source_list(SOURCE_DIR, is_c_header)):
+        if not is_ignore(hf, ignore_used):
+            if hf not in global_h:
+                print("missing_h: ", hf)
+
+    if UTF8_CHECK:
+        # test encoding
+        import traceback
+        for files in (global_c, global_h):
+            for f in sorted(files):
+                if os.path.exists(f):
+                    # ignore outside of our source tree
+                    if "extern" not in f:
+                        i = 1
+                        try:
+                            for l in open(f, "r", encoding="utf8"):
+                                i += 1
+                        except UnicodeDecodeError:
+                            print("Non utf8: %s:%d" % (f, i))
+                            if i > 1:
+                                traceback.print_exc()
+
+    # Check ignores aren't stale
+    print("\nCheck for unused 'IGNORE' paths...")
+    for index, ig in enumerate(IGNORE):
+        if not ignore_used[index]:
+            print("unused ignore: %r" % ig)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake
index 2155e0013..11316101f 100644
--- a/CMakeScripts/inkscape-version.cmake
+++ b/CMakeScripts/inkscape-version.cmake
@@ -7,13 +7,23 @@
 
 # We should extract the version from build.xml
 # but for now just hard code
+
 set(INKSCAPE_REVISION "unknown")
+set(INKSCAPE_CUSTOM "custom")
 
 if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/)
     execute_process(COMMAND
 	bzr revno --tree ${INKSCAPE_SOURCE_DIR}
 	OUTPUT_VARIABLE INKSCAPE_REVISION
 	OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    execute_process(COMMAND
+        bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src
+        OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "")
+        set(INKSCAPE_REVISION ${INKSCAPE_REVISION} " " ${INKSCAPE_CUSTOM})
+    endif()
 endif()
 message("revision is " ${INKSCAPE_REVISION})