Skip to content

Use plist-2 API #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rickmark wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use plist-2 API #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4326580
Use plist-2 API
rickmark Dec 22, 2021
5466372
Fix for cmake builds as well
rickmark Dec 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
5 changes: 1 addition & 4 deletions ldid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion libplist
Open in desktop
Submodule libplist updated 182 files