From b4778e09b569a976def709560a84fa705cebceb8 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 14 Nov 2014 11:00:24 +0100 Subject: [PATCH] libplist: update to 1.12 (soname bump); close #634. --- common/shlibs | 4 ++-- srcpkgs/libplist/template | 37 ++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/common/shlibs b/common/shlibs index ad1802e6db4..b5e0885a49c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -940,8 +940,8 @@ libsystemd-daemon.so.0 systemd-libs-43_1 libsystemd-id128.so.0 systemd-libs-43_1 libsystemd-journal.so.0 systemd-libs-43_1 libsystemd-login.so.0 systemd-libs-43_1 -libplist.so.1 libplist-1.4_1 -libplist++.so.1 libplist++-1.4_1 +libplist.so.3 libplist-1.12_1 +libplist++.so.3 libplist++-1.12_1 libnsbmp.so.0 libnsbmp-0.0.3_1 libnsgif.so.0 libnsgif-0.0.3_1 libparserutils.so.0 libparserutils-0.1.1_1 diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index da513912ef5..04242c704cf 100644 --- a/srcpkgs/libplist/template +++ b/srcpkgs/libplist/template @@ -1,41 +1,44 @@ # Template file for 'libplist' pkgname=libplist -version=1.8 -revision=5 -build_style=cmake -configure_args="-DCMAKE_SKIP_RPATH=ON" -hostmakedepends="cmake swig python-devel Cython" +version=1.12 +revision=1 +build_style=gnu-configure +configure_args="--disable-static" +hostmakedepends="automake libtool pkg-config python-devel Cython" makedepends="python-devel libglib-devel libxml2-devel" short_desc="Apple Property List library" maintainer="Juan RP " license="GPL-2, LGPL-2.1" homepage="http://libimobiledevice.org/" distfiles="http://www.libimobiledevice.org/downloads/${pkgname}-${version}.tar.bz2" -checksum=a418da3880308199b74766deef2a760a9b169b81a868a6a9032f7614e20500ec +checksum=0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be -disable_parallel_build=yes - -libplist++_package() { - short_desc+=" -- C++ runtime library" - pkg_install() { - vmove "usr/lib/libplist++.so.*" - } +pre_configure() { + sed -i 's,-L$(libdir),,g' cython/Makefile.am + export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/python2.7" + export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython2.7" + autoreconf -fi } +libplist++_package() { + short_desc+=" - C++ runtime library" + pkg_install() { + vmove usr/lib/libplist++.so.* + } +} libplist-python_package() { lib32disabled=yes - short_desc+=" -- Python bindings" + short_desc+=" - Python bindings" pkg_install() { vmove usr/lib/python2.7 } } - libplist-devel_package() { depends="libplist++>=${version}_${revision} libplist>=${version}_${revision}" - short_desc+=" -- development files" + short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" + vmove usr/lib/*.so } }