summaryrefslogtreecommitdiff
path: root/libcmis
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-05-10 08:55:12 +0200
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-06-04 13:28:12 +0200
commit12d193df238adaf67608327b36fea91003138539 (patch)
tree5fc3fa1db151f7c18d56b60cbf06cfcb6b891830 /libcmis
parentd1eb25ba0a2b0a549f387eb731032c7f1265095e (diff)
libcmis: updated to 0.2.0
Change-Id: I I I Ieb36a287824e347e3ccc57c2c0abc6defbae5f47
Diffstat (limited to 'libcmis')
-rw-r--r--libcmis/libcmis-0.1.0-non-virtual-dtor.patch11
-rw-r--r--libcmis/libcmis-0.1.0.patch43
-rw-r--r--libcmis/libcmis-0001-virtualdtor.patch22
-rw-r--r--libcmis/makefile.mk16
4 files changed, 8 insertions, 84 deletions
diff --git a/libcmis/libcmis-0.1.0-non-virtual-dtor.patch b/libcmis/libcmis-0.1.0-non-virtual-dtor.patch
deleted file mode 100644
index 764c7b2f6322..000000000000
--- a/libcmis/libcmis-0.1.0-non-virtual-dtor.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/libcmis-0.1.0/src/libcmis/cmis-object.hxx 2011-09-30 20:35:37.000000000 +0200
-+++ misc/build/libcmis-0.1.0/src/libcmis/cmis-object.hxx 2012-03-13 21:46:03.985188599 +0100
-@@ -39,6 +39,8 @@
- class CmisObject
- {
- public:
-+ virtual ~CmisObject() {}
-+
- virtual std::string getId( ) = 0;
- virtual std::string getName( ) = 0;
-
diff --git a/libcmis/libcmis-0.1.0.patch b/libcmis/libcmis-0.1.0.patch
deleted file mode 100644
index d81520b0e525..000000000000
--- a/libcmis/libcmis-0.1.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- misc/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:55:51.349325061 +0200
-+++ misc/build/libcmis-0.1.0/src/libcmis/makefile.mk 2011-10-05 10:54:58.290853952 +0200
-@@ -1 +1,39 @@
--dummy
-+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-+
-+PRJ=..$/..$/..$/..$/..$/..
-+
-+PRJNAME=libcmis
-+TARGET=cmislib
-+ENABLE_EXCEPTIONS=TRUE
-+VISIBILITY_HIDDEN=TRUE
-+LIBTARGET=NO
-+
-+.INCLUDE : settings.mk
-+
-+.IF "$(GUI)$(COM)"=="WNTMSC"
-+CFLAGS+=-GR
-+.ENDIF
-+.IF "$(COM)"=="GCC"
-+CFLAGSCXX+=-frtti
-+.ENDIF
-+
-+.IF "$(SYSTEM_LIBXML)"=="YES"
-+CFLAGS+=$(LIBXML_CFLAGS)
-+.ENDIF
-+.IF "$(SYSTEM_CURL)"=="YES"
-+CFLAGS+=$(CURL_CFLAGS)
-+.ENDIF
-+
-+SLOFILES= \
-+ $(SLO)$/session-factory.obj \
-+ $(SLO)$/atom-document.obj \
-+ $(SLO)$/atom-folder.obj \
-+ $(SLO)$/atom-object.obj \
-+ $(SLO)$/atom-session.obj \
-+ $(SLO)$/atom-utils.obj
-+
-+LIB1ARCHIV=$(LB)$/libcmislib.a
-+LIB1TARGET=$(SLB)$/$(TARGET).lib
-+LIB1OBJFILES= $(SLOFILES)
-+
-+.INCLUDE : target.mk
diff --git a/libcmis/libcmis-0001-virtualdtor.patch b/libcmis/libcmis-0001-virtualdtor.patch
deleted file mode 100644
index ac0e5a1c2e24..000000000000
--- a/libcmis/libcmis-0001-virtualdtor.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- misc/libcmis-0.1.0/src/libcmis/session-factory.cxx 2012-01-10 15:28:52.458706430 +0000
-+++ misc/build/libcmis-0.1.0/src/libcmis/session-factory.cxx 2012-01-10 15:29:57.856419249 +0000
-@@ -60,4 +60,8 @@
-
- return repos;
- }
-+
-+ Session::~Session()
-+ {
-+ }
- }
---- misc/libcmis-0.1.0/src/libcmis/session.hxx 2012-01-10 15:28:52.458706430 +0000
-+++ misc/build/libcmis-0.1.0/src/libcmis/session.hxx 2012-01-10 15:29:19.071996444 +0000
-@@ -44,6 +44,8 @@
- /** Get a CMIS object from its ID.
- */
- virtual CmisObjectPtr getObject( std::string id ) = 0;
-+
-+ virtual ~Session();
- };
- }
-
diff --git a/libcmis/makefile.mk b/libcmis/makefile.mk
index 855a67f62d79..f124df27b952 100644
--- a/libcmis/makefile.mk
+++ b/libcmis/makefile.mk
@@ -41,14 +41,14 @@ TARGET=cmis
@echo "Using system libcmis..."
.ENDIF
-TARFILE_NAME=libcmis-0.1.0
-TARFILE_MD5=7c2549f6b0a8bb604e6c4c729ffdcfe6
-ADDITIONAL_FILES=src$/libcmis$/makefile.mk
-
-PATCH_FILES=$(TARFILE_NAME).patch
-#https://sourceforge.net/p/libcmis/tickets/1/
-PATCH_FILES+=libcmis-0001-virtualdtor.patch
-PATCH_FILES+=libcmis-0.1.0-non-virtual-dtor.patch
+TARFILE_NAME=libcmis-0.2.0
+TARFILE_MD5=36c168b03593dfa386fba23a0c32d11b
+
+.IF "$(debug)" != ""
+CFLAGS+=-g
+.ELSE
+CFLAGS+=-O
+.ENDIF
BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
BUILD_DIR=src$/libcmis