Commit a merge to trunk, with probabal errors

(bzr r11073.1.36)

4 files changed, 54 insertions, 41 deletions

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index ccfff8a40..a0e66c579 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)
@@ -40,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})
@@ -55,30 +61,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)
+		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()
 
@@ -168,7 +183,7 @@ list(APPEND INKSCAPE_LIBS
 	${GTK2_CAIROMM_LIBRARY}
 	${GTK2_GIOMM_LIBRARY}
 	${GTK2_SIGC++_LIBRARY}
-
+	${GTK2_GOBJECT_LIBRARY}
 )
 
 
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
diff --git a/CMakeScripts/cmake_consistency_check_config.py b/CMakeScripts/cmake_consistency_check_config.py
index e7c4508ef..24cb22002 100644
--- a/CMakeScripts/cmake_consistency_check_config.py
+++ b/CMakeScripts/cmake_consistency_check_config.py
@@ -30,8 +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",
     "src/ui/dialog/whiteboard-connect.cpp",
@@ -42,15 +40,14 @@ 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/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",
+    "src/libnr/nr-translate-test.h",
+    "src/svg/test-stubs.h",
     
     # generated files, created by an in-source build
     "CMakeFiles/CompilerIdC/CMakeCCompilerId.c",
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()