From fa8a2ee7e2539b145a87ac9af0d9748effa91631 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Tue, 27 Jun 2017 15:03:58 +0200 Subject: GdkScreen deprecation fixes --- CMakeScripts/DefineDependsandFlags.cmake | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 52410fb2b..1fead418a 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -258,6 +258,18 @@ set(TRY_GTKSPELL ON) set (WITH_GTKMM_3_10 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}") -- cgit v1.2.3 From 47d4199fcf2b032a02bf23c80c3b2c9f3155c5c5 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Thu, 29 Jun 2017 18:13:30 +0200 Subject: aboutbox: Gtk3 fixes --- CMakeScripts/DefineDependsandFlags.cmake | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 1fead418a..a98ebcf2b 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -258,6 +258,30 @@ 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 -- cgit v1.2.3 From e4ed7cef32c637af1466b6b41d77a246576ce9b7 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 30 Jun 2017 14:15:54 +0200 Subject: Fix revno --- CMakeScripts/inkscape-version.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 2e23925c4..65903c47b 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -11,14 +11,14 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") -if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) +if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) execute_process(COMMAND - bzr revno --tree ${INKSCAPE_SOURCE_DIR} + git describe ${INKSCAPE_SOURCE_DIR} OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND - bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src + git status -s ${INKSCAPE_SOURCE_DIR}/src OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED OUTPUT_STRIP_TRAILING_WHITESPACE) if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "") -- cgit v1.2.3 From a90a18e6e5ac6a8d12d12043419e86e22d016efa Mon Sep 17 00:00:00 2001 From: "chr[]" Date: Fri, 30 Jun 2017 15:02:50 +0200 Subject: Replace ImageMagic with GraphicsMagic ... just a matter of taste. But both wanna be initialized: fixed. --- CMakeScripts/DefineDependsandFlags.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index a98ebcf2b..981598527 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -373,7 +373,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}) -- cgit v1.2.3 From d6f2d85a424751ac9dd468949a950ecc46148ff2 Mon Sep 17 00:00:00 2001 From: "chr[]" Date: Fri, 30 Jun 2017 15:08:14 +0200 Subject: jemalloc cmake module (shamelessly stolen from Blender) libstdc++ memory allocator is broken: "Notes about deallocation. This allocator does not explicitly release memory." The story: https://www.zerotier.com/blog/2017-05-05-theleak.shtml The solution?! http://jemalloc.net/ No need to recompile, just install it and a simple test run: LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libjemalloc.so.1 inkscape --- CMakeScripts/DefineDependsandFlags.cmake | 5 +++ CMakeScripts/Modules/FindJeMalloc.cmake | 70 ++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 CMakeScripts/Modules/FindJeMalloc.cmake (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 981598527..0a8782f27 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -67,6 +67,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) 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 +) -- cgit v1.2.3 From 7811297f0ad86acaad0477096dd919f51e18b3e7 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 30 Jun 2017 15:20:13 +0200 Subject: Fix revno with git --- CMakeScripts/inkscape-version.cmake | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 65903c47b..12b8a26d8 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -12,10 +12,18 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) - execute_process(COMMAND - git describe ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE) + + execute_process(COMMAND git describe + COMMAND tr "\n" " " + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} + OUTPUT_VARIABLE INKSCAPE_REV1) + execute_process(COMMAND git show --format=format:%ad --date=short + COMMAND head -n 1 + COMMAND tr "\n" " " + WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} + OUTPUT_VARIABLE INKSCAPE_REV2 + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(INKSCAPE_REVISION ${INKSCAPE_REV1} ${INKSCAPE_REV2}) execute_process(COMMAND git status -s ${INKSCAPE_SOURCE_DIR}/src -- cgit v1.2.3 From c666dd26e5ff8d4dd9381bff5c2e954ae330fc15 Mon Sep 17 00:00:00 2001 From: su-v Date: Sat, 1 Jul 2017 16:51:03 +0200 Subject: Fix version strings to work on windows & unix --- CMakeScripts/inkscape-version.cmake | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 12b8a26d8..9ffa7f8c7 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -14,19 +14,18 @@ set(INKSCAPE_CUSTOM "custom") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) execute_process(COMMAND git describe - COMMAND tr "\n" " " WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} - OUTPUT_VARIABLE INKSCAPE_REV1) - execute_process(COMMAND git show --format=format:%ad --date=short - COMMAND head -n 1 - COMMAND tr "\n" " " + 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_VARIABLE INKSCAPE_REV2 OUTPUT_STRIP_TRAILING_WHITESPACE) - set(INKSCAPE_REVISION ${INKSCAPE_REV1} ${INKSCAPE_REV2}) + set(INKSCAPE_REVISION "${INKSCAPE_REV1} ${INKSCAPE_REV2}") execute_process(COMMAND 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 "") -- cgit v1.2.3 From 17a2658452a2ffb0053a4a720a053cfcbf29c42c Mon Sep 17 00:00:00 2001 From: su-v Date: Tue, 4 Jul 2017 09:28:16 +0200 Subject: Update InstallMSYS2.cmake for latest libgfortran --- CMakeScripts/InstallMSYS2.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 65ced10e2..8ada439c1 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -114,7 +114,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 .) -- cgit v1.2.3 From b264288033bb76311556258914f1ddc043c922e7 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Thu, 6 Jul 2017 00:20:19 -0400 Subject: Add new libsoup based http access with caching and async --- CMakeScripts/DefineDependsandFlags.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 0a8782f27..79944309a 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -46,17 +46,20 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED pangoft2 fontconfig gsl - gmodule-2.0) + gmodule-2.0 + libsoup-2.4) 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) -- cgit v1.2.3 From 188bbd799746fc05de9c18a0957793323f747178 Mon Sep 17 00:00:00 2001 From: su-v Date: Thu, 6 Jul 2017 10:20:40 +0200 Subject: Update MSYS2 port for new dependency (libsoup) - update script to install dependencies - update InstallMSYS2.cmake - fix Windows builds (uint -> unsigned int) --- CMakeScripts/InstallMSYS2.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index 8ada439c1..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 -- cgit v1.2.3 From 161b8f90ce12a576bc7a46a8a274625923613e5d Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Thu, 6 Jul 2017 16:48:17 +0200 Subject: http: Migrate to new LibSoup API --- CMakeScripts/DefineDependsandFlags.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 79944309a..6d87846e9 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -47,7 +47,7 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED fontconfig gsl gmodule-2.0 - libsoup-2.4) + libsoup-2.4 >= 2.42) list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS}) list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS}) -- cgit v1.2.3 From 5198e38c82379f7b87f5cd964d565821a5786a49 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Thu, 6 Jul 2017 18:58:45 +0000 Subject: Fix DefineDependsandFlags.cmake (remove spaces in pkg_check_modules) --- CMakeScripts/DefineDependsandFlags.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 6d87846e9..46fbe7568 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -1,4 +1,3 @@ - set(INKSCAPE_LIBS "") set(INKSCAPE_INCS "") set(INKSCAPE_INCS_SYS "") @@ -47,7 +46,7 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED fontconfig gsl gmodule-2.0 - libsoup-2.4 >= 2.42) + libsoup-2.4>=2.42) list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS}) list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS}) -- cgit v1.2.3 From 472ec43a01427a59e82600055ebeb2bfe4be3adc Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 8 Jul 2017 14:54:33 +0200 Subject: cmake: fix inkscape-version for linked worktrees (they don't have a '.git/' directory, but only a '.git' file storing the link to the gitdir) --- CMakeScripts/inkscape-version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake index 9ffa7f8c7..40c1c4364 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -11,7 +11,7 @@ set(INKSCAPE_REVISION "unknown") set(INKSCAPE_CUSTOM "custom") -if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/) +if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git) execute_process(COMMAND git describe WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR} -- cgit v1.2.3