Merge branch 'master' into powerpencil

4 files changed, 5 insertions, 102 deletions

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 46fbe7568..b1ffbc9c8 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -59,16 +59,6 @@ if(APPLE AND DEFINED ENV{CMAKE_PREFIX_PATH})
 endif()
 
 
-if(WITH_GNOME_VFS)
-    find_package(GnomeVFS2)
-    if(GNOMEVFS2_FOUND)
-	list(APPEND INKSCAPE_INCS_SYS ${GNOMEVFS2_INCLUDE_DIR})
-	list(APPEND INKSCAPE_LIBS ${GNOMEVFS-2_LIBRARY})
-    else()
-	set(WITH_GNOME_VFS OFF)
-    endif()
-endif()
-
 find_package(JeMalloc)
 if (JEMALLOC_FOUND)
 	list(APPEND INKSCAPE_LIBS ${JEMALLOC_LIBRARIES})
@@ -131,6 +121,10 @@ if(ENABLE_POPPLER)
 		POPPLER_VERSION VERSION_EQUAL   "0.29.0")
 	    set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
 	endif()
+	if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
+		POPPLER_VERSION VERSION_EQUAL   "0.58.0")
+            set(POPPLER_NEW_OBJECT_API ON)
+	endif()
     else()
 	set(ENABLE_POPPLER_CAIRO OFF)
     endif()
diff --git a/CMakeScripts/HelperMacros.cmake b/CMakeScripts/HelperMacros.cmake
index a0bdd9866..54bbf9d09 100644
--- a/CMakeScripts/HelperMacros.cmake
+++ b/CMakeScripts/HelperMacros.cmake
@@ -29,7 +29,7 @@ macro(add_inkscape_lib
 	name
 	sources)
 
-    add_library(${name} ${sources})
+    add_library(${name} STATIC ${sources})
 
     # works fine without having the includes
     # listed is helpful for IDE's (QtCreator/MSVC)
diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index c7ce5b2e6..a192f459f 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -66,7 +66,6 @@ if(WIN32)
     ${MINGW_BIN}/libicudt[0-9]*.dll

     ${MINGW_BIN}/libicuin[0-9]*.dll

     ${MINGW_BIN}/libicuuc[0-9]*.dll

-    ${MINGW_BIN}/libidn-[0-9]*.dll

     ${MINGW_BIN}/libidn2-[0-9]*.dll

     ${MINGW_BIN}/libintl-[0-9]*.dll

     ${MINGW_BIN}/libjpeg-[0-9]*.dll

diff --git a/CMakeScripts/Modules/FindGnomeVFS2.cmake b/CMakeScripts/Modules/FindGnomeVFS2.cmake
deleted file mode 100644
index d942addac..000000000
--- a/CMakeScripts/Modules/FindGnomeVFS2.cmake
+++ /dev/null
@@ -1,90 +0,0 @@
-# - Try to find GnomeVFS2
-# Once done this will define
-#
-#  GNOMEVFS2_FOUND - system has GnomeVFS2
-#  GNOMEVFS2_INCLUDE_DIRS - the GnomeVFS2 include directory
-#  GNOMEVFS2_LIBRARIES - Link these to use GnomeVFS2
-#  GNOMEVFS2_DEFINITIONS - Compiler switches required for using GnomeVFS2
-#
-#  Copyright (c) 2008 Joshua L. Blocher <verbalshadow@gmail.com>
-#
-#  Redistribution and use is allowed according to the terms of the New
-#  BSD license.
-#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-
-if (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)
-  # in cache already
-  set(GNOMEVFS2_FOUND TRUE)
-else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)
-  # use pkg-config to get the directories and then use these values
-  # in the FIND_PATH() and FIND_LIBRARY() calls
-  if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    include(UsePkgConfig)
-    pkgconfig(gnome-vfs-2.0 _GNOMEVFS2_INCLUDEDIR _GNOMEVFS2_LIBDIR _GNOMEVFS2_LDFLAGS _GNOMEVFS2_CFLAGS)
-  else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-    find_package(PkgConfig)
-    if (PKG_CONFIG_FOUND)
-      pkg_check_modules(_GNOMEVFS2 gnome-vfs-2.0)
-    endif (PKG_CONFIG_FOUND)
-  endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
-  find_path(GNOMEVFS2_INCLUDE_DIR
-    NAMES
-      libgnomevfs/gnome-vfs.h
-    PATHS
-      ${_GNOMEVFS2_INCLUDEDIR}
-      /usr/include
-      /usr/local/include
-      /opt/local/include
-      /sw/include
-      $ENV{DEVLIBS_PATH}//include//
-    PATH_SUFFIXES
-      gnome-vfs-2.0
-  )
-
-  find_library(GNOMEVFS-2_LIBRARY
-    NAMES
-      gnomevfs-2
-    PATHS
-      ${_GNOMEVFS2_LIBDIR}
-      /usr/lib
-      /usr/local/lib
-      /opt/local/lib
-      /sw/lib
-  )
-
-  if (GNOMEVFS-2_LIBRARY)
-    set(GNOMEVFS-2_FOUND TRUE)
-  endif (GNOMEVFS-2_LIBRARY)
-
-  set(GNOMEVFS2_INCLUDE_DIRS
-    ${GNOMEVFS2_INCLUDE_DIR}
-  )
-
-  if (GNOMEVFS-2_FOUND)
-    set(GNOMEVFS2_LIBRARIES
-      ${GNOMEVFS2_LIBRARIES}
-      ${GNOMEVFS-2_LIBRARY}
-    )
-  endif (GNOMEVFS-2_FOUND)
-
-  if (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES)
-     set(GNOMEVFS2_FOUND TRUE)
-  endif (GNOMEVFS2_INCLUDE_DIRS AND GNOMEVFS2_LIBRARIES)
-
-  if (GNOMEVFS2_FOUND)
-    if (NOT GnomeVFS2_FIND_QUIETLY)
-      message(STATUS "Found GnomeVFS2: ${GNOMEVFS2_LIBRARIES}")
-    endif (NOT GnomeVFS2_FIND_QUIETLY)
-  else (GNOMEVFS2_FOUND)
-    if (GnomeVFS2_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find GnomeVFS2")
-    endif (GnomeVFS2_FIND_REQUIRED)
-  endif (GNOMEVFS2_FOUND)
-
-  # show the GNOMEVFS2_INCLUDE_DIRS and GNOMEVFS2_LIBRARIES variables only in the advanced view
-  mark_as_advanced(GNOMEVFS2_INCLUDE_DIRS GNOMEVFS2_LIBRARIES)
-
-endif (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS)
-