diff options
| -rw-r--r-- | libcmis/ExternalLib_libcmis.mk | 5 | ||||
| -rw-r--r-- | libcmis/addincludes.patch | 23 | ||||
| -rw-r--r-- | ooo.lst.in | 2 |
3 files changed, 2 insertions, 28 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) \ diff --git a/ooo.lst.in b/ooo.lst.in index 1ff45b033da7..9eb507ffdec6 100644 --- a/ooo.lst.in +++ b/ooo.lst.in @@ -90,7 +90,7 @@ f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz cfb4259665fa96874deaa1b233d0b9c2-libvisio-0.0.7.tar.bz2 30c468d0c27ae4784195b53f78bc6f64-LinLibertineG-20110922.zip -51eba115d4b25b5db571e385c1395ac8-libcmis-0.1.0.tar.gz +153eb3f16acc1fec19879accc021c112-libcmis-0.1.0.tar.gz @GOOGLE_DOCS_EXTENSION_PACK@ http://dev-www.libreoffice.org/extern 185d60944ea767075d27247c3162b3bc-unowinreg.dll |