Updating to master

6 files changed, 5 insertions, 44 deletions

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 3d986d8dd..04c077026 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -13,35 +13,21 @@ include(CheckStructHasMember)
 set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS})
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS})
 
-CHECK_INCLUDE_FILE_CXX(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP)
 CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF)
 CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR)
 CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK)
-CHECK_INCLUDE_FILES(gc/gc.h HAVE_GC_GC_H)
-CHECK_INCLUDE_FILES(gc.h HAVE_GC_H)
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
-CHECK_FUNCTION_EXISTS(gtk_window_fullscreen HAVE_GTK_WINDOW_FULLSCREEN)
-CHECK_FUNCTION_EXISTS(gtk_window_set_default_icon_from_file HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE)
 CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H)
 CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES)
-CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H)
-CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)
 CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H)
 CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)
 CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H)
 CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
 CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H)
 CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)
-CHECK_FUNCTION_EXISTS(mkdir HAVE_MKDIR)
 CHECK_FUNCTION_EXISTS(pow HAVE_POW)
 CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT)
-CHECK_INCLUDE_FILES(stddef.h HAVE_STDDEF_H)
 CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)
-CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H)
-CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)
-CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)
-CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP)
 CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)
 CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)
 CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN)
@@ -52,14 +38,10 @@ CHECK_STRUCT_HAS_MEMBER(fsmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_FSMBLKS)
 CHECK_STRUCT_HAS_MEMBER(hblkhd mallinfo malloc.h HAVE_STRUCT_MALLINFO_HBLKHD)
 CHECK_STRUCT_HAS_MEMBER(uordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_UORDBLKS)
 CHECK_STRUCT_HAS_MEMBER(usmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_USMBLKS)
-CHECK_INCLUDE_FILES(sys/filio.h HAVE_SYS_FILIO_H)
 CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)
 CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)
-CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)
-
-CHECK_INCLUDE_FILE_CXX(unordered_set HAVE_NATIVE_UNORDERED_SET)
 
 # Enable pango defines, necessary for compilation on Win32, how about Linux?
 # yes but needs to be done a better way
diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake
index dd4e7e10c..1c4a64b39 100644
--- a/CMakeScripts/ConfigEnv.cmake
+++ b/CMakeScripts/ConfigEnv.cmake
@@ -47,8 +47,4 @@ if(APPLE)
   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()

diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index de053c4d8..f62d14c4e 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -7,7 +7,7 @@ if(WIN32)
   endif()
   
   set(INKSCAPE_LIBDIR "\\\\lib")
-  set(INKSCAPE_DATADIR "")
+  set(INKSCAPE_DATADIR "") # can be set via the evironment variable INKSCAPE_DATADIR at runtime
   
   set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale")
   
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 8cc0f0cd9..52410fb2b 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -45,7 +45,6 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED
 	          pangocairo
 		  pangoft2
 		  fontconfig
-		  gthread-2.0
 		  gsl
 		  gmodule-2.0)
 
@@ -57,18 +56,6 @@ 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(APPLE)
-    if(${GTK+_2.0_TARGET} MATCHES "x11")
-    pkg_check_modules(x11 REQUIRED x11)
-    list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS})
-    endif()
-elseif(WIN32)
-# X11 not available on windows
-else()
-    pkg_check_modules(x11 REQUIRED x11)
-    list(APPEND INKSCAPE_LIBS ${x11_LDFLAGS})
-
-endif()
 
 if(WITH_GNOME_VFS)
     find_package(GnomeVFS2)
@@ -299,11 +286,7 @@ set(TRY_GTKSPELL ON)
         ${GTKSPELL3_LIBRARIES}
     )
 
-find_package(Freetype REQUIRED)
-list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS})
-list(APPEND INKSCAPE_LIBS ${FREETYPE_LIBRARIES})
-
-find_package(Boost REQUIRED)
+find_package(Boost 1.19.0 REQUIRED)
 list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS})
 # list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES})
 
diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake
index 782161dc2..a188ba2c9 100644
--- a/CMakeScripts/Install.cmake
+++ b/CMakeScripts/Install.cmake
@@ -10,7 +10,7 @@ if(WIN32)
     AUTHORS

     COPYING

     NEWS

-    README

+    README.md

     TRANSLATORS

 	GPL2.txt

 	GPL3.txt

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index dcdc738a0..65ced10e2 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -3,7 +3,7 @@ if(WIN32)
     AUTHORS

     COPYING

     NEWS

-    README

+    README.md

     TRANSLATORS

 	GPL2.txt

 	GPL3.txt

@@ -84,7 +84,7 @@ if(WIN32)
     ${MINGW_BIN}/libplc4.dll

     ${MINGW_BIN}/libplds4.dll

     ${MINGW_BIN}/libpng16-16.dll

-    ${MINGW_BIN}/libpoppler-66.dll

+    ${MINGW_BIN}/libpoppler-67.dll

     ${MINGW_BIN}/libpoppler-glib-8.dll

     ${MINGW_BIN}/libpopt-0.dll

     ${MINGW_BIN}/libpotrace-0.dll