Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing.git;a=commitdiff;h=84e3c944567aadba1e7cc428e42a5506d087dfe5
commit 84e3c944567aadba1e7cc428e42a5506d087dfe5 Author: James Buren <[email protected]> Date: Tue Mar 18 04:56:10 2014 -0500 libopensync-0.39-4-x86_64 * rebuild with libgcrypt diff --git a/source/lib/libopensync/FrugalBuild b/source/lib/libopensync/FrugalBuild index 2298a51..892dcd4 100644 --- a/source/lib/libopensync/FrugalBuild +++ b/source/lib/libopensync/FrugalBuild @@ -3,14 +3,16 @@ pkgname=libopensync pkgver=0.39 -pkgrel=3 +pkgrel=4 pkgdesc="OpenSync is a synchronization framework." Finclude opensync -depends=('glib2' 'libxml2>=2.7.8' 'sqlite3' 'libxslt') +depends=('glib2' 'libxml2>=2.7.8' 'sqlite3' 'libxslt>=1.1.28') makedepends=("${makedepends[@]}" 'swig' 'python>=2.7') groups=('lib') archs=('i686' 'x86_64') -sha1sums=('3d97732675aa874da49cca0f8d6de6f004f2a416') +source=(${source[@]} fixes.patch) +sha1sums=('3d97732675aa874da49cca0f8d6de6f004f2a416' \ + '5318663d9cb1d3de3db3bb6005faed243f4d3d31') subpkgs=("$pkgname-python") subdescs=('OpenSync python bindings.') @@ -22,8 +24,6 @@ subarchs=('i686 x86_64') build() { Fcd - # internal module won't find our python - cat /usr/share/cmake-*/Modules/FindPythonLibs.cmake > cmake/modules/FindPythonLibs.cmake Fbuild_opensync Fsplit $pkgname-python usr/lib/python* } diff --git a/source/lib/libopensync/fixes.patch b/source/lib/libopensync/fixes.patch new file mode 100644 index 0000000..142622c --- /dev/null +++ b/source/lib/libopensync/fixes.patch @@ -0,0 +1,102 @@ +diff -ur a/cmake/modules/FindPythonLibs.cmake b/cmake/modules/FindPythonLibs.cmake +--- a/cmake/modules/FindPythonLibs.cmake 2009-09-20 15:14:18.000000000 -0500 ++++ b/cmake/modules/FindPythonLibs.cmake 2014-03-18 04:50:23.477664565 -0500 +@@ -17,8 +17,10 @@ + + IF(WIN32) + FIND_LIBRARY(PYTHON_DEBUG_LIBRARY +- NAMES python26_d python25_d python24_d python23_d python22_d python21_d python20_d python ++ NAMES python27_d python26_d python25_d python24_d python23_d python22_d python21_d python20_d python + PATHS ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/libs/Debug ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs/Debug + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs/Debug +@@ -41,7 +43,8 @@ + ENDIF(WIN32) + + FIND_LIBRARY(PYTHON_LIBRARY ${PREFERRED_PYTHON_VERSION} +- NAMES python26 python2.6 ++ NAMES python27 python2.7 ++ python26 python2.6 + python25 python2.5 + python24 python2.4 + python23 python2.3 +@@ -52,6 +55,7 @@ + python15 python1.5 + + PATHS ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/libs + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/libs +@@ -63,6 +67,7 @@ + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]/libs + + PATH_SUFFIXES ++ python2.7/config + python2.6/config + python2.5/config + python2.4/config +@@ -82,7 +87,7 @@ + SET(PYTHON_FRAMEWORK_INCLUDES) + IF(Python_FRAMEWORKS) + IF(NOT PYTHON_INCLUDE_PATH) +- FOREACH(version 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++ FOREACH(version 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) + FOREACH(dir ${Python_FRAMEWORKS}) + SET(PYTHON_FRAMEWORK_INCLUDES ${PYTHON_FRAMEWORK_INCLUDES} + ${dir}/Versions/${version}/include/python${version}) +@@ -96,6 +101,7 @@ + + PATHS + ${PYTHON_FRAMEWORK_INCLUDES} ++ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.7\\InstallPath]/include + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]/include + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]/include + [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]/include +@@ -108,6 +114,7 @@ + + PATH_SUFFIXES + ${PREFERRED_PYTHON_VERSION} ++ python2.7 + python2.6 + python2.5 + python2.4 +diff -ur a/opensync/common/opensync_list.c b/opensync/common/opensync_list.c +--- a/opensync/common/opensync_list.c 2009-09-20 15:14:18.000000000 -0500 ++++ b/opensync/common/opensync_list.c 2014-03-18 04:45:49.718674641 -0500 +@@ -30,7 +30,7 @@ + * MT safe + */ + +-#include <glib/gmem.h> ++#include <glib.h> + #include "opensync_list.h" + #include "opensync_internals.h" + +diff -ur a/opensync/opensync_internals.h b/opensync/opensync_internals.h +--- a/opensync/opensync_internals.h 2009-09-20 15:14:18.000000000 -0500 ++++ b/opensync/opensync_internals.h 2014-03-18 04:45:35.274675172 -0500 +@@ -24,8 +24,6 @@ + #include <glib.h> + #include <gmodule.h> + #include <string.h> +-#include <glib/gprintf.h> +-#include <glib/gstdio.h> + #include <sys/stat.h> + + #include "config.h" +diff -ur a/wrapper/opensync-error.i b/wrapper/opensync-error.i +--- a/wrapper/opensync-error.i 2009-09-20 15:14:18.000000000 -0500 ++++ b/wrapper/opensync-error.i 2014-03-18 04:53:39.543657349 -0500 +@@ -46,7 +46,7 @@ + osync_error_set_from_error(&self, &source); + } + +- void set(ErrorType type, const char *msg) { ++ void set_(ErrorType type, const char *msg) { + osync_error_set(&self, type, "%s", msg); + } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
