diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-10-03 10:05:42 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-10-03 10:06:38 +0200 |
| commit | d72d24bec5eb488a9eadcd6ec2441a6f85b8c5cc (patch) | |
| tree | f2b04ff6402b4ba342428d95e7e9f658c58d0a16 /libcmis | |
| parent | 946f3451e10d119887fadf88beb9dcc6baa555d3 (diff) | |
Use an updated version of libcmis
* Merged a few patches
* Got rid of the pkg-config for curl and libxml2
Diffstat (limited to 'libcmis')
| -rw-r--r-- | libcmis/ExternalLib_libcmis.mk | 5 | ||||
| -rw-r--r-- | libcmis/addincludes.patch | 23 |
2 files changed, 1 insertions, 27 deletions
diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk index 5ba05230cbb4..55332982a685 100644 --- a/libcmis/ExternalLib_libcmis.mk +++ b/libcmis/ExternalLib_libcmis.mk @@ -28,13 +28,10 @@ $(eval $(call gb_ExternalLib_ExternalLib,libcmis,autotools)) -$(eval $(call gb_ExternalLib_set_src_package,libcmis,51eba115d4b25b5db571e385c1395ac8-libcmis-0.1.0.tar.gz)) -$(eval $(call gb_ExternalLib_add_patch,libcmis,libcmis/addincludes.patch)) +$(eval $(call gb_ExternalLib_set_src_package,libcmis,153eb3f16acc1fec19879accc021c112-libcmis-0.1.0.tar.gz)) ifeq ($(OS),MACOSX) -$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'DEPS_LIBS="$(shell $MACOS_SDK_PATH/usr/bin/xml2-config --libs) $(shell $MACOS_SDK_PATH/usr/bin/curl-config --libs)"')) -$(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'DEPS_CFLAGS="$(shell $MACOS_SDK_PATH/usr/bin/xml2-config --cflags) $(shell $MACOS_SDK_PATH/usr/bin/curl-config --cflags)"')) $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_LIBS=""')) $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_CFLAGS=""')) $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--with-boost=$(OUTDIR)/inc)) diff --git a/libcmis/addincludes.patch b/libcmis/addincludes.patch deleted file mode 100644 index fba0807f9195..000000000000 --- a/libcmis/addincludes.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru libcmis-0.1.0.orig/src/libcmis/Makefile.am libcmis-0.1.0/src/libcmis/Makefile.am ---- libcmis-0.1.0.orig/src/libcmis/Makefile.am 2011-09-30 19:41:13.000000000 +0100 -+++ libcmis-0.1.0/src/libcmis/Makefile.am 2011-10-01 16:06:29.948000924 +0100 -@@ -9,6 +9,8 @@ - session.hxx \ - session-factory.hxx - -+AM_CXXFLAGS = $(DEPS_CFLAGS) -+ - lib_LTLIBRARIES = libcmis-@LIBCMIS_API_VERSION@.la - libcmis_@LIBCMIS_API_VERSION@_la_SOURCES = \ - $(libcmis_headers_public) \ -diff -ru libcmis-0.1.0.orig/src/libcmis/Makefile.in libcmis-0.1.0/src/libcmis/Makefile.in ---- libcmis-0.1.0.orig/src/libcmis/Makefile.in 2011-09-30 19:58:42.000000000 +0100 -+++ libcmis-0.1.0/src/libcmis/Makefile.in 2011-10-01 16:07:15.174539363 +0100 -@@ -297,6 +297,7 @@ - session.hxx \ - session-factory.hxx - -+AM_CXXFLAGS = $(DEPS_CFLAGS) - lib_LTLIBRARIES = libcmis-@LIBCMIS_API_VERSION@.la - libcmis_@LIBCMIS_API_VERSION@_la_SOURCES = \ - $(libcmis_headers_public) \ |