overwrite state of libs/canvas with code from corresponding period in ardour-cairocanvas

This makes continued merges with ardour codebase easier, at the
small cost of removing the XML-based constructors. They were not
in use anyway and their use doesn't really fit into the
conception of the canvas as a dynamic UI element. Could reintroduce
them at a later date.

libs/canvas/wscript

@@ -55,8 +55,8 @@ canvas_sources = [
         'types.cc',
         'utils.cc',
         'wave_view.cc',
-        'xml_ui.cc',
         'xfade_curve.cc',
+        'xml_ui.cc',
 ]
 
 def options(opt):
@@ -66,7 +66,7 @@ def configure(conf):
     conf.load ('compiler_cxx')
     autowaf.configure(conf)
     autowaf.build_version_files(path_prefix+'canvas/version.h', path_prefix+'version.cc',
-                                'libcanvas', conf.env['MAJOR'], conf.env['MINOR'], conf.env['MICRO'],
+                                'libcanvas', conf.env['MAJOR'], conf.env['MINOR'], 0,
                                 'LIBCANVAS_API', 'canvas/visibility.h')
     autowaf.check_pkg(conf, 'cairomm-1.0', uselib_store='CAIROMM', atleast_version='1.8.4')
 
@@ -89,7 +89,7 @@ def build(bld):
     obj.vnum         = CANVAS_LIB_VERSION
     obj.install_path = bld.env['LIBDIR']
     obj.defines      += [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
-
+    
     if bld.env['BUILD_TESTS'] and bld.env['HAVE_CPPUNIT']:
 
             manual_tests              = '''