Merge branch 'master' into shortcuts

4 files changed, 132 insertions, 10 deletions

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 52410fb2b..46fbe7568 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -1,4 +1,3 @@
-
 set(INKSCAPE_LIBS "")
 set(INKSCAPE_INCS "")
 set(INKSCAPE_INCS_SYS "")
@@ -46,17 +45,20 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED
 		  pangoft2
 		  fontconfig
 		  gsl
-		  gmodule-2.0)
+		  gmodule-2.0
+		  libsoup-2.4>=2.42)
 
 list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS})
 list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LIBRARIES})
+
 add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER})
 
 if(APPLE AND DEFINED ENV{CMAKE_PREFIX_PATH})
     list(APPEND INKSCAPE_LIBS "-L$ENV{CMAKE_PREFIX_PATH}/lib")
 endif()
 
+
 if(WITH_GNOME_VFS)
     find_package(GnomeVFS2)
     if(GNOMEVFS2_FOUND)
@@ -67,6 +69,11 @@ if(WITH_GNOME_VFS)
     endif()
 endif()
 
+find_package(JeMalloc)
+if (JEMALLOC_FOUND)
+	list(APPEND INKSCAPE_LIBS ${JEMALLOC_LIBRARIES})
+endif()
+
 if(ENABLE_LCMS)
     unset(HAVE_LIBLCMS1)
     unset(HAVE_LIBLCMS2)
@@ -258,6 +265,42 @@ set(TRY_GTKSPELL ON)
         set (WITH_GTKMM_3_10 ON)
     endif()
 
+    # Check whether we can use new features in Gtkmm 3.12
+    # TODO: Drop this test and bump the version number in the GTK test above
+    #       as soon as all supported distributions provide Gtkmm >= 3.12
+    pkg_check_modules(GTKMM_3_12
+	gtkmm-3.0>=3.12,
+	)
+
+    if("${GTKMM_3_12_FOUND}")
+        message("Using Gtkmm 3.12 build")
+        set (WITH_GTKMM_3_12 ON)
+    endif()
+
+    # Check whether we can use new features in Gtkmm 3.16
+    # TODO: Drop this test and bump the version number in the GTK test above
+    #       as soon as all supported distributions provide Gtkmm >= 3.16
+    pkg_check_modules(GTKMM_3_16
+	gtkmm-3.0>=3.16,
+	)
+
+    if("${GTKMM_3_16_FOUND}")
+        message("Using Gtkmm 3.16 build")
+        set (WITH_GTKMM_3_16 ON)
+    endif()
+
+    # Check whether we can use new features in Gtkmm 3.22
+    # TODO: Drop this test and bump the version number in the GTK test above
+    #       as soon as all supported distributions provide Gtkmm >= 3.22
+    pkg_check_modules(GTKMM_3_22
+	gtkmm-3.0>=3.22,
+	)
+
+    if("${GTKMM_3_22_FOUND}")
+        message("Using Gtkmm 3.22 build")
+        set (WITH_GTKMM_3_22 ON)
+    endif()
+
     pkg_check_modules(GDL_3_6 gdl-3.0>=3.6)
 
     if("${GDL_3_6_FOUND}")
@@ -337,7 +380,7 @@ list(APPEND INKSCAPE_INCS_SYS ${ZLIB_INCLUDE_DIRS})
 list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES})
 
 if(WITH_IMAGE_MAGICK)
-    pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ )
+    pkg_check_modules(ImageMagick ImageMagick++ )
     if(ImageMagick_FOUND)
 
         list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS})
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 65ced10e2..5ef2db3b8 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -92,6 +92,8 @@ if(WIN32)
     ${MINGW_BIN}/librevenge-stream-0.0.dll

     ${MINGW_BIN}/librtmp-1.dll

     ${MINGW_BIN}/libsigc-2.0-0.dll

+    ${MINGW_BIN}/libsoup-2.4-1.dll

+    ${MINGW_BIN}/libsqlite3-0.dll

     ${MINGW_BIN}/libssh2-1.dll

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

     ${MINGW_BIN}/libtasn1-6.dll

@@ -114,7 +116,7 @@ if(WIN32)
     # required by python2-lxml

     ${MINGW_BIN}/libexslt-0.dll

     # required by python2-numpy

-    ${MINGW_BIN}/libgfortran-3.dll

+    ${MINGW_BIN}/libgfortran-4.dll

     ${MINGW_BIN}/libopenblas.dll

     ${MINGW_BIN}/libquadmath-0.dll

     DESTINATION .)

diff --git a/CMakeScripts/Modules/FindJeMalloc.cmake b/CMakeScripts/Modules/FindJeMalloc.cmake
new file mode 100644
index 000000000..5c7aa2cf1
--- /dev/null
+++ b/CMakeScripts/Modules/FindJeMalloc.cmake
@@ -0,0 +1,70 @@
+# - Find JeMalloc library
+# Find the native JeMalloc includes and library
+# This module defines
+#  JEMALLOC_INCLUDE_DIRS, where to find jemalloc.h, Set when
+#                        JEMALLOC_INCLUDE_DIR is found.
+#  JEMALLOC_LIBRARIES, libraries to link against to use JeMalloc.
+#  JEMALLOC_ROOT_DIR, The base directory to search for JeMalloc.
+#                    This can also be an environment variable.
+#  JEMALLOC_FOUND, If false, do not try to use JeMalloc.
+#
+# also defined, but not for general use are
+#  JEMALLOC_LIBRARY, where to find the JeMalloc library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# If JEMALLOC_ROOT_DIR was defined in the environment, use it.
+IF(NOT JEMALLOC_ROOT_DIR AND NOT $ENV{JEMALLOC_ROOT_DIR} STREQUAL "")
+  SET(JEMALLOC_ROOT_DIR $ENV{JEMALLOC_ROOT_DIR})
+ENDIF()
+
+SET(_jemalloc_SEARCH_DIRS
+  ${JEMALLOC_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+)
+
+FIND_PATH(JEMALLOC_INCLUDE_DIR
+  NAMES
+    jemalloc.h
+  HINTS
+    ${_jemalloc_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include/jemalloc
+)
+
+FIND_LIBRARY(JEMALLOC_LIBRARY
+  NAMES
+    jemalloc
+  HINTS
+    ${_jemalloc_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
+# handle the QUIETLY and REQUIRED arguments and set JEMALLOC_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(JeMalloc DEFAULT_MSG
+    JEMALLOC_LIBRARY JEMALLOC_INCLUDE_DIR)
+
+IF(JEMALLOC_FOUND)
+  SET(JEMALLOC_LIBRARIES ${JEMALLOC_LIBRARY})
+  SET(JEMALLOC_INCLUDE_DIRS ${JEMALLOC_INCLUDE_DIR})
+ENDIF(JEMALLOC_FOUND)
+
+MARK_AS_ADVANCED(
+  JEMALLOC_INCLUDE_DIR
+  JEMALLOC_LIBRARY
+)
diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake
index 2e23925c4..40c1c4364 100644
--- a/CMakeScripts/inkscape-version.cmake
+++ b/CMakeScripts/inkscape-version.cmake
@@ -11,14 +11,21 @@
 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)
+if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git)
+
+    execute_process(COMMAND git describe
+        WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR}
+        OUTPUT_VARIABLE INKSCAPE_REV1
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND git log -n 1 --pretty=%ad --date=short
+        WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR}
+        OUTPUT_VARIABLE INKSCAPE_REV2
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set(INKSCAPE_REVISION "${INKSCAPE_REV1} ${INKSCAPE_REV2}")
 
     execute_process(COMMAND
-        bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src
+        git status -s ${INKSCAPE_SOURCE_DIR}/src
+        WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR}
         OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED
         OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "")