diff --git a/app-pda/libimobiledevice-glue/Manifest b/app-pda/libimobiledevice-glue/Manifest index ccc6a5c9c..b642dc119 100644 --- a/app-pda/libimobiledevice-glue/Manifest +++ b/app-pda/libimobiledevice-glue/Manifest @@ -1 +1,2 @@ DIST libimobiledevice-glue-1.0.0.gh.tar.gz 43281 BLAKE2B 6948d18cba94e41ecc98dbad7061386c361758eb82500802021adda519b9f832326e41ccd9a0564df72322c85a7db9f50dd1d1fad2d4be6783bd51d7e0010963 SHA512 a8dea2ebeb87e793f426f90fe5095fa836a743253d97a45f62fb4865166e0dfefe82d76bcfb01434c3f6df4a21223ac93f45d98f2624b16973cdd931db5e69ed +DIST libimobiledevice-glue-1.1.0.gh.tar.gz 46384 BLAKE2B 5b8954d7580d529d66f84f679df278252b22a9793dbe4f6e95529e861931677544ccc3493595740d7788d3885f5ee1682acc03b7db1c5407889daf0a86ce09b3 SHA512 4814306372407a7d35e5df22326bb76ece808548a4c44e250ec5efc08c3f9823a719be71072af2e09aa61dcc98d93cd62a85ac15595191686094a276181a281b diff --git a/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.1.0.ebuild b/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.1.0.ebuild new file mode 100644 index 000000000..c2c48ef59 --- /dev/null +++ b/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.1.0.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="Library with common code used by the libraries and tools around the libimobiledevice project" +HOMEPAGE="https://www.libimobiledevice.org/" +SRC_URI="https://github.com/libimobiledevice/libimobiledevice-glue/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz" +LICENSE="LGPL-2.1+" +SLOT="0" +#SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="static-libs" + +RDEPEND=" + >=app-pda/libplist-2.3.0:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +src_prepare() { + default + #define version in AC_INIT + sed -i -e "s|m4_esyscmd(./git-version-gen \$RELEASE_VERSION)|${PV}|g" configure.ac || die + eautoreconf + eapply_user +} + +src_configure() { + econf $(use_enable static-libs static) +} diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest new file mode 100644 index 000000000..cdd425a0a --- /dev/null +++ b/app-pda/libplist/Manifest @@ -0,0 +1 @@ +DIST libplist-2.4.0.tar.bz2 153927 BLAKE2B c12789688a109b8ddbe00f2c79627912a3adeabdaf9583165f8ebe30bc473efac3662d75c3fbb8a5667bde19e80c811175bf70541ec3be58410543c4b854325a SHA512 fcf70394bebea9373c370ea02f8d61c3dfc8e8c0ccee05ea8b162ee6c052e691635720cc5c6476c2ee61c417c60fe1a35fa05b9bf9b822ee9beec7d8da7fe5a2 diff --git a/app-pda/libplist/files/libplist-2.2.0-fmin.patch b/app-pda/libplist/files/libplist-2.2.0-fmin.patch new file mode 100644 index 000000000..7b9bdc353 --- /dev/null +++ b/app-pda/libplist/files/libplist-2.2.0-fmin.patch @@ -0,0 +1,34 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -79,19 +79,7 @@ + esac + AM_CONDITIONAL(WIN32, test x$win32 = xtrue) + +-# Check if we need libm for fmin +-CACHED_CFLAGS="$CFLAGS" +-CFLAGS="-O0" +-AC_CACHE_CHECK(if fmin is a builtin function, ac_cv_fmin_builtin, +- AC_TRY_LINK([ +- #include +- #include +- ], [ +- double val = 3.1415f * 0.55555f; +- double diff = fmin(val, DBL_MAX); +- if (diff > 0) return 1; +- ], ac_cv_fmin_builtin=yes, ac_cv_fmin_builtin=no)) +-CFLAGS="$CACHED_CFLAGS" ++AC_SEARCH_LIBS([fmin],[m]) + + # Check if struct tm has a tm_gmtoff member + AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff, +@@ -153,10 +141,6 @@ + AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS") + GLOBAL_LDFLAGS="$PTHREAD_LIBS" + +-if test "x$ac_cv_fmin_builtin" != "xyes"; then +- GLOBAL_LDFLAGS+=" -lm" +-fi +- + AC_ARG_ENABLE(debug, + AS_HELP_STRING([--enable-debug], + [build debug message output code (default is no)]), diff --git a/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch new file mode 100644 index 000000000..2a57d0607 --- /dev/null +++ b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch @@ -0,0 +1,9 @@ +--- a/src/libplist-2.0.pc.in ++++ b/src/libplist-2.0.pc.in +@@ -6,5 +6,5 @@ + Name: @PACKAGE_NAME@ + Description: A library to handle Apple Property Lists whereas they are binary or XML + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -lplist-2.0 ++Libs: -L${libdir} -lplist-2.0 -lplist + Cflags: -I${includedir} 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 000000000..2771a9f08 --- /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/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 000000000..dfe3714c4 --- /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 +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 + ], [ + 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/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 000000000..ca1144870 --- /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 +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.4.0.ebuild b/app-pda/libplist/libplist-2.4.0.ebuild new file mode 100644 index 000000000..c1548936b --- /dev/null +++ b/app-pda/libplist/libplist-2.4.0.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 +}