diff --git a/CMakeLists.txt b/CMakeLists.txt index d0e5522..2ef5062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 11) project(ldid) find_package(PkgConfig REQUIRED) -pkg_check_modules(PLIST REQUIRED libplist) +pkg_check_modules(PLIST REQUIRED libplist-2.0) pkg_check_modules(CRYPTO REQUIRED libcrypto) if(LDID_STATIC) diff --git a/Makefile b/Makefile index 92550ba..16cfb35 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ DESTDIR ?= / PREFIX ?= /usr/local OPENSSL_LDFLAGS := $(shell pkg-config --libs libcrypto) OPENSSL_CFLAGS := $(shell pkg-config --cflags libcrypto) -PLIST_LDFLAGS := $(shell pkg-config --libs libplist) -PLIST_CFLAGS := $(shell pkg-config --cflags libplist) +PLIST_LDFLAGS := $(shell pkg-config --libs libplist-2.0) +PLIST_CFLAGS := $(shell pkg-config --cflags libplist-2.0) CFLAGS := $(OPENSSL_CFLAGS) $(PLIST_CFLAGS) -O2 LDFLAGS := $(OPENSSL_LDFLAGS) $(PLIST_LDFLAGS) LDID_VERSION := $(shell git describe --tags --match="v*" | sed -e 's@-\([^-]*\)-\([^-]*\)$$@+\1.\2@;s@^v@@;s@%@~@g') diff --git a/ldid.cpp b/ldid.cpp index b017ebe..b020a8a 100644 --- a/ldid.cpp +++ b/ldid.cpp @@ -2644,10 +2644,7 @@ static plist_t plist(const std::string &data) { if (data.empty()) return plist_new_dict(); plist_t plist(NULL); - if (Starts(data, "bplist00")) - plist_from_bin(data.data(), data.size(), &plist); - else - plist_from_xml(data.data(), data.size(), &plist); + plist_from_memory(data.data(), data.size(), &plist); _assert(plist != NULL); return plist; } diff --git a/libplist b/libplist index 9ca25d2..c81471c 160000 --- a/libplist +++ b/libplist @@ -1 +1 @@ -Subproject commit 9ca25d293fe7f8aca8d952fc7bb91464fe2d34ab +Subproject commit c81471ce6e8821ba03427824217612dcab8e091b