[depends] bump libplist to 2.0.0

1.11 removed cmake build system
2.0.0 removed libxml2 dependency

6 files changed, 24 insertions, 93 deletions

diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index 2e189d142f..4b7f3cadb0 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -92,7 +92,7 @@ libmicrohttpd: gnutls libgcrypt libgpg-error
 python27: expat gettext libxml2 sqlite3 openssl libffi
 libcdio: $(ICONV)
 libcdio-gplv3: $(ICONV)
-libplist: libxml2 $(ZLIB)
+libplist: $(ZLIB)
 libbluray: $(ICONV) libxml2
 libssh: libgcrypt openssl $(ZLIB)
 mysql: openssl $(ZLIB)
diff --git a/tools/depends/target/libplist/0001-dontbuildswig.patch b/tools/depends/target/libplist/0001-dontbuildswig.patch
deleted file mode 100644
index 7ff491df8d..0000000000
--- a/tools/depends/target/libplist/0001-dontbuildswig.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt	2011-08-18 21:45:33.000000000 +0200
-+++ b/CMakeLists.txt	2011-08-18 21:45:16.000000000 +0200
-@@ -36,7 +36,7 @@
- ADD_SUBDIRECTORY( test )
- 
- IF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
--	ADD_SUBDIRECTORY( swig )
-+#	ADD_SUBDIRECTORY( swig )
- ENDIF ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
- 
- # add uninstall target
diff --git a/tools/depends/target/libplist/0002-fixclang.diff b/tools/depends/target/libplist/0002-fixclang.diff
deleted file mode 100644
index b4dd32a20f..0000000000
--- a/tools/depends/target/libplist/0002-fixclang.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- /libcnary/node.c	2011-06-25 05:00:48.000000000 +0400
-+++ /libcnary/node.c	2013-03-19 20:34:11.000000000 +0400
-@@ -95,16 +95,17 @@
- }
- 
- int node_detach(node_t* parent, node_t* child) {
--	if (!parent || !child) return 0;
--	if (node_list_remove(parent->children, child) == 0) {
-+	if (!parent || !child) return -1;
-+	int index = node_list_remove(parent->children, child);
-+	if (index >= 0) {
- 		parent->count--;
- 	}
--	return 0;
-+	return index;
- }
- 
- int node_insert(node_t* parent, unsigned int index, node_t* child)
- {
--	if (!parent || !child) return;
-+	if (!parent || !child) return -1;
- 	child->isLeaf = TRUE;
- 	child->isRoot = FALSE;
- 	child->parent = parent;
-@@ -209,7 +210,7 @@
- node_t* node_copy_deep(node_t* node, copy_func_t copy_func)
- {
- 	if (!node) return NULL;
--	void *data;
-+	void *data = NULL;
- 	if (copy_func) {
- 		data = copy_func(node->data);
- 	}
- 	
---- /src/base64.c	2013-10-06 23:14:24.000000000 +0400
-+++ /src/base64.c	2013-03-19 20:34:11.000000000 +0400
-@@ -104,9 +104,9 @@
- 
- unsigned char *base64decode(const char *buf, size_t *size)
- {
--	if (!buf) return;
-+	if (!buf) return NULL;
- 	size_t len = strlen(buf);
--	if (len <= 0) return;
-+	if (len <= 0) return NULL;
- 	unsigned char *outbuf = (unsigned char*)malloc((len/4)*3+3);
- 
- 	unsigned char *line;
-@@ -114,7 +114,7 @@
- 
- 	line = (unsigned char*)strtok((char*)buf, "\r\n\t ");
- 	while (line) {
--		p+=base64decode_block(outbuf+p, line, strlen((char*)line));
-+		p+=base64decode_block(outbuf+p, (const char*)line, strlen((char*)line));
- 
- 		// get next line of base64 encoded block
- 		line = (unsigned char*)strtok(NULL, "\r\n\t ");
\ No newline at end of file
diff --git a/tools/depends/target/libplist/0003-fixc++1.patch b/tools/depends/target/libplist/0003-fixc++1.patch
deleted file mode 100644
index 69fdbf0620..0000000000
--- a/tools/depends/target/libplist/0003-fixc++1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Dictionary.cpp.orig  2014-12-31 14:05:09.000000000 -0600
-+++ b/src/Dictionary.cpp       2014-12-31 14:09:58.000000000 -0600
-@@ -151,7 +151,7 @@
-         _map[key] = clone;
-         return _map.find(key);
-     }
--    return iterator(NULL);
-+    return iterator();
- }
- 
- void Dictionary::Remove(Node* node)
diff --git a/tools/depends/target/libplist/01-disable-tools-tests.patch b/tools/depends/target/libplist/01-disable-tools-tests.patch
new file mode 100644
index 0000000000..d329459319
--- /dev/null
+++ b/tools/depends/target/libplist/01-disable-tools-tests.patch
@@ -0,0 +1,10 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ ACLOCAL_AMFLAGS = -I m4
+-SUBDIRS = libcnary src include tools test
++SUBDIRS = libcnary src include
+ if HAVE_CYTHON
+ SUBDIRS += cython
+ endif
diff --git a/tools/depends/target/libplist/Makefile b/tools/depends/target/libplist/Makefile
index b51f56b6ce..342d6cc986 100644
--- a/tools/depends/target/libplist/Makefile
+++ b/tools/depends/target/libplist/Makefile
@@ -1,38 +1,38 @@
 include ../../Makefile.include
-DEPS= ../../Makefile.include 0001-dontbuildswig.patch Makefile
+DEPS= ../../Makefile.include Makefile 01-disable-tools-tests.patch
 
 # lib name, version
 LIBNAME=libplist
-VERSION=1.6
+VERSION=2.0.0
 SOURCE=$(LIBNAME)-$(VERSION)
 FILENAME=v$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
+ARCHIVE=$(SOURCE).tar.bz2
 ifeq (darwin, $(findstring darwin, $(HOST)))
-LIBDYLIB=$(PLATFORM)/build/src/libplist++.dylib
+LIBDYLIB=$(PLATFORM)/src/.libs/libplist++.dylib
 else
-LIBDYLIB=$(PLATFORM)/build/src/libplist++.so
+LIBDYLIB=$(PLATFORM)/src/.libs/libplist++.so
 endif
 CFLAGS+=-fvisibility=default
 all: .installed-$(PLATFORM)
 
+# configuration settings
+CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; ./configure --prefix=$(PREFIX) --without-cython
+
 $(TARBALLS_LOCATION)/$(ARCHIVE):
 	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
 
 $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
 	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); patch -p1 < ../0001-dontbuildswig.patch
-	cd $(PLATFORM); patch -p1 < ../0002-fixclang.diff
-	cd $(PLATFORM); patch -p1 < ../0003-fixc++1.patch
-	cd $(PLATFORM); sed -ie 's/TARGET_LINK_LIBRARIES( plist \(.*\))/TARGET_LINK_LIBRARIES( plist \1 z m)  /' src/CMakeLists.txt
-	cd $(PLATFORM); rm -rf build; mkdir -p build
-	cd $(PLATFORM)/build; $(CMAKE) VERBOSE=1 -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="$(LDFLAGS)" ..
+	cd $(PLATFORM); patch -p1 -i ../01-disable-tools-tests.patch
+	cd $(PLATFORM); $(AUTORECONF) -vif
+	cd $(PLATFORM); $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -j 1 -C $(PLATFORM)/build VERBOSE=1
+	$(MAKE) -C $(PLATFORM)
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM)/build install
+	$(MAKE) -C $(PLATFORM) install
 	touch $@
 
 clean: