Merge and update

SOURCES/libgnomecanvas-libs.patch

@@ -0,0 +1,12 @@
+diff -up libgnomecanvas-2.26.0/configure.libs libgnomecanvas-2.26.0/configure
+--- libgnomecanvas-2.26.0/configure.libs	2010-02-13 23:05:13.777363452 -0500
++++ libgnomecanvas-2.26.0/configure	2010-02-13 23:06:40.070111238 -0500
+@@ -23837,6 +23837,8 @@ $as_echo "yes" >&6; }
+ 	:
+ fi
+ 
++LIBGNOMECANVAS_LIBS="$LIBGNOMECANVAS_LIBS -lm"
++
+ if test "$enable_maintainer_mode" = "yes"; then
+ 	LIBGNOMECANVAS_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+