From 8ccb359f4d190740e7c56cc5a145b5a8f67d14b3 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sat, 30 Jun 2012 21:43:45 +0200 Subject: Fix building with Poppler 0.20 (LP: #1005565) Poppler >= 0.20 has a new internal API for errors and other miscellanea. As we are abusing these internal functionalities, they broke from time to time. Fixing it for now with a new conditional build flag. This fixes https://bugs.launchpad.net/inkscape/+bug/1005565 (bzr r11518) --- CMakeScripts/DefineDependsandFlags.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index ccfff8a40..4c00057f8 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -78,6 +78,10 @@ if(POPPLER_FOUND) POPPLER_VERSION VERSION_EQUAL "0.15.1") set(POPPLER_NEW_GFXPATCH ON) endif() + if(POPPLER_VERSION VERSION_GREATER "0.20.0" OR + POPPLER_VERSION VERSION_EQUAL "0.20.0") + set(POPPLER_NEW_ERRORAPI ON) + endif() else() set(ENABLE_POPPLER_CAIRO OFF) endif() -- cgit v1.2.3 From 34e78a376c224cc0c417ebe63a44d26f4383ee0e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Aug 2012 15:49:27 +0200 Subject: update for cmake Fixed bugs: - https://launchpad.net/bugs/1033979 - https://launchpad.net/bugs/1033981 (bzr r11598) --- CMakeScripts/Modules/FindGTK2.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'CMakeScripts') diff --git a/CMakeScripts/Modules/FindGTK2.cmake b/CMakeScripts/Modules/FindGTK2.cmake index 91249b787..e986fddfd 100644 --- a/CMakeScripts/Modules/FindGTK2.cmake +++ b/CMakeScripts/Modules/FindGTK2.cmake @@ -193,6 +193,7 @@ function(_GTK2_FIND_INCLUDE_DIR _var _hdr) /usr/local/lib64 /usr/local/lib /usr/lib64 + /usr/lib/x86_64-linux-gnu /usr/lib /opt/gnome/include /opt/gnome/lib -- cgit v1.2.3 From f86f8d7dddbe62807a442d5dffada93df2f05247 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 3 Oct 2012 11:30:02 +1000 Subject: add ENABLE_POPPLER cmake build option - if you had poppler there was no way to disable it (bzr r11726) --- CMakeScripts/DefineDependsandFlags.cmake | 53 +++++++++++++++++--------------- 1 file changed, 29 insertions(+), 24 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 4c00057f8..e24cba38c 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -55,34 +55,39 @@ list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${BOEHMGC_LIBRARIES}) add_definitions(${BOEHMGC_DEFINITIONS}) -find_package(PopplerCairo) -if(POPPLER_FOUND) - set(HAVE_POPPLER ON) - if(ENABLE_POPPLER_CAIRO) - if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) - set(HAVE_POPPLER_CAIRO ON) +if(ENABLE_POPPLER) + find_package(PopplerCairo) + if(POPPLER_FOUND) + set(HAVE_POPPLER ON) + if(ENABLE_POPPLER_CAIRO) + if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) + set(HAVE_POPPLER_CAIRO ON) + endif() + if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) + set(HAVE_POPPLER_GLIB ON) + endif() endif() - if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) - set(HAVE_POPPLER_GLIB ON) + if(POPPLER_VERSION VERSION_GREATER "0.8.3" OR + POPPLER_VERSION VERSION_EQUAL "0.8.3") + set(POPPLER_NEW_GFXFONT ON) endif() - endif() - if(POPPLER_VERSION VERSION_GREATER "0.8.3" OR - POPPLER_VERSION VERSION_EQUAL "0.8.3") - set(POPPLER_NEW_GFXFONT ON) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.12.2" OR - POPPLER_VERSION VERSION_EQUAL "0.12.2") - set(POPPLER_NEW_COLOR_SPACE_API ON) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.15.1" OR - POPPLER_VERSION VERSION_EQUAL "0.15.1") - set(POPPLER_NEW_GFXPATCH ON) - endif() - if(POPPLER_VERSION VERSION_GREATER "0.20.0" OR - POPPLER_VERSION VERSION_EQUAL "0.20.0") - set(POPPLER_NEW_ERRORAPI ON) + if(POPPLER_VERSION VERSION_GREATER "0.12.2" OR + POPPLER_VERSION VERSION_EQUAL "0.12.2") + set(POPPLER_NEW_COLOR_SPACE_API ON) + endif() + if(POPPLER_VERSION VERSION_GREATER "0.15.1" OR + POPPLER_VERSION VERSION_EQUAL "0.15.1") + set(POPPLER_NEW_GFXPATCH ON) + endif() + if(POPPLER_VERSION VERSION_GREATER "0.20.0" OR + POPPLER_VERSION VERSION_EQUAL "0.20.0") + set(POPPLER_NEW_ERRORAPI ON) + endif() + else() + set(ENABLE_POPPLER_CAIRO OFF) endif() else() + set(HAVE_POPPLER OFF) set(ENABLE_POPPLER_CAIRO OFF) endif() -- cgit v1.2.3 From abfd64975f01d7093c3f795d8b49d4f6063cd2d4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 4 Oct 2012 00:52:32 +1000 Subject: fix for cmake linking, currently include some hard coded paths since their are no find modules for these libs at the moment. inkscape now builds with cmake (on my system at least) (bzr r11730) --- CMakeScripts/DefineDependsandFlags.cmake | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index e24cba38c..3a6b6c44f 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -19,14 +19,20 @@ find_package(GSL REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${GSL_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${GSL_LIBRARIES}) if (WIN32) - list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME - list(APPEND INKSCAPE_LIBS "-lgobject-2.0") # FIXME - list(APPEND INKSCAPE_LIBS "-lintl.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME - list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-L$ENV{DEVLIBS_PATH}/lib") # FIXME + list(APPEND INKSCAPE_LIBS "-lintl.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangowin32-1.0.dll") # FIXME + list(APPEND INKSCAPE_LIBS "-lgthread-2.0.dll") # FIXME +else() + list(APPEND INKSCAPE_LIBS "-ldl") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangocairo-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lpangoft2-1.0") # FIXME + list(APPEND INKSCAPE_LIBS "-lfontconfig") # FIXME + list(APPEND INKSCAPE_LIBS "-lX11") # FIXME endif() + list(APPEND INKSCAPE_LIBS "-lgslcblas") # FIXME if(WITH_GNOME_VFS) @@ -177,7 +183,7 @@ list(APPEND INKSCAPE_LIBS ${GTK2_CAIROMM_LIBRARY} ${GTK2_GIOMM_LIBRARY} ${GTK2_SIGC++_LIBRARY} - + ${GTK2_GOBJECT_LIBRARY} ) -- cgit v1.2.3 From 35e89204d0566765fba1ffc5a34edb6592a37771 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 17 Jan 2013 01:31:21 +0000 Subject: Rm unused sp-animate (bzr r12035) --- CMakeScripts/cmake_consistency_check_config.py | 1 - 1 file changed, 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py index e7c4508ef..4850eb259 100644 --- a/CMakeScripts/cmake_consistency_check_config.py +++ b/CMakeScripts/cmake_consistency_check_config.py @@ -30,7 +30,6 @@ IGNORE = ( "src/libnr/nr-compose-reference.cpp", "src/libnr/testnr.cp", "src/live_effects/lpe-skeleton.cpp", - "src/sp-animation.cpp", "src/sp-skeleton.cpp", "src/svg/test-stubs.cpp", "src/ui/dialog/session-player.cpp", -- cgit v1.2.3 From 5bcf5462560fd04fa63c33a409637e9c9e888238 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 20 Feb 2013 00:29:12 +1100 Subject: correct wrong find package (bzr r12135) --- 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 3a6b6c44f..a0e66c579 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -46,7 +46,7 @@ if(WITH_GNOME_VFS) endif() if(ENABLE_LCMS) - find_package(GnomeVFS2) + find_package(LCMS) if(LCMS_FOUND) list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES}) -- cgit v1.2.3 From 044c350e4c0e27e97cb39dd6dbb25e7655c302d1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 20 Sep 2013 07:38:24 +1000 Subject: updates for cmake (bzr r12547) --- CMakeScripts/cmake_consistency_check_config.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py index 4850eb259..3ee6d4449 100644 --- a/CMakeScripts/cmake_consistency_check_config.py +++ b/CMakeScripts/cmake_consistency_check_config.py @@ -30,7 +30,6 @@ IGNORE = ( "src/libnr/nr-compose-reference.cpp", "src/libnr/testnr.cp", "src/live_effects/lpe-skeleton.cpp", - "src/sp-skeleton.cpp", "src/svg/test-stubs.cpp", "src/ui/dialog/session-player.cpp", "src/ui/dialog/whiteboard-connect.cpp", @@ -41,15 +40,13 @@ IGNORE = ( # header files "share/filters/filters.svg.h", "share/palettes/palettes.h", - "src/inkscape/share/palettes/palettes.h", - "src/inkscape/share/patterns/patterns.svg.h", - "src/inkscape/src/libcola/cycle_detector.h", - "src/inkscape/src/libnr/in-svg-plane-test.h", - "src/inkscape/src/libnr/nr-point-fns-test.h", - "src/inkscape/src/libnr/nr-translate-test.h", - "src/inkscape/src/libnr/nr-types-test.h", - "src/inkscape/src/sp-skeleton.h", - "src/inkscape/src/svg/test-stubs.h", + "share/palettes/palettes.h", + "share/patterns/patterns.svg.h", + "src/libcola/cycle_detector.h", + "src/libnr/in-svg-plane-test.h", + "src/libnr/nr-point-fns-test.h", + "src/libnr/nr-translate-test.h", + "src/svg/test-stubs.h", # generated files, created by an in-source build "CMakeFiles/CompilerIdC/CMakeCCompilerId.c", -- cgit v1.2.3 From 744053120dad8edd7085dda1a02e9f9ecd65d701 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 14 Jan 2014 10:46:05 -0800 Subject: Fix bzr revision number in version string (LP #1071923) Patch from David Evans. (bzr r12928) --- 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 1d98a5799..a72946ac5 100644 --- a/CMakeScripts/inkscape-version.cmake +++ b/CMakeScripts/inkscape-version.cmake @@ -11,7 +11,7 @@ set(INKSCAPE_REVISION "unknown") if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/) execute_process(COMMAND - bzr revno ${INKSCAPE_SOURCE_DIR} + bzr revno --tree ${INKSCAPE_SOURCE_DIR} OUTPUT_VARIABLE INKSCAPE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE) endif() -- cgit v1.2.3 From 90867e5163a560f8905badd1a91f1688b6d9b36c Mon Sep 17 00:00:00 2001 From: Nicolas Dufour Date: Fri, 17 Jan 2014 14:29:51 +0100 Subject: i18n. Symbols are now translatable (see Bug #1261198); POT file and French translation updated. (bzr r12946) --- CMakeScripts/cmake_consistency_check_config.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py index 3ee6d4449..24cb22002 100644 --- a/CMakeScripts/cmake_consistency_check_config.py +++ b/CMakeScripts/cmake_consistency_check_config.py @@ -40,8 +40,9 @@ IGNORE = ( # header files "share/filters/filters.svg.h", "share/palettes/palettes.h", - "share/palettes/palettes.h", "share/patterns/patterns.svg.h", + "share/templates/templates.h", + "share/symbols/symbols.h", "src/libcola/cycle_detector.h", "src/libnr/in-svg-plane-test.h", "src/libnr/nr-point-fns-test.h", -- cgit v1.2.3