SOURCES: libopensync-opt.patch - updated to 0.31

[glen]

Author: glen                         Date: Fri Aug 31 19:12:23 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 0.31

---- Files affected:
SOURCES:
   libopensync-opt.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/libopensync-opt.patch
diff -u SOURCES/libopensync-opt.patch:1.1 SOURCES/libopensync-opt.patch:1.2
--- SOURCES/libopensync-opt.patch:1.1	Thu Jun 14 22:36:24 2007
+++ SOURCES/libopensync-opt.patch	Fri Aug 31 21:12:18 2007
@@ -1,31 +1,34 @@
---- libopensync-0.30/SConstruct~	2007-05-19 12:02:29.000000000 +0300
-+++ libopensync-0.30/SConstruct	2007-06-14 23:29:22.537794000 +0300
-@@ -38,8 +38,8 @@
- opts.Add(BoolOption('enable_python', 'Build python wrapper? (swig required)', 0))
- opts.Add(BoolOption('debug_modules', 'Should unloading of shared modules be avoided (DEBUGGING ONLY!)', 0))
- opts.Add(BoolOption('enable_doxygen', 'Generating OpenSync API with doxygen?', 0))
--opts.Add(('APPEND_LDFLAGS', 'Linker flags'))
--opts.Add(('APPEND_CCFLAGS', 'Compiler flags'))
-+opts.Add(('LDFLAGS', 'Linker flags'))
-+opts.Add(('CFLAGS', 'Compiler flags'))
- opts.Add(('DESTDIR', 'Set the root directory to install into ( /path/to/DESTDIR )', ''))
+--- libopensync-0.31/SConstruct~	2007-08-31 21:31:59.000000000 +0300
++++ libopensync-0.31/SConstruct	2007-08-31 21:37:49.797518617 +0300
+@@ -35,8 +35,8 @@
+ A(BoolOption('enable_python', 'Build python wrapper? (swig required)', 0))
+ A(BoolOption('debug_modules', 'Should unloading of shared modules be avoided (DEBUGGING ONLY!)', 0))
+ A(BoolOption('enable_doxygen', 'Generating OpenSync API with doxygen?', 0))
+-A(('APPEND_LDFLAGS', 'Linker flags'))
+-A(('APPEND_CCFLAGS', 'Compiler flags'))
++A(('LDFLAGS', 'Linker flags'))
++A(('CCFLAGS', 'Compiler flags'))
+ A(('DESTDIR', 'Set the root directory to install into ( /path/to/DESTDIR )', ''))
  
  target_dir = SelectBuildDir('build')
-@@ -61,13 +61,13 @@
+@@ -58,9 +58,6 @@
  You can set the following options:
- """ + opts.GenerateHelpText(env))
+ """ + env.get_opts().generate_help_text())
  
--env.Append(CCFLAGS = r'-DENABLE_TRACE=$enable_trace')
 -env.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))
 -env.Append(LDFLAGS = Split('$APPEND_LDFLAGS'))
-+env.Append(CFLAGS = r'-DENABLE_TRACE=$enable_trace')
+-
+ env.add_define("OPENSYNC_PLUGINDIR", config['plugindir'])
+ env.add_define("OPENSYNC_FORMATSDIR", config['formatdir'])
+ env.add_define("OPENSYNC_CONFIGDIR", config['configdir'])
+@@ -75,7 +72,9 @@
  
  env.Replace(
-        CC = env['CC'],
--       CXX = env['CXX']
-+       CXX = env['CXX'],
-+       CXXFLAGS = env['CXXFLAGS'],
-+       CFLAGS = env['CFLAGS'],
+ 	CC = env['CC'],
+-	CXX = env['CXX']
++	CXX = env['CXX'],
++	CXXFLAGS = env['CXXFLAGS'],
++	CFLAGS = env['CFLAGS'],
  )
  
- # pkg config files
+ if env['enable_doxygen'] == 1:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/libopensync-opt.patch?r1=1.1&r2=1.2&f=u