Merge lp:~shlomif-gmail/inkscape/inkscape into lp:~inkscape.dev/inkscape/trunk

[Shlomi Fish]

This fixes the handling of LCMS / LCMS2 by the CMake build system.

[Liam P. White (liampwhite)]

Should change branch status to merged.

[su_v (suv-lp)]

On 2014-05-11 17:01 +0100, Liam P. White wrote:
> Should change branch status to merged.

@Liam - could you please provide information about the revision in which
this branch was actually merged into trunk?

(I fail to find the changes proposed in the branch in current trunk)

[lp:~shlomif-gmail/inkscape/inkscape]

13305. By Shlomi Fish on 2014-09-23

Committed/merged.

13306. By Shlomi Fish on 2014-10-08

Foo.

13307. By Shlomi Fish on 2014-10-10

Merged.

13308. By Shlomi Fish on 2014-10-25

Foo.

13309. By Shlomi Fish on 2014-11-03

cmake fixes.

[su_v (suv-lp)]

Proposed fixes have been committed to trunk in r13764 and r13766.

Latest patch from related report bug #1378843:
http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/13764
Missing file (not included in the patch):
http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/13766

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-30 00:53:33 +0000
+++ CMakeLists.txt	2014-11-03 16:52:06 +0000
@@ -104,12 +104,6 @@
 if(UNIX)
 	# TODO: man, locale, icons
 
-	# message after building.
-	add_custom_command(
-		TARGET blender POST_BUILD MAIN_DEPENDENCY blender
-		COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}'
-	)
-
 	install(
 		PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape
 		DESTINATION ${CMAKE_INSTALL_PREFIX}/bin

=== modified file 'CMakeScripts/DefineDependsandFlags.cmake'
--- CMakeScripts/DefineDependsandFlags.cmake	2014-03-27 01:33:44 +0000
+++ CMakeScripts/DefineDependsandFlags.cmake	2014-11-03 16:52:06 +0000
@@ -46,14 +46,23 @@
 endif()
 
 if(ENABLE_LCMS)
-	find_package(LCMS)
-	if(LCMS_FOUND)
-		list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS})
-		list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES})
-		add_definitions(${LCMS_DEFINITIONS})
+	find_package(LCMS2)
+	if(LCMS2_FOUND)
+		list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS})
+		list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES})
+		add_definitions(${LCMS2_DEFINITIONS})
+        SET (HAVE_LIBLCMS2 ON)
 	else()
-		set(ENABLE_LCMS OFF)
-	endif()
+        find_package(LCMS)
+        if(LCMS_FOUND)
+            list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS})
+            list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES})
+            add_definitions(${LCMS_DEFINITIONS})
+            SET (HAVE_LIBLCMS1 ON)
+        else()
+            SET (ENABLE_LCMS OFF)
+        endif()
+    endif()
 endif()
 
 find_package(BoehmGC REQUIRED)
@@ -81,6 +90,10 @@
 		   POPPLER_VERSION VERSION_EQUAL   "0.12.2")
 			set(POPPLER_NEW_COLOR_SPACE_API ON)
 		endif()
+		if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
+		   POPPLER_VERSION VERSION_EQUAL   "0.26.0")
+			set(POPPLER_EVEN_NEWER_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)
@@ -163,6 +176,7 @@
 	${GTK2_CAIROMM_INCLUDE_DIR}
 	${GTK2_CAIROMMCONFIG_INCLUDE_DIR} # <-- not in cmake 2.8.4
 	${GTK2_GIOMM_INCLUDE_DIR}
+	${GTK2_GIOMMCONFIG_INCLUDE_DIR}
 	${GTK2_SIGC++_INCLUDE_DIR}
 	${GTK2_SIGC++CONFIG_INCLUDE_DIR}
 )

=== added file 'CMakeScripts/Modules/FindLCMS2.cmake'
--- CMakeScripts/Modules/FindLCMS2.cmake	1970-01-01 00:00:00 +0000
+++ CMakeScripts/Modules/FindLCMS2.cmake	2014-11-03 16:52:06 +0000
@@ -0,0 +1,38 @@
+# This file was taken from the openjpeg library:
+#
+# http://code.google.com/p/openjpeg/source/browse/trunk/cmake/FindLCMS2.cmake?r=1987
+#
+# Thanks!
+
+# - Find LCMS2 library
+# Find the native LCMS2 includes and library
+# Once done this will define
+#
+# LCMS2_INCLUDE_DIR - Where to find lcms2.h, etc.
+# LCMS2_LIBRARIES - Libraries to link against to use LCMS2.
+# LCMS2_FOUND - If false, do not try to use LCMS2.
+#
+# also defined, but not for general use are
+# LCMS2_LIBRARY - Where to find the LCMS2 library.
+
+#=============================================================================
+#=============================================================================
+
+find_path(LCMS2_INCLUDE_DIR lcms2.h PATHS /usr/include /usr/local/include /opt/include /opt/local/include)
+
+set(LCMS2_NAMES ${LCMS2_NAMES} lcms2 liblcms2 liblcms2_static)
+
+find_library(LCMS2_LIBRARY NAMES ${LCMS2_NAMES} )
+
+mark_as_advanced(LCMS2_INCLUDE_DIR LCMS2_LIBRARY)
+
+# handle the QUIETLY and REQUIRED arguments and set LCMS2_FOUND to TRUE if
+# all listed variables are TRUE
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(LCMS2 DEFAULT_MSG LCMS2_LIBRARY LCMS2_INCLUDE_DIR)
+
+if(LCMS2_FOUND)
+set( LCMS2_INCLUDE_DIRS ${LCMS2_INCLUDE_DIR})
+set( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
+endif()
+

=== modified file 'config.h.cmake'
--- config.h.cmake	2011-09-27 17:02:55 +0000
+++ config.h.cmake	2014-11-03 16:52:06 +0000
@@ -16,7 +16,10 @@
 #cmakedefine ENABLE_BINRELOC 1
 
 /* Use LittleCms color management */
-#cmakedefine ENABLE_LCMS 1
+#cmakedefine HAVE_LIBLCMS2 1
+
+/* Use LittleCms color management */
+#cmakedefine HAVE_LIBLCMS1 1
 
 /* always defined to indicate that i18n is enabled */
 #cmakedefine ENABLE_NLS 1
@@ -128,9 +131,16 @@
 /* Use GfxFont from Poppler >= 0.8.3 */
 #cmakedefine POPPLER_NEW_GFXFONT 1
 
+/* Use new error API from Poppler >= 0.20.0 */
+#cmakedefine POPPLER_NEW_ERRORAPI
+
 /* Use color space API from Poppler >= 0.12.2 */
 #cmakedefine POPPLER_NEW_COLOR_SPACE_API 1
 
+/* Use color space API from Poppler >= 0.26.0 */
+#cmakedefine POPPLER_EVEN_NEWER_COLOR_SPACE_API 1
+
+
 /* GfxPatch no longer uses GfxColor in >= 0.15.1 */
 #cmakedefine POPPLER_NEW_GFXPATCH 1
 

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-10-17 20:03:14 +0000
+++ src/CMakeLists.txt	2014-11-03 16:52:06 +0000
@@ -517,10 +517,19 @@
 # make executable for INKSCAPE
 add_executable(inkscape ${main_SRC} ${inkscape_SRC} ${sp_SRC})
 
+if(UNIX)
+# message after building.
+add_custom_command(
+    TARGET inkscape
+    POST_BUILD MAIN_DEPENDENCY inkscape
+    COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}'
+)
+endif()
+
 add_dependencies(inkscape inkscape_version)
 
 target_link_libraries(inkscape
-	# order from automake 
+	# order from automake
 	#sp_LIB
 	nrtype_LIB