lo-menubar/buildfix.patch

   1 --- wscript.old 2011-07-09 02:27:01.019913454 +0300
   2 +++ wscript     2011-07-09 02:25:06.196583013 +0300
   3 @@ -24,21 +24,21 @@
   4  def configure(conf):
   5         conf.load('compiler_cxx')
   6
   7 -       uno_sdk_libpath = '%s/basis3.3/sdk/lib' % Options.options.LO_PREFIX
   8 +       uno_sdk_libpath = '%s/basis3.4/sdk/lib' % Options.options.LO_PREFIX
   9
  10         conf.check_cxx(lib='uno_sal', uselib_store='SALLIB', libpath=uno_sdk_libpath, mandatory=True)
  11         conf.check_cxx(lib='uno_cppu', uselib_store='CPPULIB', libpath=uno_sdk_libpath, mandatory=True)
  12         #conf.check_cc(lib='uno_salhelpergcc3', uselib_store='SALHELPERLIB',  mandatory=True)
  13         conf.check_cxx(lib='uno_cppuhelpergcc3', uselib_store='CPPUHELPERLIB', libpath=uno_sdk_libpath,  mandatory=True)
  14
  15 -       conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/basis3.3/sdk/bin'], mandatory=True)
  16 +       conf.find_program('cppumaker', var='CPPUMAKER', path_list=[Options.options.LO_PREFIX + '/basis3.4/sdk/bin'], mandatory=True)
  17
  18         conf.env['TYPES_RDB'] = conf.find_file('types.rdb',
  19                                                path_list=[Options.options.URE_PREFIX + '/share/misc/'],
  20                                                mandatory=True)
  21
  22         conf.env['OFFAPI_RDB'] = conf.find_file('offapi.rdb',
  23 -                                               path_list=[Options.options.LO_PREFIX + '/basis3.3/program'],
  24 +                                               path_list=[Options.options.LO_PREFIX + '/basis3.4/program'],
  25                                                 mandatory=True)
  26
  27         conf.check_cfg(package='gio-2.0', uselib_store='GIO',
  28 @@ -156,6 +156,7 @@
  29         includes = ['/usr/include/libreoffice']
  30
  31         includes.append (cppumaker (bld))
  32 +        includes.append ('/usr/lib/libreoffice/basis3.4/sdk/include/')
  33
  34         env = bld.env.copy()
  35         pattern = env['cxxshlib_PATTERN']