* [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/, app-pda/libplist/files/
@ 2022-07-25 18:50 Matthew Smith
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Smith @ 2022-07-25 18:50 UTC (permalink / raw
To: gentoo-commits
commit: 75e60fe3e8e5b618c6a37d95e6e1d64ea173f8c3
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 18:24:10 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 18:50:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e60fe3
app-pda/libplist: fix strict aliasing violations
Apply a patch that was also sent upstream, and also:
* Bump to EAPI-8.
* Correct LICENSE variable.
Closes: https://bugs.gentoo.org/854837
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
.../files/libplist-2.2.0-strict-aliasing.patch | 32 ++++++
app-pda/libplist/libplist-2.2.0-r4.ebuild | 114 +++++++++++++++++++++
2 files changed, 146 insertions(+)
diff --git a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch b/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
new file mode 100644
index 000000000000..2771a9f08a69
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/854837
+https://github.com/libimobiledevice/libplist/pull/212
+--- a/src/bplist.c
++++ b/src/bplist.c
+@@ -998,18 +998,24 @@ static void write_real(bytearray_t * bplist, double val)
+ buff[7] = BPLIST_REAL | Log2(size);
+ if (size == sizeof(float)) {
+ float floatval = (float)val;
+- *(uint32_t*)(buff+8) = float_bswap32(*(uint32_t*)&floatval);
++ uint32_t intval;
++ memcpy(&intval, &floatval, sizeof(float));
++ *(uint32_t*)(buff+8) = float_bswap32(intval);
+ } else {
+- *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
++ uint64_t intval;
++ memcpy(&intval, &val, sizeof(double));
++ *(uint64_t*)(buff+8) = float_bswap64(intval);
+ }
+ byte_array_append(bplist, buff+7, size+1);
+ }
+
+ static void write_date(bytearray_t * bplist, double val)
+ {
++ uint64_t intval;
++ memcpy(&intval, &val, sizeof(double));
+ uint8_t buff[16];
+ buff[7] = BPLIST_DATE | 3;
+- *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
++ *(uint64_t*)(buff+8) = float_bswap64(intval);
+ byte_array_append(bplist, buff+7, 9);
+ }
+
diff --git a/app-pda/libplist/libplist-2.2.0-r4.ebuild b/app-pda/libplist/libplist-2.2.0-r4.ebuild
new file mode 100644
index 000000000000..23ac7bf3d03d
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0-r4.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit autotools python-r1 toolchain-funcs
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/2.0-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="python"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-fmin.patch
+ "${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
+ "${FILESDIR}"/${PN}-2.2.0-strict-aliasing.patch # bug 854837
+)
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local ECONF_SOURCE="${S}"
+
+ do_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+ econf --disable-static "${@}"
+ popd >/dev/null || die
+ }
+
+ do_configure_python() {
+ local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+ do_configure "$@"
+ }
+
+ # Don't prefer clang.
+ tc-export CC CXX
+
+ do_configure --without-cython
+ use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+ local native_builddir=${BUILD_DIR}
+ ln -s "${native_builddir}/src/libplist-2.0.la" \
+ "${native_builddir}/src/libplist.la" || die
+
+ python_compile() {
+ emake -C "${BUILD_DIR}"/cython \
+ VPATH="${S}/cython:${native_builddir}/cython" \
+ plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
+ }
+
+ pushd "${BUILD_DIR}" >/dev/null || die
+ emake
+ use python && python_foreach_impl python_compile
+ popd >/dev/null || die
+}
+
+src_test() {
+ emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+ python_install() {
+ emake -C "${BUILD_DIR}/cython" \
+ VPATH="${S}/cython:${native_builddir}/cython" \
+ DESTDIR="${D}" install
+ }
+
+ local native_builddir=${BUILD_DIR}
+ pushd "${BUILD_DIR}" >/dev/null || die
+ emake DESTDIR="${D}" install
+ use python && python_foreach_impl python_install
+ popd >/dev/null || die
+
+ einstalldocs
+
+ if use python ; then
+ insinto /usr/include/plist/cython
+ doins cython/plist.pxd
+ fi
+
+ find "${ED}" -name '*.la' -delete || die
+
+ # temporary fix for 2.2.0 release:
+ # bug #733082,
+ # https://github.com/libimobiledevice/libplist/issues/163
+ # upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
+ dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+ dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
+ dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/, app-pda/libplist/files/
@ 2023-10-08 9:43 Matthew Smith
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Smith @ 2023-10-08 9:43 UTC (permalink / raw
To: gentoo-commits
commit: 84d4e313781efd48619da4702103686e56a0231f
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 09:41:21 2023 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 09:43:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d4e313
app-pda/libplist: add 2.3.0
- Add Patch to fix flakey tests.
- Drop Python bindings. The only consumer is libimobiledevice, which will
also drop USE=python later.
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
app-pda/libplist/Manifest | 1 +
.../files/libplist-2.3.0-test-rename.patch | 471 +++++++++++++++++++++
app-pda/libplist/libplist-2.3.0.ebuild | 43 ++
3 files changed, 515 insertions(+)
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 7a8c3d90462f..40227277e1ef 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1 +1,2 @@
DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
+DIST libplist-2.3.0.tar.bz2 151851 BLAKE2B 0ea595c5de30b413548526e5f26660c96d53216182111e00817369d5069e2fa1a4982bc7252a97160e3d9f92d5edadd57bd1be0598754d1ed0872a85a6a6504d SHA512 494858ebd6ba41f51d714b4da470ba40c564d9f327dc07c8cbe50cb301a8ef078cd43fedd45473c3a8d1a714ce149fe6365c44b2cd4a12fb711256ce273720e4
diff --git a/app-pda/libplist/files/libplist-2.3.0-test-rename.patch b/app-pda/libplist/files/libplist-2.3.0-test-rename.patch
new file mode 100644
index 000000000000..ca1144870787
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.3.0-test-rename.patch
@@ -0,0 +1,471 @@
+From 2cd858c679d25633077ca78b67182a9b77653816 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Tue, 3 Oct 2023 10:41:32 +0100
+Subject: [PATCH] test: use unique output file names across tests
+
+Without the change tests ran in parallel occasionally clobber outputs of
+one another and fail as:
+
+ $ make check -j16 VERBOSE=y
+ ...
+ FAIL: huge
+ ==========
+ Converting
+ File ../test/data/5.plist is open
+ PList XML parsing succeeded
+ PList BIN writing succeeded
+ PList BIN parsing succeeded
+ PList XML writing succeeded
+ Size of input and output is different
+ Input size : 4292380
+ Output size : 4305301
+ Comparing
+ PList parsing failed
+ FAIL huge.test (exit status: 3)
+
+Closes: https://github.com/libimobiledevice/libplist/issues/234#issuecomment-1743820556
+--- a/test/amp.test
++++ b/test/amp.test
+@@ -3,7 +3,7 @@
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=amp.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
++DATAOUT0=$top_builddir/test/data/amp.test.out
+
+ rm -rf $DATAOUT0
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+--- a/test/bigarray++.test
++++ b/test/bigarray++.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/bigarray++.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/bigarray++.test.out
+--- a/test/bigarray.test
++++ b/test/bigarray.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/bigarray.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/bigarray.test.out
+--- a/test/cdata.test
++++ b/test/cdata.test
+@@ -5,7 +5,7 @@ set -e
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=cdata.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
++DATAOUT0=$top_builddir/test/data/cdata.test.bin
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/dates.test
++++ b/test/dates.test
+@@ -5,8 +5,8 @@ set -e
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=7.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
+-DATAOUT1=$top_builddir/test/data/$TESTFILE.xml
++DATAOUT0=$top_builddir/test/data/dates.test.bin
++DATAOUT1=$top_builddir/test/data/dates.test.xml
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+ $top_builddir/tools/plistutil -i $DATAOUT0 -o $DATAOUT1
+--- a/test/empty++.test
++++ b/test/empty++.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/empty++.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/empty++.test.out
+--- a/test/empty.test
++++ b/test/empty.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/empty.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/empty.test.out
+--- a/test/empty_keys.test
++++ b/test/empty_keys.test
+@@ -5,7 +5,7 @@ set -e
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=empty_keys.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
++DATAOUT0=$top_builddir/test/data/empty_keys.test.bin
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/entities.test
++++ b/test/entities.test
+@@ -5,7 +5,7 @@ set -e
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=entities.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
++DATAOUT0=$top_builddir/test/data/entities.test.bin
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/hex.test
++++ b/test/hex.test
+@@ -5,7 +5,7 @@ set -e
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=hex.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
++DATAOUT0=$top_builddir/test/data/hex.test.bin
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/huge++.test
++++ b/test/huge++.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/huge++.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/huge++.test.out
+--- a/test/huge.test
++++ b/test/huge.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/huge.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/huge.test.out
+--- a/test/invalid_tag.test
++++ b/test/invalid_tag.test
+@@ -3,7 +3,7 @@
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=invalid_tag.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
++DATAOUT0=$top_builddir/test/data/invalid_tag.test.out
+
+ rm -rf $DATAOUT0
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+--- a/test/json-int64-min-max.test
++++ b/test/json-int64-min-max.test
+@@ -13,7 +13,7 @@ fi
+ export PLIST_JSON_DEBUG=1
+
+ echo "Converting"
+-$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/json-int64-min-max.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json-int64-min-max.test.out
+--- a/test/json1.test
++++ b/test/json1.test
+@@ -13,7 +13,7 @@ fi
+ export PLIST_JSON_DEBUG=1
+
+ echo "Converting"
+-$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/json1.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json1.test.out
+--- a/test/json2.test
++++ b/test/json2.test
+@@ -13,7 +13,7 @@ fi
+ export PLIST_JSON_DEBUG=1
+
+ echo "Converting"
+-$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_jtest $DATASRC/$TESTFILE $DATAOUT/json2.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json2.test.out
+--- a/test/json3.test
++++ b/test/json3.test
+@@ -13,12 +13,12 @@ fi
+ export PLIST_JSON_DEBUG=1
+
+ echo "Converting input file to JSON"
+-$top_builddir/tools/plistutil -f json -i $DATASRC/$TESTFILE -o $DATAOUT/$TESTFILE.json
++$top_builddir/tools/plistutil -f json -i $DATASRC/$TESTFILE -o $DATAOUT/json3.test.json
+
+ echo "Converting to binary and back to JSON"
+-$top_builddir/test/plist_jtest $DATAOUT/$TESTFILE.json $DATAOUT/$TESTFILE.json.out
++$top_builddir/test/plist_jtest $DATAOUT/json3.test.json $DATAOUT/json3.test.json.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.json.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/json3.test.json.out
+
+-rm -f $DATAOUT/$TESTFILE.json
++rm -f $DATAOUT/json3.test.json
+--- a/test/large++.test
++++ b/test/large++.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/large++.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/large++.test.out
+--- a/test/large.test
++++ b/test/large.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/large.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/large.test.out
+--- a/test/malformed_dict.test
++++ b/test/malformed_dict.test
+@@ -3,7 +3,7 @@
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=malformed_dict.bplist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
++DATAOUT0=$top_builddir/test/data/malformed_dict.test.out
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/medium++.test
++++ b/test/medium++.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/medium++.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/medium++.test.out
+--- a/test/medium.test
++++ b/test/medium.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/medium.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/medium.test.out
+--- a/test/order.test
++++ b/test/order.test
+@@ -6,7 +6,7 @@ DATASRC=$top_srcdir/test/data
+ TESTFILE=order.bplist
+ DATAIN0=$DATASRC/$TESTFILE
+ DATAIN1=$DATASRC/order.plist
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
++DATAOUT0=$top_builddir/test/data/order.test.out
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/ostep-comments.test
++++ b/test/ostep-comments.test
+@@ -13,8 +13,8 @@ fi
+ export PLIST_OSTEP_DEBUG=1
+
+ echo "Converting"
+-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep-comments.test.out
+
+ echo "Comparing"
+ export PLIST_OSTEP_DEBUG=1
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep-comments.test.out
+--- a/test/ostep-strings.test
++++ b/test/ostep-strings.test
+@@ -13,8 +13,8 @@ fi
+ export PLIST_OSTEP_DEBUG=1
+
+ echo "Converting"
+-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep-strings.test.out
+
+ echo "Comparing"
+ export PLIST_OSTEP_DEBUG=1
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep-strings.test.out
+--- a/test/ostep1.test
++++ b/test/ostep1.test
+@@ -13,8 +13,8 @@ fi
+ export PLIST_OSTEP_DEBUG=1
+
+ echo "Converting"
+-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep1.test.out
+
+ echo "Comparing"
+ export PLIST_OSTEP_DEBUG=1
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep1.test.out
+--- a/test/ostep2.test
++++ b/test/ostep2.test
+@@ -13,7 +13,7 @@ fi
+ export PLIST_OTEST_DEBUG=1
+
+ echo "Converting"
+-$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_otest $DATASRC/$TESTFILE $DATAOUT/ostep2.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/ostep2.test.out
+--- a/test/recursion.test
++++ b/test/recursion.test
+@@ -3,7 +3,7 @@
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=recursion.bplist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.out
++DATAOUT0=$top_builddir/test/data/recursion.test.out
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/signedunsigned1.test
++++ b/test/signedunsigned1.test
+@@ -13,8 +13,8 @@ CMPFILE1=unsigned.bplist
+ DATACMP0=$DATASRC/$CMPFILE0
+ DATACMP1=$DATASRC/$CMPFILE1
+
+-DATAOUT0=$top_builddir/test/data/$TESTFILE0.bin
+-DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin
++DATAOUT0=$top_builddir/test/data/signedunsigned1.test.signed.bin
++DATAOUT1=$top_builddir/test/data/signedunsigned1.test.unsigned.bin
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+ $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1
+--- a/test/signedunsigned2.test
++++ b/test/signedunsigned2.test
+@@ -13,8 +13,8 @@ CMPFILE1=unsigned.plist
+ DATACMP0=$DATASRC/$CMPFILE0
+ DATACMP1=$DATASRC/$CMPFILE1
+
+-DATAOUT0=$top_builddir/test/data/$TESTFILE0.bin
+-DATAOUT1=$top_builddir/test/data/$TESTFILE1.bin
++DATAOUT0=$top_builddir/test/data/signedunsigned2.test.signed.bin
++DATAOUT1=$top_builddir/test/data/signedunsigned2.test.unsigned.bin
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+ $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1
+--- a/test/signedunsigned3.test
++++ b/test/signedunsigned3.test
+@@ -13,8 +13,8 @@ CMPFILE1=signedunsigned.plist
+ DATACMP0=$DATASRC/$CMPFILE0
+ DATACMP1=$DATASRC/$CMPFILE1
+
+-DATAOUT0=$top_builddir/test/data/$TESTFILE0.bin
+-DATAOUT1=$top_builddir/test/data/$TESTFILE1.xml
++DATAOUT0=$top_builddir/test/data/signedunsigned3.test.signed.bin
++DATAOUT1=$top_builddir/test/data/signedunsigned3.test.unsigned.xml
+
+ $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+ $top_builddir/tools/plistutil -i $DATAIN1 -o $DATAOUT1
+--- a/test/small++.test
++++ b/test/small++.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test++ $DATASRC/$TESTFILE $DATAOUT/small++.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/small++.test.out
+--- a/test/small.test
++++ b/test/small.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_test $DATASRC/$TESTFILE $DATAOUT/small.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/small.test.out
+--- a/test/timezone1.test
++++ b/test/timezone1.test
+@@ -5,9 +5,9 @@ set -e
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=7.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.tz0.bin
+-DATAOUT1=$top_builddir/test/data/$TESTFILE.tz1.bin
+-DATAOUT2=$top_builddir/test/data/$TESTFILE.tz2.bin
++DATAOUT0=$top_builddir/test/data/timezone1.test.tz0.bin
++DATAOUT1=$top_builddir/test/data/timezone1.test.tz1.bin
++DATAOUT2=$top_builddir/test/data/timezone1.test.tz2.bin
+
+ TZ=UTC $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+ TZ=Asia/Singapore $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT1
+--- a/test/timezone2.test
++++ b/test/timezone2.test
+@@ -5,10 +5,10 @@ set -e
+ DATASRC=$top_srcdir/test/data
+ TESTFILE=7.plist
+ DATAIN0=$DATASRC/$TESTFILE
+-DATAOUT0=$top_builddir/test/data/$TESTFILE.bin
+-DATAOUT1=$top_builddir/test/data/$TESTFILE.tz0.xml
+-DATAOUT2=$top_builddir/test/data/$TESTFILE.tz1.xml
+-DATAOUT3=$top_builddir/test/data/$TESTFILE.tz2.xml
++DATAOUT0=$top_builddir/test/data/timezone2.test.bin
++DATAOUT1=$top_builddir/test/data/timezone2.test.tz0.xml
++DATAOUT2=$top_builddir/test/data/timezone2.test.tz1.xml
++DATAOUT3=$top_builddir/test/data/timezone2.test.tz2.xml
+
+ TZ=UTC $top_builddir/tools/plistutil -i $DATAIN0 -o $DATAOUT0
+
+--- a/test/uid.test
++++ b/test/uid.test
+@@ -9,7 +9,7 @@ if ! test -d "$DATAOUT"; then
+ fi
+
+ echo "Converting"
+-$top_builddir/test/plist_btest $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_btest $DATASRC/$TESTFILE $DATAOUT/uid.test.out
+
+ echo "Comparing"
+-$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/$TESTFILE.out
++$top_builddir/test/plist_cmp $DATASRC/$TESTFILE $DATAOUT/uid.test.out
diff --git a/app-pda/libplist/libplist-2.3.0.ebuild b/app-pda/libplist/libplist-2.3.0.ebuild
new file mode 100644
index 000000000000..6d570f108b5e
--- /dev/null
+++ b/app-pda/libplist/libplist-2.3.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
+ "${FILESDIR}"/${PN}-2.3.0-test-rename.patch
+)
+
+src_prepare() {
+ default
+ RELEASE_VERSION=${PV} eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ --without-cython
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/, app-pda/libplist/files/
@ 2023-12-19 11:04 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-12-19 11:04 UTC (permalink / raw
To: gentoo-commits
commit: d19264ddf64e2a582739965121381cafc4b8ec1f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 10:17:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 11:03:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19264dd
app-pda/libplist: fix modern C issue in configure
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/libplist-2.3.0-configure-c99.patch | 22 ++++++++++
app-pda/libplist/libplist-2.3.0-r2.ebuild | 50 ++++++++++++++++++++++
2 files changed, 72 insertions(+)
diff --git a/app-pda/libplist/files/libplist-2.3.0-configure-c99.patch b/app-pda/libplist/files/libplist-2.3.0-configure-c99.patch
new file mode 100644
index 000000000000..dfe3714c46e2
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.3.0-configure-c99.patch
@@ -0,0 +1,22 @@
+https://github.com/libimobiledevice/libplist/commit/b3cf5bec39de69bf06c7813689f03cbe58f45ca9
+
+From b3cf5bec39de69bf06c7813689f03cbe58f45ca9 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@redhat.com>
+Date: Mon, 18 Dec 2023 11:14:40 +0100
+Subject: [PATCH] configure: Use string for tm_zone assignment
+
+This matches what the actual sources do. Clang 16 and GCC 14
+no longer support converting ints to pointers implicitly, so the
+configure probe always fails with these compilers.
+--- a/configure.ac
++++ b/configure.ac
+@@ -129,7 +129,7 @@ AC_CACHE_CHECK(for tm_zone in struct tm, ac_cv_struct_tm_zone,
+ #include <time.h>
+ ], [
+ struct tm tm;
+- tm.tm_zone = 1;
++ tm.tm_zone = (char*)"UTC";
+ ])],
+ [ac_cv_struct_tm_zone=yes],
+ [ac_cv_struct_tm_zone=no]
+
diff --git a/app-pda/libplist/libplist-2.3.0-r2.ebuild b/app-pda/libplist/libplist-2.3.0-r2.ebuild
new file mode 100644
index 000000000000..bd04f215b8c2
--- /dev/null
+++ b/app-pda/libplist/libplist-2.3.0-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
+ "${FILESDIR}"/${PN}-2.3.0-test-rename.patch
+ "${FILESDIR}"/${PN}-2.3.0-configure-c99.patch
+)
+
+src_prepare() {
+ default
+ RELEASE_VERSION=${PV} eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ --disable-static
+ --without-cython
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+
+ # bugs #733082, #915375
+ dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+ dosym ./libplist++-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist++.pc
+ dosym ./libplist++-2.0.so.4.3.0 /usr/$(get_libdir)/libplist++.so
+ dosym ./libplist-2.0.so.4.3.0 /usr/$(get_libdir)/libplist.so
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-12-19 11:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-25 18:50 [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/, app-pda/libplist/files/ Matthew Smith
-- strict thread matches above, loose matches on Subject: below --
2023-10-08 9:43 Matthew Smith
2023-12-19 11:04 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox