From: "Petr Vaněk" <arkamar@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/, app-pda/libplist/files/
Date: Sun, 22 Dec 2024 09:58:22 +0000 (UTC) [thread overview]
Message-ID: <1734861455.7d935e6667232e05aa1bb922275d0380c0e62f1b.arkamar@gentoo> (raw)
commit: 7d935e6667232e05aa1bb922275d0380c0e62f1b
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 09:55:26 2024 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 09:57:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d935e66
app-pda/libplist: drop 2.3.0-r2
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-pda/libplist/Manifest | 1 -
.../files/libplist-2.3.0-configure-c99.patch | 22 -
.../files/libplist-2.3.0-test-rename.patch | 471 ---------------------
app-pda/libplist/libplist-2.3.0-r2.ebuild | 50 ---
4 files changed, 544 deletions(-)
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 1ac9f02b1f69..ce9895191634 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,2 +1 @@
-DIST libplist-2.3.0.tar.xz 123876 BLAKE2B 2e5555eeeed5a7572fcdb98e537af842af1d056bb5fe42ae83b7e71e1a57535ee388fc263c9b7a495feccbe5d2d7c53c89987fb0a81573fe3f5ac9f884144cf7 SHA512 ce86f066ea03d86b3a6dcca5905044e93af46164ab55be167f7804926b7e28c3383a024903986fb273b8c40b07b749f5431048ce76e550674f83388d6cff7542
DIST libplist-2.6.0.tar.bz2 493169 BLAKE2B d022b64a02e30fe7d5f2937e8b6743b0af8f30cf2012e2c19da9f10366200d25968b11a401a62697ce46eb71d08111104115a993e2f578c36e19ccd42d9eb627 SHA512 67b9ef7c1cf1edd9e0a13462cc21a42dba6bb1ff4465edd56c5d4251e4063e71eb8839ed9952ffb8cdab9cd69ebb4ef46e5f804d3a2b4e44b4e04f6c571398a4
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
deleted file mode 100644
index dfe3714c46e2..000000000000
--- a/app-pda/libplist/files/libplist-2.3.0-configure-c99.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/libplist-2.3.0-test-rename.patch b/app-pda/libplist/files/libplist-2.3.0-test-rename.patch
deleted file mode 100644
index ca1144870787..000000000000
--- a/app-pda/libplist/files/libplist-2.3.0-test-rename.patch
+++ /dev/null
@@ -1,471 +0,0 @@
-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-r2.ebuild b/app-pda/libplist/libplist-2.3.0-r2.ebuild
deleted file mode 100644
index 4d3c47a1ae03..000000000000
--- a/app-pda/libplist/libplist-2.3.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2024 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://libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/4"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 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
-}
next reply other threads:[~2024-12-22 9:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-22 9:58 Petr Vaněk [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-19 11:04 [gentoo-commits] repo/gentoo:master commit in: app-pda/libplist/, app-pda/libplist/files/ Sam James
2023-10-08 9:43 Matthew Smith
2022-07-25 18:50 Matthew Smith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1734861455.7d935e6667232e05aa1bb922275d0380c0e62f1b.arkamar@gentoo \
--to=arkamar@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox