summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Miƛkiewicz2009-07-05 17:24:12 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit3387fb985f42adaf4ecac53b6e8d884d4081b9fe (patch)
tree7059f58270908cc9ffa89e72c881438f1661b15d
parentf7a4256c9b94d40eda89cf1a6cbae4d5cb3e5b4b (diff)
downloadlibopensync02-3387fb985f42adaf4ecac53b6e8d884d4081b9fe.zip
libopensync02-3387fb985f42adaf4ecac53b6e8d884d4081b9fe.tar.gz
- drop obsolete files
Changed files: libopensync-noerror.patch -> 1.3 libopensync-opt.patch -> 1.3 libopensync-py-m4.patch -> 1.5 libopensync-wrap.patch -> 1.2
-rw-r--r--libopensync-noerror.patch22
-rw-r--r--libopensync-opt.patch34
-rw-r--r--libopensync-py-m4.patch63
-rw-r--r--libopensync-wrap.patch14
4 files changed, 0 insertions, 133 deletions
diff --git a/libopensync-noerror.patch b/libopensync-noerror.patch
deleted file mode 100644
index ee7519b..0000000
--- a/libopensync-noerror.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- libopensync-0.31/wrapper/SConscript~ 2007-05-27 23:19:04.000000000 +0300
-+++ libopensync-0.31/wrapper/SConscript 2007-08-31 22:31:48.270330467 +0300
-@@ -14,7 +14,7 @@
- )
-
- env.Append(SCANNERS=[SWIGScanner])
-- env.Append(SWIGFLAGS = ['-Werror', '-Wall', '-python', '-modern',
-+ env.Append(SWIGFLAGS = ['-Wall', '-python', '-modern',
- '-I' + distutils.sysconfig.get_python_inc()])
-
- # these are the C and python sources generated by swig
---- libopensync-0.31/build/linux/osync_build.py~ 2007-06-20 22:48:30.000000000 +0300
-+++ libopensync-0.31/build/linux/osync_build.py 2007-08-31 21:31:14.203848073 +0300
-@@ -37,7 +37,7 @@
- env = conf.Finish()
- env.Append(CCFLAGS = r'-DHAVE_CONFIG_H')
- env.Append(CCFLAGS = r'-I.')
-- env.Append(CCFLAGS = [r'-Wall', r'-Werror', r'-O2'])
-+ env.Append(CCFLAGS = [r'-Wall', r'-O2'])
-
- if env['debug'] == 1:
- env.Append(CCFLAGS = r'-g3')
diff --git a/libopensync-opt.patch b/libopensync-opt.patch
deleted file mode 100644
index 5dcbdd5..0000000
--- a/libopensync-opt.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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')
-@@ -58,9 +58,6 @@
- You can set the following options:
- """ + env.get_opts().generate_help_text())
-
--env.Append(CCFLAGS = Split('$APPEND_CCFLAGS'))
--env.Append(LDFLAGS = Split('$APPEND_LDFLAGS'))
--
- 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'],
- )
-
- if env['enable_doxygen'] == 1:
diff --git a/libopensync-py-m4.patch b/libopensync-py-m4.patch
deleted file mode 100644
index 1fa699a..0000000
--- a/libopensync-py-m4.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- libopensync-0.19/acinclude.m4~ 2006-09-15 17:42:35.758740828 +0300
-+++ libopensync-0.19/acinclude.m4 2006-10-24 12:03:48.143737907 +0300
-@@ -1112,46 +1112,32 @@
-
- # Check for Python include path
- AC_MSG_CHECKING([for Python include path])
-- python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
-- for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do
-- python_path=`find $i -type f -name Python.h -print | sed "1q"`
-- if test -n "$python_path" ; then
-- break
-- fi
-- done
-- python_path=`echo $python_path | sed "s,/Python.h$,,"`
-- AC_MSG_RESULT([$python_path])
-- if test -z "$python_path" ; then
-+ python_includes=`python-config --includes`
-+ AC_MSG_RESULT([$python_includes])
-+ if test -z "$python_includes" ; then
- AC_MSG_ERROR([cannot find Python include path])
- fi
-- AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path])
-+ AC_SUBST([PYTHON_CPPFLAGS],[-I$python_includes])
-
- # Check for Python library path
- AC_MSG_CHECKING([for Python library path])
-- python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
-- for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
-- python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
-- if test -n "$python_path" ; then
-- break
-- fi
-- done
-- python_path=`echo $python_path | sed "s,/libpython.*$,,"`
-- AC_MSG_RESULT([$python_path])
-- if test -z "$python_path" ; then
-+ python_ldflags=`python-config --ldflags`
-+ AC_MSG_RESULT([$python_ldflags])
-+ if test -z "$python_ldflags" ; then
- AC_MSG_ERROR([cannot find Python library path])
- fi
-- AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"])
-- #
-- python_site=`echo $python_path | sed "s/config/site-packages/"`
-+ AC_SUBST([PYTHON_LDFLAGS],[$python_ldflags])
-+
-+ # unused here
-+ python_site=""
- AC_SUBST([PYTHON_SITE_PKG],[$python_site])
- #
- # libraries which must be linked in when embedding
- #
- AC_MSG_CHECKING(python extra libraries)
-- PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-- conf = distutils.sysconfig.get_config_var; \
-- print conf('LOCALMODLIBS')+' '+conf('LIBS')"
-- AC_MSG_RESULT($PYTHON_EXTRA_LIBS)`
-+ # same as ldflags, but unused here
-+ PYTHON_EXTRA_LIBS="$python_ldflags"
-+ AC_MSG_RESULT($PYTHON_EXTRA_LIBS)
- AC_SUBST(PYTHON_EXTRA_LIBS)
- ])
- dnl as-ac-expand.m4 0.2.0
diff --git a/libopensync-wrap.patch b/libopensync-wrap.patch
deleted file mode 100644
index f8bccaf..0000000
--- a/libopensync-wrap.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./wrapper/opensync-group.i.org 2007-08-31 20:12:48.579835095 +0200
-+++ ./wrapper/opensync-group.i 2007-08-31 20:13:37.396480039 +0200
-@@ -28,7 +28,10 @@
- }
-
- void add_group(Group *group) {
-- osync_group_env_add_group(self, group);
-+ Error *err = NULL;
-+ bool ret = osync_group_env_add_group(self, group, &err);
-+ if (!raise_exception_on_error(err) && !ret)
-+ wrapper_exception("osync_group_env_add_group failed but did not set error code");
- }
-
- void remove_group(Group *group) {