summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-07-31 10:02:41 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-07-31 10:02:41 +0100
commit9078d4ab7914f0889569e4847be1cc3c4b6e208f (patch)
tree3357acbbf4e15cfd130fc5a1e71814ccbeb2920b
parent456d9191f10a1f23d6ea3d33cd923dcd80f2ce4b (diff)
downloadpoky-9078d4ab7914f0889569e4847be1cc3c4b6e208f.tar.gz
libsyncml: 0.4.7 -> 0.5.4
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/opensync/libsyncml/build-in-src.patch14
-rw-r--r--meta/packages/opensync/libsyncml_0.5.4.bb (renamed from meta/packages/opensync/libsyncml_0.4.7.bb)7
2 files changed, 9 insertions, 12 deletions
diff --git a/meta/packages/opensync/libsyncml/build-in-src.patch b/meta/packages/opensync/libsyncml/build-in-src.patch
index abf593ec38..d8106bdfc7 100644
--- a/meta/packages/opensync/libsyncml/build-in-src.patch
+++ b/meta/packages/opensync/libsyncml/build-in-src.patch
@@ -2,11 +2,11 @@
2 CMakeLists.txt | 4 ---- 2 CMakeLists.txt | 4 ----
3 1 file changed, 4 deletions(-) 3 1 file changed, 4 deletions(-)
4 4
5--- libsyncml-0.4.7.orig/CMakeLists.txt 5Index: libsyncml-0.5.4/CMakeLists.txt
6+++ libsyncml-0.4.7/CMakeLists.txt 6===================================================================
7@@ -66,14 +66,10 @@ CHECK_INCLUDE_FILES( unistd.h HAVE_UNIST 7--- libsyncml-0.5.4.orig/CMakeLists.txt 2009-07-31 09:56:16.000000000 +0100
8 8+++ libsyncml-0.5.4/CMakeLists.txt 2009-07-31 09:57:33.000000000 +0100
9 CHECK_TYPE_SIZE( uint16_t UINT16_T ) 9@@ -72,10 +72,6 @@
10 CHECK_TYPE_SIZE( uint32_t UINT32_T ) 10 CHECK_TYPE_SIZE( uint32_t UINT32_T )
11 CHECK_TYPE_SIZE( uint8_t UINT8_T ) 11 CHECK_TYPE_SIZE( uint8_t UINT8_T )
12 12
@@ -15,7 +15,5 @@
15-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!") 15-MACRO_ENSURE_OUT_OF_SOURCE_BUILD("${CMAKE_PROJECT_NAME} doesn't allow to build within the source directory. Please, create a seperate build directory and run 'cmake ${PROJECT_SOURCE_DIR} [options]'!")
16- 16-
17 # find requirements 17 # find requirements
18 SET ( GLIB2_MIN_VERSION "2.12" )
18 SET ( OPENOBEX_MIN_VERSION "1.1" ) 19 SET ( OPENOBEX_MIN_VERSION "1.1" )
19 # do not set LIBSOUP2_MIN_VERSION
20 # if you set LIBSOUP2_MIN_VERSION then you cannot support 2.2 and 2.4
21 SET ( LIBSOUP22_MIN_VERSION "2.2.91" )
diff --git a/meta/packages/opensync/libsyncml_0.4.7.bb b/meta/packages/opensync/libsyncml_0.5.4.bb
index e9e7d14754..394b3489de 100644
--- a/meta/packages/opensync/libsyncml_0.4.7.bb
+++ b/meta/packages/opensync/libsyncml_0.5.4.bb
@@ -1,12 +1,11 @@
1DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol." 1DESCRIPTION = "Libsyncml is a implementation of the SyncML protocol."
2HOMEPAGE = "http://libsyncml.opensync.org/" 2HOMEPAGE = "http://libsyncml.opensync.org/"
3LICENSE = "LGPL" 3LICENSE = "LGPL"
4DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez-libs openobex check" 4DEPENDS = "sed-native wbxml2 libsoup libxml2 bluez4 openobex check"
5PR = "r1" 5PR = "r1"
6 6
7SRC_URI = "http://libsyncml.opensync.org/download/releases/${PV}/libsyncml-${PV}.tar.bz2 \ 7SRC_URI = "${SOURCEFORGE_MIRROR}/libsyncml/0.5.4/libsyncml-0.5.4.tar.bz2 \
8 file://build-in-src.patch;patch=1 \ 8 file://build-in-src.patch;patch=1"
9 file://remove-insane-assembler.patch;patch=1"
10 9
11inherit cmake pkgconfig 10inherit cmake pkgconfig
12 11