diff options
Diffstat (limited to 'app-pda')
70 files changed, 1881 insertions, 746 deletions
diff --git a/app-pda/barry/Manifest b/app-pda/barry/Manifest deleted file mode 100644 index 7c7ee3e3c3c0..000000000000 --- a/app-pda/barry/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST barry-0.18.3.tar.bz2 3457451 BLAKE2B ba7f49e95ac85d764c1275f6dc06f4a7be080d8d725466e1bb8d23977437879f2f7bf7581d9f5bc1262a07f8d1478992ce3c62c9893504f1094dcfb16d944ebd SHA512 4944d22bd5f5a76201ca10ccaf9d12ecf21b298e5b9c8d3d503441e0ad0386a94699c48ae683004992508bb385e75ec137859509663148f2f148933fa508e7fd diff --git a/app-pda/barry/barry-0.18.3.ebuild b/app-pda/barry/barry-0.18.3.ebuild deleted file mode 100644 index c6d007d92d4b..000000000000 --- a/app-pda/barry/barry-0.18.3.ebuild +++ /dev/null @@ -1,103 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit bash-completion-r1 eutils flag-o-matic gnome2-utils ltprune udev - -DESCRIPTION="Sync, backup, program management, and charging for BlackBerry devices" -HOMEPAGE="http://www.netdirect.ca/software/packages/barry/" -SRC_URI="mirror://sourceforge/barry/${P}.tar.bz2" - -LICENSE="CC-BY-SA-3.0 GPL-2" #See logo/README for CCPL -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="boost doc gui nls static-libs" - -RDEPEND=">=dev-cpp/libxmlpp-2.6:2.6 - dev-libs/glib:2 - >=dev-libs/libtar-1.2.11-r2 - >=media-libs/libsdl-1.2 - >=sys-fs/fuse-2.5:= - sys-libs/zlib - virtual/libusb:1 - boost? ( >=dev-libs/boost-1.33 ) - gui? ( - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/libglademm:2.4 - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( >=app-doc/doxygen-1.5.6 ) - nls? ( >=sys-devel/gettext-0.18.1.1 )" - -DOCS=( AUTHORS ChangeLog KnownBugs NEWS README TODO ) - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.18.4-shared_ptr.patch - - append-cxxflags -std=c++11 - - sed -i -e 's:plugdev:usb:g' "${S}"/udev/99-blackberry-perms.rules || die - sed -i -e '/Icon/s:=.*:=barry:' "${S}"/menu/*.desktop || die -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable static-libs static) \ - $(use_enable boost) \ - $(use_enable gui) \ - --disable-desktop \ - --disable-rpath -} - -src_compile() { - default - - if use doc; then - cd "${S}" - doxygen || die - fi -} - -src_install() { - default - - # docs - rm -rf "${S}"/doc/www/*.{php,sh} - find "${S}"/doc/www/doxygen/html -name "*.map" -size 0 -exec rm -f {} + - use doc && dohtml "${S}"/doc/www/doxygen/html/* - rm -rf "${S}"/doc/www - dodoc -r "${S}"/doc/* - - # Skipping different (old Fedora) rules 69-blackberry.rules in purpose - udev_dorules "${S}"/udev/10-blackberry.rules "${S}"/udev/99-blackberry-perms.rules - - # blacklist for BERRY_CHARGE kernel module - insinto /lib/modprobe.d - doins "${S}"/modprobe/blacklist-berry_charge.conf - - # pppd options files - docinto ppp - dodoc "${S}"/ppp/* - - dobashcomp "${S}"/bash/btool "${S}"/bash/bjavaloader - - newicon -s scalable "${S}"/logo/${PN}_logo_icon.svg ${PN}.svg - use gui && domenu "${S}"/menu/barrybackup.desktop - - prune_libtool_files -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/app-pda/barry/files/barry-0.18.4-shared_ptr.patch b/app-pda/barry/files/barry-0.18.4-shared_ptr.patch deleted file mode 100644 index dbccfe66ea21..000000000000 --- a/app-pda/barry/files/barry-0.18.4-shared_ptr.patch +++ /dev/null @@ -1,25 +0,0 @@ -With -std=c++-11 shared_ptr is available in the standard library so pulling in -the std::tr1 namespace creates an ambiguous reference. Simple fix is to stop -doing that but isn't backwards compatible. We don't care in Gentoo since we'll -always be building barry with -std=c++11 due to libsigc++ abi compatibility. - ---- a/tools/bio.cc -+++ b/tools/bio.cc -@@ -42,7 +42,6 @@ - #include "i18n.h" - - using namespace std; --using namespace std::tr1; - using namespace Barry; - - // keeping a record of all the -i device / -o device pin numbers, so ---- a/tools/btool.cc -+++ b/tools/btool.cc -@@ -59,7 +59,6 @@ - #include "barrygetopt.h" - - using namespace std; --using namespace std::tr1; - using namespace Barry; - - std::map<std::string, std::string> SortKeys; diff --git a/app-pda/barry/metadata.xml b/app-pda/barry/metadata.xml deleted file mode 100644 index 272edcda29d5..000000000000 --- a/app-pda/barry/metadata.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!--maintainer-needed--> - <longdescription lang="en"> - Barry is a utility for synchronization, backup, restore, - program management, and charging of BlackBerry devices. - </longdescription> - <use> - <flag name="boost">Enable boost support</flag> - <flag name="gui">Install the GUI backup tool</flag> - </use> - <upstream> - <remote-id type="sourceforge">barry</remote-id> - </upstream> -</pkgmetadata> diff --git a/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild b/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild index 2586a3d99648..2a392c90c3c1 100644 --- a/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild +++ b/app-pda/dynamite/dynamite-0.1.1_p20120512.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit autotools eutils +EAPI=7 + +inherit autotools DESCRIPTION="A tool for decompressing data compressed with PKWARE Data Compression Library" HOMEPAGE="https://github.com/twogood/dynamite https://sourceforge.net/projects/synce/" @@ -13,9 +14,13 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" IUSE="static-libs" +PATCHES=( + "${FILESDIR}"/${PN}-0.1.1_p20120512-dynamite-bootstrap.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-bootstrap.patch - ./bootstrap + default + ./bootstrap || die eautoreconf } @@ -24,8 +29,8 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + emake DESTDIR="${ED}" install dodoc ChangeLog README - find "${ED}" -name '*.la' -exec rm -f {} + + find "${ED}" -name '*.la' -delete || die } diff --git a/app-pda/dynamite/files/dynamite-bootstrap.patch b/app-pda/dynamite/files/dynamite-0.1.1_p20120512-dynamite-bootstrap.patch index 3ac2695f89b4..e8f571da7d92 100644 --- a/app-pda/dynamite/files/dynamite-bootstrap.patch +++ b/app-pda/dynamite/files/dynamite-0.1.1_p20120512-dynamite-bootstrap.patch @@ -1,5 +1,5 @@ ---- bootstrap -+++ bootstrap +--- a/bootstrap ++++ b/bootstrap @@ -26,8 +26,8 @@ INCLUDES="-I m4" fi diff --git a/app-pda/dynamite/metadata.xml b/app-pda/dynamite/metadata.xml index 79ff69eadbe0..c306f53555ff 100644 --- a/app-pda/dynamite/metadata.xml +++ b/app-pda/dynamite/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> <upstream> diff --git a/app-pda/gnupod/Manifest b/app-pda/gnupod/Manifest deleted file mode 100644 index 179bc103138b..000000000000 --- a/app-pda/gnupod/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnupod-0.99.8.tgz 207572 BLAKE2B a3f87ed0f3d66d83fb3aec5ebee3d490f01488e51627b57956c27fba7bac89c37cd2c38ec15d11f354f3af6eb2f72e73b918540737cc5d5723c32a001a0b765e SHA512 ac9ceadff371e052b6deb4067aa73e190ad109feb3337cc205d521fbab11b5bc1415e44907761711eeaaf7fcea6a1a841c08e2177fa912446cfe7495d2a5182b diff --git a/app-pda/gnupod/gnupod-0.99.8-r2.ebuild b/app-pda/gnupod/gnupod-0.99.8-r2.ebuild deleted file mode 100644 index 69c256e6492f..000000000000 --- a/app-pda/gnupod/gnupod-0.99.8-r2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit perl-module - -DESCRIPTION="A collection of Perl-scripts for iPod" -HOMEPAGE="https://www.gnu.org/software/gnupod/" -SRC_URI="http://blinkenlights.ch/gnupod-dist/stable/${P}.tgz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="aac ffmpeg flac mp3 ogg" - -RDEPEND="dev-perl/TimeDate - dev-perl/XML-Parser - >=dev-perl/MP3-Info-1.01 - dev-perl/Unicode-String - dev-perl/Digest-SHA1 - dev-perl/libwww-perl - ffmpeg? ( media-video/ffmpeg ) - flac? ( - dev-perl/Audio-FLAC-Header - media-libs/flac - aac? ( >=media-libs/faac-1.24 ) - mp3? ( media-sound/lame ) - !aac? ( media-sound/lame ) - ) - ogg? ( - dev-perl/Ogg-Vorbis-Header-PurePerl - media-sound/vorbis-tools - aac? ( >=media-libs/faac-1.24 ) - mp3? ( media-sound/lame ) - !aac? ( media-sound/lame ) - )" -DEPEND="${RDEPEND}" - -src_configure() { - econf -} - -src_compile() { - :; -} - -src_install() { - perl_set_version - sed -i -e "s:\$INC\[0\]/\$modi:${VENDOR_ARCH}/\$modi:g" \ - tools/gnupod_install.pl || die - - emake DESTDIR="${D}" install - - dodoc CHANGES README* doc/gnupodrc.example doc/gnutunesdb.example - dohtml doc/gnupod.html -} diff --git a/app-pda/gnupod/metadata.xml b/app-pda/gnupod/metadata.xml deleted file mode 100644 index 6f49eba8f496..000000000000 --- a/app-pda/gnupod/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/app-pda/gtkpod/files/gtkpod-2.1.5-conformance.patch b/app-pda/gtkpod/files/gtkpod-2.1.5-conformance.patch new file mode 100644 index 000000000000..f0fadb31ea2d --- /dev/null +++ b/app-pda/gtkpod/files/gtkpod-2.1.5-conformance.patch @@ -0,0 +1,11 @@ +diff -Naur a/libgtkpod/misc.c b/libgtkpod/misc.c +--- a/libgtkpod/misc.c 2015-06-02 19:14:21.000000000 +0100 ++++ b/libgtkpod/misc.c 2024-02-03 17:14:10.900114317 +0000 +@@ -39,6 +39,7 @@ + #include <sys/wait.h> + #include <unistd.h> + #include <glib/gi18n-lib.h> ++#include <libxml/parser.h> + #include "charset.h" + #include "clientserver.h" + #include "misc.h" diff --git a/app-pda/gtkpod/gtkpod-2.1.5.ebuild b/app-pda/gtkpod/gtkpod-2.1.5-r5.ebuild index 3e412ebd2564..aa7c9ab39f9f 100644 --- a/app-pda/gtkpod/gtkpod-2.1.5.ebuild +++ b/app-pda/gtkpod/gtkpod-2.1.5-r5.ebuild @@ -1,35 +1,37 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -GNOME2_LA_PUNT="yes" -GCONF_DEBUG="no" +EAPI=8 -inherit autotools eutils gnome2 +# Not all modules needed by py script are packaged in Gentoo +#PYTHON_COMPAT=( python3_{6..9} ) + +inherit autotools flag-o-matic gnome2-utils xdg #python-single-r1 DESCRIPTION="A graphical user interface to the Apple productline" -HOMEPAGE="http://www.gtkpod.org/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://sourceforge.net/projects/gtkpod/" +SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2 FDL-1.2" SLOT="0" -KEYWORDS="amd64 x86" +KEYWORDS="~amd64 ~x86" IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis" REQUIRED_USE="cdr? ( gstreamer )" +# ${PYTHON_DEPS} COMMON_DEPEND=" >=dev-libs/gdl-3.6:3 >=dev-libs/glib-2.31:2 >=dev-libs/libxml2-2.7.7:2 >=dev-util/anjuta-3.6 - >=media-libs/libgpod-0.8.2:= - >=media-libs/libid3tag-0.15 + >=media-libs/libgpod-0.8.2 + >=media-libs/libid3tag-0.15:= >=x11-libs/gtk+-3.0.8:3 aac? ( media-libs/faad2 ) clutter? ( >=media-libs/clutter-gtk-1.2:1.0 ) curl? ( >=net-misc/curl-7.10 ) - flac? ( media-libs/flac ) + flac? ( media-libs/flac:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 @@ -37,42 +39,56 @@ COMMON_DEPEND=" >=app-cdr/brasero-3 >=media-libs/libdiscid-0.2.2 media-libs/musicbrainz:5 - ) ) + ) mp3? ( media-sound/lame ) vorbis? ( media-libs/libvorbis media-sound/vorbis-tools - ) + ) " # to pull in at least -flac and -vorbis plugins , but others at the same time RDEPEND="${COMMON_DEPEND} gstreamer? ( media-plugins/gst-plugins-meta:1.0 ) " +# media-libs/gstreamer:1.0 needed at build time as we need m4 file for +# eautoreconf, bug #659748 DEPEND="${COMMON_DEPEND} + media-libs/gstreamer:1.0 +" + +BDEPEND=" dev-util/intltool - sys-devel/flex + app-alternatives/lex sys-devel/gettext - virtual/os-headers virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/${PN}-2.1.3-gold.patch + "${FILESDIR}"/${PN}-2.1.5-m4a.patch + "${FILESDIR}"/${PN}-2.1.5-conformance.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-2.1.3-gold.patch - epatch "${FILESDIR}"/${PN}-2.1.5-m4a.patch + default + +# python_fix_shebang scripts/ +# 2to3 --no-diffs -w scripts/sync-palm-jppy.py || die - sed -i -e 's:python:python2:' scripts/sync-palm-jppy.py || die + gnome2_disable_deprecation_warning eautoreconf - gnome2_src_prepare } src_configure() { # Prevent sandbox violations, bug #420279 addpredict /dev - gnome2_src_configure \ + append-flags -fcommon #722504 + + econf \ --enable-deprecations \ --disable-static \ --disable-plugin-coverweb \ @@ -86,7 +102,7 @@ src_configure() { } src_install() { - gnome2_src_install \ + emake \ DESTDIR="${D}" \ docdir=/usr/share/doc/${PF}/html \ figuresdir=/usr/share/doc/${PF}/html/figures \ @@ -94,4 +110,19 @@ src_install() { dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING rm -f "${ED}"/usr/share/gtkpod/data/{AUTHORS,COPYING} || die + + # Needs unpackaged python modules + rm -f "${ED}"/usr/share/gtkpod/scripts/sync-palm-jppy.py || die + + find "${D}" -name '*.la' -type f -delete || die +} + +pkg_postinst() { + gnome2_schemas_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_schemas_update + xdg_pkg_postrm } diff --git a/app-pda/gtkpod/metadata.xml b/app-pda/gtkpod/metadata.xml index 94faaf79ac49..64a6166579d0 100644 --- a/app-pda/gtkpod/metadata.xml +++ b/app-pda/gtkpod/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>chewi@gentoo.org</email> + <name>James Le Cuirot</name> + </maintainer> <use> <flag name="clutter">Enable clutter support for displaying coverart</flag> </use> diff --git a/app-pda/ideviceinstaller/Manifest b/app-pda/ideviceinstaller/Manifest index de74f2fb71eb..086a519e54a9 100644 --- a/app-pda/ideviceinstaller/Manifest +++ b/app-pda/ideviceinstaller/Manifest @@ -1 +1,2 @@ DIST ideviceinstaller-1.1.0.tar.bz2 272210 BLAKE2B da67c16d046e148d11bafcd1f33a8e5a5cba49c6f975ba038602eaf2444a76883d568e16583923c7303cce170e6718fc1cfcd0b2cffed5a1eaf895944043d785 SHA512 8bf5dc30b8fa2f0c171ec3705db8d8d143d2520b2875fc05d9d325bd4f1ffdf29230557e57f3e824654ab3bb71bbaf9019aa573d4b1cce29a9c75bf15024d623 +DIST ideviceinstaller-1.1.1.tar.bz2 274494 BLAKE2B e3aaccc225556f401f4b26b49bf19dd582425dfc7ea0dc1e4e523ce1ff60b643466d021d9d4c1205487551a4968ccafc410adb9e09248ab1a651c8d2a81a73ed SHA512 fd117a5745890746237f381c9fe0e01cf8ea06d9c2341da397c52e5ebc0e058c73797e349a0a81b2777f5333dafc32e5c32e9e2c99ee70a864be159fe73e9568 diff --git a/app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild b/app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild index a5c3f139631c..31433cd20a84 100644 --- a/app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild +++ b/app-pda/ideviceinstaller/ideviceinstaller-1.1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 DESCRIPTION="A tool to interact with the installation_proxy of an Apple's iDevice" HOMEPAGE="http://www.libimobiledevice.org/" @@ -10,16 +10,14 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="" RDEPEND=">=app-pda/libimobiledevice-1.1.4:= >=app-pda/libplist-1.8:= >=dev-libs/libzip-0.8" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -DOCS=( AUTHORS NEWS README ) +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { + default sed -i -e 's:-Werror -g::' configure || die } diff --git a/app-pda/ideviceinstaller/ideviceinstaller-1.1.1.ebuild b/app-pda/ideviceinstaller/ideviceinstaller-1.1.1.ebuild new file mode 100644 index 000000000000..6d9a50718818 --- /dev/null +++ b/app-pda/ideviceinstaller/ideviceinstaller-1.1.1.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="A tool to interact with the installation_proxy of an Apple's iDevice" +HOMEPAGE="https://libimobiledevice.org" +SRC_URI="https://github.com/libimobiledevice/ideviceinstaller/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=">=app-pda/libimobiledevice-1.3.0:= + >=app-pda/libplist-2.3.0:= + >=dev-libs/libzip-0.8" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + sed -i -e 's:-Werror -g::' configure || die +} diff --git a/app-pda/ideviceinstaller/metadata.xml b/app-pda/ideviceinstaller/metadata.xml index 6f49eba8f496..85e4ed814fa2 100644 --- a/app-pda/ideviceinstaller/metadata.xml +++ b/app-pda/ideviceinstaller/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> </pkgmetadata> diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest index 81516e084162..61a706eaad20 100644 --- a/app-pda/ifuse/Manifest +++ b/app-pda/ifuse/Manifest @@ -1 +1 @@ -DIST ifuse-1.1.3.tar.bz2 90803 BLAKE2B fd47f2e73d11e8f7c26f5684f4287ba51a8c65b0d6e0ff058bdd0290810ab9de671a2a61a089713e7560506f607d47692d882c7e49d8d3d154f9cf7940e5e153 SHA512 bacf0b00ebc7681022f6e85daa005ee19c99f3222e5db5c4ea6630c2c46111dd3ccd7efcfdbcfabf06cc18ceb58b054c1adb2d106d9b3b7d60a12f3b79c64a3c +DIST ifuse-1.1.4.tar.bz2 94137 BLAKE2B 0abe1a2324820380faf5868f59a45c11aab8991ff8529bd6f64a279b046da88a9cd35b352cd89b4a64d36f35c56b46efab5138f3b72ec8886103ffaaeeff50f1 SHA512 671fabb0828fb6dd5ddba80ef418005305f4ee4676ab1078513a83582e84616f47c8973c25e1fdd8897b08a01a135080898a55d3ad8b31e89c0bb72ee865cdff diff --git a/app-pda/ifuse/ifuse-1.1.3.ebuild b/app-pda/ifuse/ifuse-1.1.4.ebuild index 9d0c2f66960c..f3e66f8690c3 100644 --- a/app-pda/ifuse/ifuse-1.1.3.ebuild +++ b/app-pda/ifuse/ifuse-1.1.4.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 inherit readme.gentoo-r1 DESCRIPTION="Mount Apple iPhone/iPod Touch file systems for backup purposes" -HOMEPAGE="http://www.libimobiledevice.org/" -SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2" +HOMEPAGE="https://www.libimobiledevice.org/ https://github.com/libimobiledevice/ifuse/" +SRC_URI="https://github.com/libimobiledevice/${PN}/releases/download/${PV}/${P}.tar.bz2" -LICENSE="LGPL-2.1" +LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND=">=app-pda/libimobiledevice-1.1.4:= - >=app-pda/libplist-1.8:= - >=sys-fs/fuse-2.7.0:=" -DEPEND="${RDEPEND} - virtual/pkgconfig" +KEYWORDS="amd64 ~arm64 x86" + +DEPEND=" + >=app-pda/libimobiledevice-1.3.0:= + >=app-pda/libplist-2.2:= + sys-fs/fuse:0 +" +RDEPEND=" + ${DEPEND} + app-pda/usbmuxd +" +BDEPEND="virtual/pkgconfig" DOC_CONTENTS="Only use this filesystem driver to create backups of your data. The music database is hashed, and attempting to add files will cause the diff --git a/app-pda/ifuse/metadata.xml b/app-pda/ifuse/metadata.xml index 6f49eba8f496..20483d49e48c 100644 --- a/app-pda/ifuse/metadata.xml +++ b/app-pda/ifuse/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> + </maintainer> + <upstream> + <remote-id type="github">libimobiledevice/ifuse</remote-id> + </upstream> </pkgmetadata> diff --git a/app-pda/iripdb/Manifest b/app-pda/iripdb/Manifest deleted file mode 100644 index 64ad4f9b5fee..000000000000 --- a/app-pda/iripdb/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST iRipDB-0.1.3b.zip 32000 BLAKE2B 139affccb8545756c0d0e2652b7b1851b588aad3fcbcad04a88ccb517bcb10bd7aa4d46bc87885a6b32b0d27564bb98cde2bf21846140eb572f9c1953dba4d8a SHA512 7d3811e12a8570a07d2381bf6e97c9818b0da5b38dca95fc66441635343d827395d16fcdc7cea49179c062888ecbd88722f379ed59664919e10050618e66e8d5 diff --git a/app-pda/iripdb/iripdb-0.1.3b.ebuild b/app-pda/iripdb/iripdb-0.1.3b.ebuild deleted file mode 100644 index 959d4997dc63..000000000000 --- a/app-pda/iripdb/iripdb-0.1.3b.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit toolchain-funcs - -MY_P="${P/iripdb/iRipDB}" - -DESCRIPTION="Allows generating the DB files necessary for the iRiver iHP-1xx" -HOMEPAGE="http://www.fataltourist.com/iripdb/" -SRC_URI="http://www.fataltourist.com/iripdb/${MY_P}.zip" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=" - media-libs/taglib - sys-libs/zlib -" -DEPEND="${RDEPEND} - app-arch/unzip -" - -S="${WORKDIR}/${PN}" - -src_compile() { - echo "$(tc-getCXX) ${CXXFLAGS} -c -o main.o main.cpp" - $(tc-getCXX) ${CXXFLAGS} -c -o main.o -I/usr/include/taglib main.cpp - echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o iripdb main.o -lz -lm -ltag -lstdc++" - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o iripdb main.o -lz -lm -ltag -lstdc++ -} - -src_install() { - dobin iripdb - dodoc AUTHORS README doc/iRivDB_structure -} diff --git a/app-pda/iripdb/metadata.xml b/app-pda/iripdb/metadata.xml deleted file mode 100644 index 039a8621d5cc..000000000000 --- a/app-pda/iripdb/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <longdescription lang="en"> - iRipDB allows generating the DB files necessary for the iRiver iHP-1xx - series of MP3/Ogg HD Player on Linux and Windows. That will allow you - to navigate your files through the artist/album/genre menus. It supports - adding MP3 and Ogg files at this point. It's released under the GNU's - General Public License and, at this moment only in source code form. - </longdescription> -</pkgmetadata> diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest index f39c0635233a..bc61a0072976 100644 --- a/app-pda/jpilot/Manifest +++ b/app-pda/jpilot/Manifest @@ -1 +1,2 @@ DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024 +DIST jpilot-2.0.1.tar.gz 1499084 BLAKE2B da10d1001e00901160be404cb50122b1b0fe0e1e8d2f03cc28fc44d19f037395ecea79b022f639dc00abdf7def65ed276afd1dbcc84e462c62370ef7c5bd6001 SHA512 a877d1c0480aa831d5667f8fbb946bfc4ba0e0cd88d55125a5b0225de138812df880a0372482c337500182c6a8544af674d89a804e0ac515427e141aa353fd54 diff --git a/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch new file mode 100644 index 000000000000..c6cf3665fdde --- /dev/null +++ b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch @@ -0,0 +1,36 @@ +https://bugs.gentoo.org/709790 +--- a/jpilot-dump.c ++++ b/jpilot-dump.c +@@ -76,7 +76,7 @@ const char *formatT; + * this code but must be instantiated for the code to compile. + * The same is true of the functions which are only used in GUI mode. */ + pid_t jpilot_master_pid = -1; +-int pipe_to_parent; ++extern int pipe_to_parent; + GtkWidget *glob_dialog; + GtkWidget *glob_date_label; + gint glob_date_timer_tag; +--- a/jpilot-sync.c ++++ b/jpilot-sync.c +@@ -37,7 +37,8 @@ + #include "otherconv.h" + + /******************************* Global vars **********************************/ +-int pipe_to_parent, pipe_from_parent; ++extern int pipe_to_parent; ++int pipe_from_parent; + pid_t glob_child_pid; + unsigned char skip_plugins; + +--- a/jpilot.c ++++ b/jpilot.c +@@ -84,7 +84,8 @@ + /* #define PIPE_DEBUG */ + /******************************* Global vars **********************************/ + /* Application-wide globals */ +-int pipe_from_child, pipe_to_parent; ++extern int pipe_to_parent; ++int pipe_from_child; + int pipe_from_parent, pipe_to_child; + /* Main GTK window for application */ + GtkWidget *window; diff --git a/app-pda/jpilot/files/jpilot-2.0.1-fix-configure-clang16.patch b/app-pda/jpilot/files/jpilot-2.0.1-fix-configure-clang16.patch new file mode 100644 index 000000000000..483ff942c95a --- /dev/null +++ b/app-pda/jpilot/files/jpilot-2.0.1-fix-configure-clang16.patch @@ -0,0 +1,25 @@ +Clang16 will not allow implicit library functions by default +and therefore this test would fail because the function +exit() from stdlib.h is used. We need to include stdlib.h +in this test. +This patch needs to run _before_ eautoreconf. + +Bug: https://bugs.gentoo.org/870535 +PR to merge this upstream: https://github.com/juddmon/jpilot/pull/50 + +Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-10) + +--- a/configure.in ++++ b/configure.in +@@ -331,7 +331,10 @@ CFLAGS="$CFLAGS $PILOT_FLAGS" + save_LIBS="$LIBS" + LIBS="$LIBS $PILOT_LIBS" + +-AC_TRY_COMPILE([#include <pi-version.h>], [ ++AC_TRY_COMPILE([ ++#include <stdlib.h> ++#include <pi-version.h> ++], [ + exit(0); + ], , + AC_MSG_ERROR([pilot-link header pi-version.h not found]) diff --git a/app-pda/jpilot/files/jpilot-2.0.1-fix-lto-type-mismatch.patch b/app-pda/jpilot/files/jpilot-2.0.1-fix-lto-type-mismatch.patch new file mode 100644 index 000000000000..3f197851feb3 --- /dev/null +++ b/app-pda/jpilot/files/jpilot-2.0.1-fix-lto-type-mismatch.patch @@ -0,0 +1,25 @@ +Date: Sat, 10 Dec 2022 21:27:26 +0100 +Subject: [PATCH] fix -lto-type-mismatch + +glob_date_label is declared everywhere as 'extern GtkWidget*'. +Except where it is actually declared. + +Bug: https://bugs.gentoo.org/865945 +PR to merge this upstream: https://github.com/juddmon/jpilot/pull/51 + +Pascal Jäger <pascal.jaeger@leimstift.de> (2022-12-10) + +--- a/jpilot-sync.c ++++ b/jpilot-sync.c +@@ -47,7 +47,7 @@ unsigned char skip_plugins; + * this code but must be instantiated for the code to compile. + * The same is true of the functions which are only used in GUI mode. */ + pid_t jpilot_master_pid = -1; +-int *glob_date_label; ++GtkWidget *glob_date_label; + GtkWidget *glob_dialog; + gint glob_date_timer_tag; + +-- +2.38.1 + diff --git a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild index e7518b102d75..0dd467c30b87 100644 --- a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild +++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -11,14 +11,15 @@ SRC_URI="http://jpilot.org/tarballs/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="nls" RDEPEND=" app-pda/pilot-link dev-libs/libgcrypt:0= x11-libs/gtk+:2" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" nls? ( dev-util/intltool sys-devel/gettext @@ -26,8 +27,9 @@ DEPEND="${RDEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch - "${FILESDIR}"/${PN}-1.8.2-fix-paths.patch + "${FILESDIR}"/${P}-qa-desktop-file.patch + "${FILESDIR}"/${P}-fix-paths.patch + "${FILESDIR}"/${P}-fno-common.patch ) src_prepare() { @@ -45,6 +47,6 @@ src_install() { default docompress -x /usr/share/doc/${PF}/icons - # .la files for plugins are useless - find "${D}" -name '*.la' -delete || die + # no static archives + find "${ED}" -name '*.la' -delete || die } diff --git a/app-pda/jpilot/jpilot-2.0.1.ebuild b/app-pda/jpilot/jpilot-2.0.1.ebuild new file mode 100644 index 000000000000..7bc6ff58acd4 --- /dev/null +++ b/app-pda/jpilot/jpilot-2.0.1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_PV="${PV//./_}" + +DESCRIPTION="Desktop Organizer Software for the Palm Pilot" +HOMEPAGE="http://www.jpilot.org/ https://github.com/juddmon/jpilot/" +SRC_URI="https://github.com/juddmon/jpilot/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" +IUSE="nls" + +RDEPEND=" + app-pda/pilot-link + dev-libs/libgcrypt:0= + x11-libs/gtk+:2" +DEPEND="${RDEPEND}" +BDEPEND=" + nls? ( + dev-util/intltool + sys-devel/gettext + ) + virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch + "${FILESDIR}"/${PN}-1.8.2-fix-paths.patch + "${FILESDIR}"/${P}-fix-configure-clang16.patch + "${FILESDIR}"/${P}-fix-lto-type-mismatch.patch +) + +src_prepare() { + default + sed -i -e 's|_UNQUOTED(ABILIB, "lib"|_UNQUOTED(ABILIB, "'$(get_libdir)'"|' configure.in || die + eautoreconf +} + +src_configure() { + econf $(use_enable nls) --with-pilot_prefix=/usr/include/libpisock/ +} + +src_install() { + default + docompress -x /usr/share/doc/${PF}/icons + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-pda/jpilot/metadata.xml b/app-pda/jpilot/metadata.xml index 6f49eba8f496..b917188dc10a 100644 --- a/app-pda/jpilot/metadata.xml +++ b/app-pda/jpilot/metadata.xml @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <maintainer status="active"> + <email>judd@engineer.com</email> + <name>Judd Montgomery</name> + </maintainer> + <remote-id type="github">juddmon/jpilot</remote-id> + </upstream> </pkgmetadata> diff --git a/app-pda/libimobiledevice-glue/Manifest b/app-pda/libimobiledevice-glue/Manifest new file mode 100644 index 000000000000..309afdf12745 --- /dev/null +++ b/app-pda/libimobiledevice-glue/Manifest @@ -0,0 +1 @@ +DIST libimobiledevice-glue-1.1.0.tar.bz2 324600 BLAKE2B 3fcd92de24884d73b83767ace135246c45b60b1221a9937b7d8d4e42f4ccc2105e1f88854682bcef3002af22913df76f61a40d0bece20a354def1b54e260d242 SHA512 5d3522f764bd33a847ec1773d6493a2671965f2432b569d7e2c98746dca7440188823e46a405893d936f725c6bc522bd273b16234e8780cf87b602fc395bdf75 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 000000000000..1f5b8dfc748a --- /dev/null +++ b/app-pda/libimobiledevice-glue/libimobiledevice-glue-1.1.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Support library for libimobiledevice projects" +HOMEPAGE="https://github.com/libimobiledevice/libimobiledevice-glue" +SRC_URI="https://github.com/libimobiledevice/libimobiledevice-glue/releases/download/${PV}/${P}.tar.bz2" + +LICENSE="LGPL-2.1+" +SLOT="0/0.1.0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" + +RDEPEND=">=app-pda/libplist-2.3:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_install() { + default + find "${D}" -name '*.la' -delete || die +} diff --git a/app-pda/libimobiledevice-glue/metadata.xml b/app-pda/libimobiledevice-glue/metadata.xml new file mode 100644 index 000000000000..4f1857e5d278 --- /dev/null +++ b/app-pda/libimobiledevice-glue/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> + </maintainer> + <upstream> + <remote-id type="github">libimobiledevice/libimobiledevice-glue</remote-id> + </upstream> +</pkgmetadata> diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest index b2c3bec82174..c02e6d5bd5d7 100644 --- a/app-pda/libimobiledevice/Manifest +++ b/app-pda/libimobiledevice/Manifest @@ -1,5 +1,2 @@ -DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2 -DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172 -DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9 -DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589 -DIST libimobiledevice-1.2.1_pre20200220.tar.bz2 193582 BLAKE2B 7fab2101ee96a5fcc5dc68bad1a6c9fef25d87f25660cbce9aef45f8830c0162179f07e3d8a0f1d7d60bb7a219b1c4ee2513d43f98e8e4ea0d891686600c370e SHA512 f9d04941685f1cb0e982d061a6ea92d88d1d90157a789460e09e6af72954ed7a7f0448efbef3fe3cbca380195ffa658f7d8119e812f8ba8003c1e8a242976865 +DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8 +DIST libimobiledevice-1.3.0_p20240201.tar.gz 405723 BLAKE2B 5f3672e6b3c180440c215d9411eb2f21fe9451d822707e5b11ffff6693dccabfb5d184ef35f36bce2af508cbdebb656923927558ef39669825679a8ebf3cc8ee SHA512 d3746b7e0803840489593c9a3d8c8b16f6d4be5e2cd5c947d05be31e49c095c6503ef9150c886a87c68f4694bc6c1bfba96c4578789adc8f165a6391d0e4918f diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch new file mode 100644 index 000000000000..c7b8cf0dcc2f --- /dev/null +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/898666 +https://github.com/libimobiledevice/libimobiledevice/pull/1521 + +--- a/cython/installation_proxy.pxi ++++ b/cython/installation_proxy.pxi +@@ -27,7 +27,7 @@ cdef extern from "libimobiledevice/installation_proxy.h": + instproxy_error_t instproxy_restore(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data) + instproxy_error_t instproxy_remove_archive(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data) + +-cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) with gil: ++cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) noexcept: + (<object>py_callback)(plist.plist_t_to_node(command, False), plist.plist_t_to_node(status, False)) + + cdef class InstallationProxyError(BaseError): + +From deba42ba94c13517ebdbe7a4d8177ab47a9589a5 Mon Sep 17 00:00:00 2001 +From: IridiumXOR <oliveriandrea@gmail.com> +Date: Thu, 11 Jan 2024 22:00:39 +0100 +Subject: [PATCH 2/3] Fix np_notify_cb for Cython 3 noexcept error + +--- a/cython/notification_proxy.pxi ++++ b/cython/notification_proxy.pxi +@@ -70,7 +70,7 @@ NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END + NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED + NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED + +-cdef void np_notify_cb(const_char_ptr notification, void *py_callback): ++cdef void np_notify_cb(const_char_ptr notification, void *py_callback) noexcept: + (<object>py_callback)(notification) + + cdef class NotificationProxyError(BaseError): + +From 7739a4bf61a0fa549646d6062978f126a1ff06fa Mon Sep 17 00:00:00 2001 +From: IridiumXOR <oliveriandrea@gmail.com> +Date: Thu, 11 Jan 2024 22:03:07 +0100 +Subject: [PATCH 3/3] Fix idevice_event_cb for Cython 3 noexcept error + +--- a/cython/imobiledevice.pyx ++++ b/cython/imobiledevice.pyx +@@ -94,7 +94,7 @@ cdef class iDeviceEvent: + def __get__(self): + return self._c_event.conn_type + +-cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) with gil: ++cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) noexcept: + cdef iDeviceEvent event = iDeviceEvent.__new__(iDeviceEvent) + event._c_event = c_event + (<object>user_data)(event) diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch new file mode 100644 index 000000000000..b52bf89355d9 --- /dev/null +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch @@ -0,0 +1,31 @@ +From 4b2f17e8cce8fa078aa55f5da5f726c20eac3e2e Mon Sep 17 00:00:00 2001 +From: Nikias Bassen <nikias@gmx.li> +Date: Tue, 13 Apr 2021 05:36:03 +0200 +Subject: [PATCH] common: Add missing *_LIBS and *_CFLAGS to fix build + +--- + common/Makefile.am | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/common/Makefile.am b/common/Makefile.am +index 4e3facba..ab01b834 100644 +--- a/common/Makefile.am ++++ b/common/Makefile.am +@@ -8,12 +8,17 @@ AM_CFLAGS = \ + $(libplist_CFLAGS) \ + $(libgnutls_CFLAGS) \ + $(libtasn1_CFLAGS) \ ++ $(libgcrypt_CFLAGS) \ + $(openssl_CFLAGS) \ + $(LFS_CFLAGS) + + AM_LDFLAGS = \ + $(libusbmuxd_LIBS) \ + $(libplist_LIBS) \ ++ $(libgnutls_LIBS) \ ++ $(libtasn1_LIBS) \ ++ $(libgcrypt_LIBS) \ ++ $(openssl_LIBS) \ + ${libpthread_LIBS} + + noinst_LTLIBRARIES = libinternalcommon.la diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch new file mode 100644 index 000000000000..28ca6da51ebd --- /dev/null +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch @@ -0,0 +1,223 @@ +https://github.com/libimobiledevice/libimobiledevice/pull/685 + +From fb337f26c8e58ed0ce0750f7899ccbd5da203dee Mon Sep 17 00:00:00 2001 +From: wendyisgr33n <wendyisgr33n@gmail.com> +Date: Mon, 30 Jul 2018 10:43:57 -0700 +Subject: [PATCH 1/5] Fixed AFC afc.pxi definitions for Python2/3 + compatibility. Added missing public method 'remove_path_and_contents' + +--- a/cython/afc.pxi ++++ b/cython/afc.pxi +@@ -52,6 +52,7 @@ cdef extern from "libimobiledevice/afc.h": + afc_error_t afc_read_directory(afc_client_t client, char *dir, char ***list) + afc_error_t afc_get_file_info(afc_client_t client, char *filename, char ***infolist) + afc_error_t afc_remove_path(afc_client_t client, char *path) ++ afc_error_t afc_remove_path_and_contents(afc_client_t client, char *path) + afc_error_t afc_rename_path(afc_client_t client, char *f, char *to) + afc_error_t afc_make_directory(afc_client_t client, char *dir) + afc_error_t afc_truncate(afc_client_t client, char *path, uint64_t newsize) +@@ -235,17 +236,17 @@ cdef class AfcClient(BaseService): + afc_file_mode_t c_mode + uint64_t handle + AfcFile f +- if mode == <bytes>'r': ++ if mode == b'r': + c_mode = AFC_FOPEN_RDONLY +- elif mode == <bytes>'r+': ++ elif mode == b'r+': + c_mode = AFC_FOPEN_RW +- elif mode == <bytes>'w': ++ elif mode == b'w': + c_mode = AFC_FOPEN_WRONLY +- elif mode == <bytes>'w+': ++ elif mode == b'w+': + c_mode = AFC_FOPEN_WR +- elif mode == <bytes>'a': ++ elif mode == b'a': + c_mode = AFC_FOPEN_APPEND +- elif mode == <bytes>'a+': ++ elif mode == b'a+': + c_mode = AFC_FOPEN_RDAPPEND + else: + raise ValueError("mode string must be 'r', 'r+', 'w', 'w+', 'a', or 'a+'") +@@ -282,6 +283,9 @@ cdef class AfcClient(BaseService): + cpdef remove_path(self, bytes path): + self.handle_error(afc_remove_path(self._c_client, path)) + ++ cpdef remove_path_and_contents(self, bytes path): ++ self.handle_error(afc_remove_path_and_contents(self._c_client, path)) ++ + cpdef rename_path(self, bytes f, bytes t): + self.handle_error(afc_rename_path(self._c_client, f, t)) + +@@ -308,17 +312,17 @@ cdef class Afc2Client(AfcClient): + afc_file_mode_t c_mode + uint64_t handle + AfcFile f +- if mode == <bytes>'r': ++ if mode == b'r': + c_mode = AFC_FOPEN_RDONLY +- elif mode == <bytes>'r+': ++ elif mode == b'r+': + c_mode = AFC_FOPEN_RW +- elif mode == <bytes>'w': ++ elif mode == b'w': + c_mode = AFC_FOPEN_WRONLY +- elif mode == <bytes>'w+': ++ elif mode == b'w+': + c_mode = AFC_FOPEN_WR +- elif mode == <bytes>'a': ++ elif mode == b'a': + c_mode = AFC_FOPEN_APPEND +- elif mode == <bytes>'a+': ++ elif mode == b'a+': + c_mode = AFC_FOPEN_RDAPPEND + else: + raise ValueError("mode string must be 'r', 'r+', 'w', 'w+', 'a', or 'a+'") + +From b71e8935949a1d6f419a3f783d804809fb4c309b Mon Sep 17 00:00:00 2001 +From: wendyisgr33n <wendyisgr33n@gmail.com> +Date: Mon, 30 Jul 2018 10:44:40 -0700 +Subject: [PATCH 2/5] Fixed debugserver.pxi PyString_AsString compatibility + with Python3 + +--- a/cython/debugserver.pxi ++++ b/cython/debugserver.pxi +@@ -44,7 +44,12 @@ cdef class DebugServerError(BaseError): + + + # from http://stackoverflow.com/a/17511714 +-from cpython.string cimport PyString_AsString ++# https://github.com/libimobiledevice/libimobiledevice/pull/198 ++from cpython cimport PY_MAJOR_VERSION ++if PY_MAJOR_VERSION <= 2: ++ from cpython.string cimport PyString_AsString ++else: ++ from cpython.bytes cimport PyBytes_AsString as PyString_AsString + cdef char ** to_cstring_array(list_str): + if not list_str: + return NULL + +From 44f54cdc0ebb052e4a642023bbf96504e6139ec9 Mon Sep 17 00:00:00 2001 +From: wendyisgr33n <wendyisgr33n@gmail.com> +Date: Mon, 30 Jul 2018 10:45:22 -0700 +Subject: [PATCH 3/5] Fixed bytes/strings check in imobiledevice.pyx for + compatibility with Python2/3 + +--- a/cython/imobiledevice.pyx ++++ b/cython/imobiledevice.pyx +@@ -171,7 +171,7 @@ from libc.stdlib cimport * + cdef class iDevice(Base): + def __cinit__(self, object udid=None, *args, **kwargs): + cdef char* c_udid = NULL +- if isinstance(udid, basestring): ++ if isinstance(udid, (str, bytes)): + c_udid = <bytes>udid + elif udid is not None: + raise TypeError("iDevice's constructor takes a string or None as the udid argument") + +From 8908619973e751b778d3fb73dc309cd5cb7f4122 Mon Sep 17 00:00:00 2001 +From: wendyisgr33n <wendyisgr33n@gmail.com> +Date: Mon, 30 Jul 2018 10:45:55 -0700 +Subject: [PATCH 4/5] Fixed bytes/strings checks in lockdown.pxi for + compatibility with Python2/3 + +--- a/cython/lockdown.pxi ++++ b/cython/lockdown.pxi +@@ -230,9 +230,9 @@ cdef class LockdownClient(PropertyListService): + + if issubclass(service, BaseService) and \ + service.__service_name__ is not None \ +- and isinstance(service.__service_name__, basestring): ++ and isinstance(service.__service_name__, (str, bytes)): + c_service_name = <bytes>service.__service_name__ +- elif isinstance(service, basestring): ++ elif isinstance(service, (str, bytes)): + c_service_name = <bytes>service + else: + raise TypeError("LockdownClient.start_service() takes a BaseService or string as its first argument") +@@ -253,7 +253,7 @@ cdef class LockdownClient(PropertyListService): + + if not hasattr(service_class, '__service_name__') and \ + not service_class.__service_name__ is not None \ +- and not isinstance(service_class.__service_name__, basestring): ++ and not isinstance(service_class.__service_name__, (str, bytes)): + raise TypeError("LockdownClient.get_service_client() takes a BaseService as its first argument") + + descriptor = self.start_service(service_class) + +From e59cbdbf4e7dba98ef57a54e314a89edfea0a3dc Mon Sep 17 00:00:00 2001 +From: wendyisgr33n <wendyisgr33n@gmail.com> +Date: Mon, 30 Jul 2018 10:47:48 -0700 +Subject: [PATCH 5/5] Fixed method visibility in mobilebackup2.pxi API + +--- a/cython/mobilebackup2.pxi ++++ b/cython/mobilebackup2.pxi +@@ -54,10 +54,10 @@ cdef class MobileBackup2Client(PropertyListService): + cdef inline BaseError _error(self, int16_t ret): + return MobileBackup2Error(ret) + +- cdef send_message(self, bytes message, plist.Node options): ++ cpdef send_message(self, bytes message, plist.Node options): + self.handle_error(mobilebackup2_send_message(self._c_client, message, options._c_node)) + +- cdef tuple receive_message(self): ++ cpdef tuple receive_message(self): + cdef: + char* dlmessage = NULL + plist.plist_t c_node = NULL +@@ -73,29 +73,34 @@ cdef class MobileBackup2Client(PropertyListService): + free(dlmessage) + raise + +- cdef int send_raw(self, bytes data, int length): ++ cpdef int send_raw(self, bytes data, int length): + cdef: +- uint32_t bytes = 0 ++ uint32_t bytes_recvd = 0 + mobilebackup2_error_t err +- err = mobilebackup2_send_raw(self._c_client, data, length, &bytes) ++ err = mobilebackup2_send_raw(self._c_client, data, length, &bytes_recvd) + try: + self.handle_error(err) +- return <bint>bytes ++ return <bint>bytes_recvd + except BaseError, e: + raise + +- cdef int receive_raw(self, bytes data, int length): ++ cpdef int receive_raw(self, bytearray data, int length): + cdef: +- uint32_t bytes = 0 ++ uint32_t bytes_recvd = 0 + mobilebackup2_error_t err +- err = mobilebackup2_receive_raw(self._c_client, data, length, &bytes) ++ err = mobilebackup2_receive_raw(self._c_client, data, length, &bytes_recvd) ++ ++ # Throwing an exception when we test if theres more data to read is excessive ++ if err == -1 and bytes_recvd == 0: ++ return 0 ++ + try: + self.handle_error(err) +- return <bint>bytes ++ return <bint>bytes_recvd + except BaseError, e: + raise + +- cdef float version_exchange(self, double[::1] local_versions): ++ cpdef float version_exchange(self, double[::1] local_versions): + cdef: + double[::1] temp = None + double remote_version = 0.0 +@@ -107,8 +112,8 @@ cdef class MobileBackup2Client(PropertyListService): + except BaseError, e: + raise + +- cdef send_request(self, bytes request, bytes target_identifier, bytes source_identifier, plist.Node options): ++ cpdef send_request(self, bytes request, bytes target_identifier, bytes source_identifier, plist.Node options): + self.handle_error(mobilebackup2_send_request(self._c_client, request, target_identifier, source_identifier, options._c_node)) + +- cdef send_status_response(self, int status_code, bytes status1, plist.Node status2): ++ cpdef send_status_response(self, int status_code, bytes status1, plist.Node status2): + self.handle_error(mobilebackup2_send_status_response(self._c_client, status_code, status1, status2._c_node)) diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch new file mode 100644 index 000000000000..1e9fa6caf585 --- /dev/null +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch @@ -0,0 +1,105 @@ +From 735ac51e0eeaa3419e85dbad9579401ae828f631 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Tue, 6 Apr 2021 13:06:35 -0700 +Subject: [PATCH] tools: Fix usage of LDFLAGS and LDADD. + +Signed-off-by: orbea <orbea@riseup.net> +--- + tools/Makefile.am | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 8ed8ad91..04a5faa7 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -40,8 +40,8 @@ bin_PROGRAMS = \ + + ideviceinfo_SOURCES = ideviceinfo.c + ideviceinfo_CFLAGS = $(AM_CFLAGS) +-ideviceinfo_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++ideviceinfo_LDFLAGS = $(AM_LDFLAGS) ++ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicename_SOURCES = idevicename.c + idevicename_CFLAGS = $(AM_CFLAGS) +@@ -50,8 +50,8 @@ idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicepair_SOURCES = idevicepair.c + idevicepair_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) +-idevicepair_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) $(libusbmuxd_LIBS) +-idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS) ++idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicesyslog_SOURCES = idevicesyslog.c + idevicesyslog_CFLAGS = $(AM_CFLAGS) +@@ -65,18 +65,18 @@ idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicebackup_SOURCES = idevicebackup.c + idevicebackup_CFLAGS = $(AM_CFLAGS) +-idevicebackup_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicebackup_LDFLAGS = $(AM_LDFLAGS) ++idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicebackup2_SOURCES = idevicebackup2.c + idevicebackup2_CFLAGS = $(AM_CFLAGS) +-idevicebackup2_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicebackup2_LDFLAGS = $(AM_LDFLAGS) ++idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + ideviceimagemounter_SOURCES = ideviceimagemounter.c + ideviceimagemounter_CFLAGS = $(AM_CFLAGS) +-ideviceimagemounter_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++ideviceimagemounter_LDFLAGS = $(AM_LDFLAGS) ++ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicescreenshot_SOURCES = idevicescreenshot.c + idevicescreenshot_CFLAGS = $(AM_CFLAGS) +@@ -95,13 +95,13 @@ idevicedate_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + ideviceprovision_SOURCES = ideviceprovision.c + ideviceprovision_CFLAGS = $(AM_CFLAGS) +-ideviceprovision_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++ideviceprovision_LDFLAGS = $(AM_LDFLAGS) ++ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c + idevicedebugserverproxy_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) +-idevicedebugserverproxy_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicedebugserverproxy_LDFLAGS = $(AM_LDFLAGS) ++idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicediagnostics_SOURCES = idevicediagnostics.c + idevicediagnostics_CFLAGS = $(AM_CFLAGS) +@@ -110,8 +110,8 @@ idevicediagnostics_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicedebug_SOURCES = idevicedebug.c + idevicedebug_CFLAGS = $(AM_CFLAGS) +-idevicedebug_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicedebug_LDFLAGS = $(AM_LDFLAGS) ++idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicenotificationproxy_SOURCES = idevicenotificationproxy.c + idevicenotificationproxy_CFLAGS = $(AM_CFLAGS) +@@ -120,10 +120,10 @@ idevicenotificationproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la + + idevicecrashreport_SOURCES = idevicecrashreport.c + idevicecrashreport_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS) +-idevicecrashreport_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicecrashreport_LDFLAGS = $(AM_LDFLAGS) ++idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la + + idevicesetlocation_SOURCES = idevicesetlocation.c + idevicesetlocation_CFLAGS = $(AM_CFLAGS) +-idevicesetlocation_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) +-idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la ++idevicesetlocation_LDFLAGS = $(AM_LDFLAGS) ++idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0_p20240201_time_h.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0_p20240201_time_h.patch new file mode 100644 index 000000000000..b158c97164b1 --- /dev/null +++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0_p20240201_time_h.patch @@ -0,0 +1,10 @@ +--- a/tools/afcclient.c ++++ b/tools/afcclient.c +@@ -36,6 +36,7 @@ + #include <signal.h> + #include <ctype.h> + #include <unistd.h> ++#include <time.h> + + #ifdef WIN32 + #include <windows.h> diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild deleted file mode 100644 index 6b1c60b021b4..000000000000 --- a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 ) - -inherit autotools python-r1 - -DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices" -HOMEPAGE="http://www.libimobiledevice.org/" - -# Get patches from Fedora -SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2 - https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> ${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch - https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> ${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch - https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> ${P}-git.patch" - -# While COPYING* doesn't mention 'or any later version', all the headers do, hence use + -LICENSE="GPL-2+ LGPL-2.1+" - -SLOT="0/6" # based on SONAME of libimobiledevice.so - -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="gnutls libressl python static-libs" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND=" - >=app-pda/libplist-1.11:= - >=app-pda/libusbmuxd-1.0.9:= - gnutls? ( - dev-libs/libgcrypt:0 - >=dev-libs/libtasn1-1.1 - >=net-libs/gnutls-2.2.0 ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) ) - python? ( - ${PYTHON_DEPS} - app-pda/libplist[python(-),${PYTHON_USEDEP}] ) -" -DEPEND="${RDEPEND} - virtual/pkgconfig - python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] ) -" - -BUILD_DIR="${S}_build" - -PATCHES=( - "${DISTDIR}"/${P}-git.patch - "${DISTDIR}"/${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch - "${DISTDIR}"/${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - local ECONF_SOURCE=${S} - - local myeconfargs=( $(use_enable static-libs static) ) - use gnutls && myeconfargs+=( --disable-openssl ) - - do_configure() { - mkdir -p "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - econf "${myeconfargs[@]}" "${@}" - popd >/dev/null || die - } - - do_configure_python() { - # Bug 567916 - local -x PYTHON_LDFLAGS="$(python_get_LIBS)" - do_configure "$@" - } - - do_configure --without-cython - use python && python_foreach_impl do_configure_python -} - -src_compile() { - python_compile() { - emake -C "${BUILD_DIR}"/cython -j1 \ - VPATH="${S}/cython:${native_builddir}/cython" \ - imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la" - } - - local native_builddir=${BUILD_DIR} - pushd "${BUILD_DIR}" >/dev/null || die - emake -j1 - use python && python_foreach_impl python_compile - popd >/dev/null || die -} - -src_install() { - python_install() { - emake -C "${BUILD_DIR}/cython" -j1 \ - VPATH="${S}/cython:${native_builddir}/cython" \ - DESTDIR="${D}" install - } - - local native_builddir=${BUILD_DIR} - pushd "${BUILD_DIR}" >/dev/null || die - emake -j1 DESTDIR="${D}" install - use python && python_foreach_impl python_install - popd >/dev/null || die - - dodoc docs/html/* - if use python; then - insinto /usr/include/${PN}/cython - doins cython/imobiledevice.pxd - fi - - find "${D}" -name '*.la' -delete || die -} diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild index 04ee38620ee7..c7233fe43fc1 100644 --- a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild +++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild @@ -1,54 +1,57 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -COMMIT="3d8d13f0a70cefc1b12571b7f6aa2d1d4c58cffb" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{9..11} ) inherit autotools python-r1 DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices" HOMEPAGE="https://www.libimobiledevice.org/" -SRC_URI="https://cgit.libimobiledevice.org/libimobiledevice.git/snapshot/libimobiledevice-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" +SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/${PV}/${P}.tar.bz2" # While COPYING* doesn't mention 'or any later version', all the headers do, hence use + LICENSE="GPL-2+ LGPL-2.1+" - -SLOT="0/6" # based on SONAME of libimobiledevice.so - -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="doc gnutls libressl python static-libs" +SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so +KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86" +IUSE="doc gnutls python static-libs" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND=" - >=app-pda/libplist-1.11:= - >=app-pda/libusbmuxd-1.1.0:= + >=app-pda/libplist-2.2.0:= <app-pda/libplist-2.3 + >=app-pda/libusbmuxd-2.0.2:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 - >=net-libs/gnutls-2.2.0 ) + >=net-libs/gnutls-2.2.0 + ) !gnutls? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) ) + dev-libs/openssl:0= + ) python? ( ${PYTHON_DEPS} - app-pda/libplist[python(-),${PYTHON_USEDEP}] ) + app-pda/libplist[python(-),${PYTHON_USEDEP}] + ) " - DEPEND=" ${RDEPEND} " - BDEPEND=" virtual/pkgconfig - doc? ( app-doc/doxygen ) - python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] ) + doc? ( app-text/doxygen ) + python? ( dev-python/cython[${PYTHON_USEDEP}] ) " -S="${WORKDIR}/${PN}-${COMMIT}" BUILD_DIR="${S}_build" +PATCHES=( + "${FILESDIR}/${P}-slibtool.patch" + "${FILESDIR}/${P}-missing_libflags.patch" #787962 + "${FILESDIR}/${P}-python.patch" + "${FILESDIR}"/${P}-cython3.patch # Bug #898666 +) + src_prepare() { default eautoreconf @@ -81,7 +84,7 @@ src_compile() { python_compile() { emake -C "${BUILD_DIR}"/cython \ VPATH="${S}/cython:$1/cython" \ - imobiledevice_la_LIBADD="$1/src/libimobiledevice.la" + imobiledevice_la_LIBADD="$1/src/libimobiledevice-1.0.la" } emake -C "${BUILD_DIR}" diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild new file mode 100644 index 000000000000..7d45aec2a2d6 --- /dev/null +++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +MY_COMMIT=73b6fd183872096f20e6d1007429546a317a7cb1 + +DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices" +HOMEPAGE="https://www.libimobiledevice.org/" +SRC_URI="https://github.com/libimobiledevice/libimobiledevice/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${MY_COMMIT} + +# While COPYING* doesn't mention 'or any later version', all the headers do, hence use + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86" +IUSE="doc gnutls readline static-libs" + +RDEPEND=" + app-pda/libimobiledevice-glue:= + >=app-pda/libplist-2.3:= + >=app-pda/libusbmuxd-2.0.2:= + gnutls? ( + dev-libs/libgcrypt:0 + >=dev-libs/libtasn1-1.1 + >=net-libs/gnutls-2.2.0 + ) + !gnutls? ( + dev-libs/openssl:0= + ) + readline? ( sys-libs/readline:= ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.0_p20240201_time_h.patch +) + +src_prepare() { + default + echo ${PV}-${MY_COMMIT} > .tarball-version + eautoreconf +} + +src_configure() { + local myeconfargs=( + --without-cython + $(use_enable static-libs static) + ) + use gnutls && myeconfargs+=( --disable-openssl ) + # --with-readline also causes readline to not be used + use readline || myeconfargs+=( --without-readline ) + econf "${myeconfargs[@]}" +} + +src_compile() { + emake + + if use doc; then + doxygen doxygen.cfg || die + fi +} + +src_install() { + emake install DESTDIR="${D}" + + use doc && dodoc docs/html/* + + find "${D}" -name '*.la' -delete || die +} diff --git a/app-pda/libimobiledevice/metadata.xml b/app-pda/libimobiledevice/metadata.xml index 6f49eba8f496..3553c5b69066 100644 --- a/app-pda/libimobiledevice/metadata.xml +++ b/app-pda/libimobiledevice/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> + </maintainer> + <upstream> + <remote-id type="github">libimobiledevice/libimobiledevice</remote-id> + </upstream> </pkgmetadata> diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest index 9004ee690105..d9ffa60af239 100644 --- a/app-pda/libplist/Manifest +++ b/app-pda/libplist/Manifest @@ -1 +1,2 @@ -DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be +DIST libplist-2.2.0.tar.xz 102932 BLAKE2B cca3099d5a2230feb67fd4d54777f2c3d0a083b811d2b7e3365399d2c2d2fff922a3c9f4924400810b71d92668779ede663c9ed2cebc8acd6f3b2c6e09285d90 SHA512 913a8d05239496d8e8e458e1cb974813d8b5ca013df9e0fddb97b1da6006c300f6ba2be2f3826fd157c0ae4ff2d003ecfdc55e2401884be26360ffe0ebdabd79 +DIST libplist-2.3.0.tar.xz 123876 BLAKE2B 2e5555eeeed5a7572fcdb98e537af842af1d056bb5fe42ae83b7e71e1a57535ee388fc263c9b7a495feccbe5d2d7c53c89987fb0a81573fe3f5ac9f884144cf7 SHA512 ce86f066ea03d86b3a6dcca5905044e93af46164ab55be167f7804926b7e28c3383a024903986fb273b8c40b07b749f5431048ce76e550674f83388d6cff7542 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 000000000000..7b9bdc353268 --- /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 <math.h> +- #include <float.h> +- ], [ +- 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 000000000000..2a57d06074a3 --- /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 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/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/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.1.0.ebuild b/app-pda/libplist/libplist-2.2.0-r4.ebuild index d4dfa2e6a791..d1180010c230 100644 --- a/app-pda/libplist/libplist-2.1.0.ebuild +++ b/app-pda/libplist/libplist-2.2.0-r4.ebuild @@ -1,19 +1,21 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{9..11} ) 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" +SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz" -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/3" -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="python static-libs" +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0/2.0-3" +KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86" +IUSE="python" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" RDEPEND="python? ( ${PYTHON_DEPS} )" DEPEND="${RDEPEND}" @@ -22,10 +24,14 @@ BDEPEND=" python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] ) " -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - 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() { @@ -34,13 +40,12 @@ src_prepare() { } src_configure() { - local ECONF_SOURCE=${S} - local myeconfargs=( $(use_enable static-libs static) ) + local ECONF_SOURCE="${S}" do_configure() { mkdir -p "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die - econf "${myeconfargs[@]}" "${@}" + econf --disable-static "${@}" popd >/dev/null || die } @@ -57,13 +62,16 @@ src_configure() { } 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.la" + plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la" } - local native_builddir=${BUILD_DIR} pushd "${BUILD_DIR}" >/dev/null || die emake use python && python_foreach_impl python_compile @@ -94,5 +102,13 @@ src_install() { doins cython/plist.pxd fi - find "${D}" -name '*.la' -delete || die + 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 } diff --git a/app-pda/libplist/libplist-2.3.0-r1.ebuild b/app-pda/libplist/libplist-2.3.0-r1.ebuild new file mode 100644 index 000000000000..432e1904e74f --- /dev/null +++ b/app-pda/libplist/libplist-2.3.0-r1.ebuild @@ -0,0 +1,49 @@ +# 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://www.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 ~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 + + # 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 +} 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..8b80dfcaf736 --- /dev/null +++ b/app-pda/libplist/libplist-2.3.0-r2.ebuild @@ -0,0 +1,50 @@ +# 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://www.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 +} diff --git a/app-pda/libplist/metadata.xml b/app-pda/libplist/metadata.xml index 7cae0531e52c..613a0433b959 100644 --- a/app-pda/libplist/metadata.xml +++ b/app-pda/libplist/metadata.xml @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> + </maintainer> <upstream> <bugs-to>https://github.com/libimobiledevice/libplist/issues</bugs-to> <remote-id type="github">libimobiledevice/libplist</remote-id> diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest index e5b74112edd0..3867523c0108 100644 --- a/app-pda/libusbmuxd/Manifest +++ b/app-pda/libusbmuxd/Manifest @@ -1,2 +1 @@ -DIST libusbmuxd-1.0.10.tar.bz2 292649 BLAKE2B 7ec9a576cb20f7e87cf1f31e57e66100c496e5809142d225df9b3cc295a71546bed2d90f41df3144f7316ce0aec5f08fad850c528e27f336bf96e9578bcffd04 SHA512 180cde2e9d0860d07d29813e68abf8ca807f75e98424b50acfc1ce941ba4260922959e1047a7d2bc754470c08ed55d0a15c9367487bd41c635a52b4fbf8ff535 -DIST libusbmuxd-2.0.1.tar.bz2 37373 BLAKE2B 3d7d8b4ccc5331f1f3868e67ac9726281dccb8eabc58cf78d4b8a921c403095adb18cd8ec4f156c06297abb8566daae04300709fd1afd35c57dbda155db03c0d SHA512 c2a977898ccd28d32f7754bac08829b57bc87ad958febded2c95087a06cb0b5a73daf087b3a00630701a7313fd3900f916846b77b4794321c90e6aa9f9246ed3 +DIST libusbmuxd-2.0.2.tar.xz 41960 BLAKE2B 74a031ec595e40cf0532c753553cb2c35785410eba41a0a0abf45ed23dd6af7528238386ee9c0a4f8709cd447192969f15504fcbb58476441dc593ae28c388d9 SHA512 ce940fc6741973ed09ff0e5428aef78577449ca8e13766e9cbe121f3a2a26873ca164f10b441cc046653cc8550b68cc869ecb57a50fc999cebb55702642c4766 diff --git a/app-pda/libusbmuxd/files/libusbmuxd-2.0.2-configure.patch b/app-pda/libusbmuxd/files/libusbmuxd-2.0.2-configure.patch new file mode 100644 index 000000000000..e8db338d65b7 --- /dev/null +++ b/app-pda/libusbmuxd/files/libusbmuxd-2.0.2-configure.patch @@ -0,0 +1,32 @@ +From 84fb81483703dfcc26e784256b6a19d75e8e58ee Mon Sep 17 00:00:00 2001 +From: Matthew Smith <matthew@gentoo.org> +Date: Sun, 12 Feb 2023 10:18:02 +0000 +Subject: [PATCH] autoconf: Fix -Wint-conversion in test + +-Wint-conversion becomes an error by default in clang-16, causing the +program_invocation_short_name test to fail. + +Bug: https://bugs.gentoo.org/893910 +--- a/configure.ac ++++ b/configure.ac +@@ -87,7 +87,7 @@ case ${host_os} in + ]) + AC_CHECK_FUNCS([pselect]) + AC_CACHE_CHECK(for program_invocation_short_name, ac_cv_program_invocation_short_name,[ +- AC_TRY_LINK([extern char* program_invocation_short_name;],[return program_invocation_short_name;], ++ AC_TRY_LINK([extern char* program_invocation_short_name;],[return program_invocation_short_name[0];], + [ac_cv_program_invocation_short_name=yes], + [ac_cv_program_invocation_short_name=no] + ) +@@ -95,7 +95,7 @@ case ${host_os} in + if test "x$ac_cv_program_invocation_short_name" = "xyes"; then + AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1, [Define if you have program_invocation_short_name]) + AC_CACHE_CHECK(if program_invocation_short_name is declared in errno.h, ac_cv_program_invocation_short_name_errno_h,[ +- AC_TRY_LINK([#include <errno.h>],[return program_invocation_short_name;], ++ AC_TRY_LINK([#include <errno.h>],[return program_invocation_short_name[0];], + [ac_cv_program_invocation_short_name_errno_h=yes], + [ac_cv_program_invocation_short_name_errno_h=no] + ) +-- +2.39.1 + diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild deleted file mode 100644 index 484a681d6a9f..000000000000 --- a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" -HOMEPAGE="http://www.libimobiledevice.org/" -SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2" - -# tools/iproxy.c is GPL-2+, everything else is LGPL-2.1+ -LICENSE="GPL-2+ LGPL-2.1+" -SLOT="0/4" # based on SONAME of libusbmuxd.so -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" -IUSE="kernel_linux static-libs" - -RDEPEND=" - >=app-pda/libplist-1.11:= - virtual/libusb:1 - !<app-pda/usbmuxd-1.0.8_p1 -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/os-headers - virtual/pkgconfig -" - -src_configure() { - local myeconfargs=( $(use_enable static-libs static) ) - use kernel_linux || myeconfargs+=( --without-inotify ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - if ! use static-libs; then - find "${D}" -name '*.la' -type f -delete || die - fi -} diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild index 5464424c6842..863023df28a5 100644 --- a/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild +++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,15 +7,14 @@ inherit autotools DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" HOMEPAGE="https://www.libimobiledevice.org/" -SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2" +SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz" LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+ -SLOT="0/6" # based on SONAME of libusbmuxd.so -KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" +SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so +KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86" IUSE="static-libs" RDEPEND=" - >=app-pda/libplist-2.1.0:= - !<app-pda/usbmuxd-1.0.8_p1 + >=app-pda/libplist-2.2.0:= " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r2.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r2.ebuild new file mode 100644 index 000000000000..71a05f67c96c --- /dev/null +++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r2.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools + +DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" +HOMEPAGE="https://www.libimobiledevice.org/" +SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz" +LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+ +SLOT="0/2.0-6" # based on SONAME of libusbmuxd-2.0.so +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ~ppc64 ~riscv ~s390 x86" +IUSE="static-libs" + +RDEPEND=" + >=app-pda/libplist-2.2.0:= +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +PATCHES=( "${FILESDIR}"/libusbmuxd-2.0.2-configure.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(usex kernel_linux '' --without-inotify) +} + +src_install() { + default + find "${D}" -name '*.la' -type f -delete || die +} diff --git a/app-pda/libusbmuxd/metadata.xml b/app-pda/libusbmuxd/metadata.xml index 6f49eba8f496..69d48f4ec89a 100644 --- a/app-pda/libusbmuxd/metadata.xml +++ b/app-pda/libusbmuxd/metadata.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> + </maintainer> + <upstream> + <remote-id type="github">libimobiledevice/libusbmuxd</remote-id> + </upstream> </pkgmetadata> diff --git a/app-pda/metadata.xml b/app-pda/metadata.xml index 94e264ce8154..fc197185a26e 100644 --- a/app-pda/metadata.xml +++ b/app-pda/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <longdescription lang="en"> The app-pda category contains software for working with personal digital @@ -32,4 +32,3 @@ Kategoria app-pda zawiera programy służące do współpracy z urządzeniami PDA. </longdescription> </catmetadata> - diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest index 2fefa7bae9e2..8ec3d3f907d0 100644 --- a/app-pda/pilot-link/Manifest +++ b/app-pda/pilot-link/Manifest @@ -1,2 +1,2 @@ -DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d +DIST pilot-link-0.12.5-gentoo-patchset-r2.tar.xz 8828 BLAKE2B 6ae7dc9297dedd667bff569150aaae22bb1990b9321774dd29a4b36e7bd824c3c1e7ba60eeb30380727f1acc947df48867c6e536d2901486ac09ea3e3dbdec18 SHA512 6d4e5a572684087b203932b6c199a2a19ba0418794d164f24b04a85873ad3f7f228c1b85b0d1031c30aaf8101db2022fc1490a27331ea7525c5f41e6068af306 DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868 diff --git a/app-pda/pilot-link/metadata.xml b/app-pda/pilot-link/metadata.xml index 6f49eba8f496..5cd473d53779 100644 --- a/app-pda/pilot-link/metadata.xml +++ b/app-pda/pilot-link/metadata.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <!-- maintainer-needed --> + <upstream> + <remote-id type="github">jichu4n/pilot-link</remote-id> + </upstream> </pkgmetadata> diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild deleted file mode 100644 index 3bcc02fd6ec9..000000000000 --- a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools distutils-r1 perl-module java-pkg-opt-2 - -DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop" -HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" -SRC_URI="mirror://gentoo/${P}.tar.bz2 - https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2" - -LICENSE="|| ( GPL-2 LGPL-2 )" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux" -IUSE="bluetooth debug java perl png python static-libs threads usb" - -COMMON_DEPEND=" - dev-libs/popt - >=sys-libs/ncurses-5.7-r7:0= - >=sys-libs/readline-6:0= - virtual/libiconv - bluetooth? ( net-wireless/bluez ) - perl? ( >=dev-lang/perl-5.12 ) - png? ( media-libs/libpng:0= ) - usb? ( virtual/libusb:0 ) -" -DEPEND="${COMMON_DEPEND} - java? ( >=virtual/jdk-1.4 ) -" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.4 ) -" - -RESTRICT="test" #672872 - -src_prepare() { - default - - eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch - eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch - eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch - eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch - eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libpng14.patch - eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-png.patch - eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch - eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch - eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch - - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600 - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - # tcl/tk support is disabled as per upstream request. - # readline is not really optional, bug #626504 - econf \ - --includedir="${EPREFIX}"/usr/include/libpisock \ - $(use_enable static-libs static) \ - --enable-conduits \ - --with-readline \ - $(use_enable threads) \ - $(use_enable usb libusb) \ - $(use_enable debug) \ - $(use_with png libpng) \ - $(use_with bluetooth bluez) \ - $(use_with perl) \ - $(use_with java) \ - --without-tcl \ - $(use_with python) -} - -src_compile() { - emake - - if use perl; then - cd "${S}"/bindings/Perl - perl-module_src_configure - local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629 - perl-module_src_compile - fi - - if use python; then - cd "${S}"/bindings/Python - distutils-r1_src_compile - fi -} - -src_install() { - emake DESTDIR="${D}" install - dodoc ChangeLog NEWS README doc/{README*,TODO} - - if use java; then - cd "${S}"/bindings/Java - java-pkg_newjar ${PN}.jar - java-pkg_doso libjpisock.so - fi - - if use perl; then - cd "${S}"/bindings/Perl - perl-module_src_install - fi - - if use python; then - cd "${S}"/bindings/Python - distutils-r1_src_install - fi - - find "${D}" -name '*.la' -delete || die -} - -pkg_preinst() { - perl_set_version - java-pkg-opt-2_pkg_preinst -} diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild new file mode 100644 index 000000000000..b8ad1bf67898 --- /dev/null +++ b/app-pda/pilot-link/pilot-link-0.12.5-r4.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic perl-module + +DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop" +# this is a new mirror; the distfile has the same content inside the tarball, +# but the tarball itself doesn't match due to recompression and Git +# indirection. +HOMEPAGE="https://github.com/jichu4n/pilot-link" +SRC_URI=" + mirror://gentoo/${P}.tar.bz2 + https://dev.gentoo.org/~soap/distfiles/${P}-gentoo-patchset-r2.tar.xz" + +LICENSE="|| ( GPL-2 LGPL-2 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bluetooth perl png threads usb" +RESTRICT="test" #672872 + +RDEPEND=" + dev-libs/popt + sys-libs/ncurses:= + sys-libs/readline:= + virtual/libiconv + bluetooth? ( net-wireless/bluez ) + perl? ( dev-lang/perl:= ) + png? ( media-libs/libpng:= ) + usb? ( virtual/libusb:0 )" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig + perl? ( dev-lang/perl )" + +PATCHES=( "${WORKDIR}/${P}-gentoo-patchset"/ ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # -Werror=lto-type-mismatch + # https://bugs.gentoo.org/924480 + # + # Upstream is abandoned since 2016, existing issue offering gentoo-patchset + # has been ignored. No bug filed. + # + # The issue is in the internal compat code for *not* using libusb. + use usb || filter-lto + + # tcl/tk support is disabled as per upstream request. + # readline is not really optional, bug #626504 + # Does not build with Java 8 + # Does not build with Python 3, bug #735238 + econf \ + --includedir="${EPREFIX}"/usr/include/libpisock \ + --enable-conduits \ + --with-readline \ + $(use_enable threads) \ + $(use_enable usb libusb) \ + $(use_with png libpng) \ + $(use_with bluetooth bluez) \ + $(use_with perl) \ + --without-java \ + --without-tcl \ + --without-python + + if use perl; then + perl_set_version + + cd bindings/Perl || die + perl-module_src_configure + fi +} + +src_compile() { + emake + + if use perl; then + cd bindings/Perl || die + local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629 + perl-module_src_compile + fi +} + +src_install() { + default + dodoc doc/{README*,TODO} + + if use perl; then + cd bindings/Perl || die + perl-module_src_install + fi + + find "${ED}" -name '*.la' -delete || die +} diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest index 7c2c79565f0f..9b037fbf4578 100644 --- a/app-pda/usbmuxd/Manifest +++ b/app-pda/usbmuxd/Manifest @@ -1,2 +1,2 @@ -DIST usbmuxd-1.1.0.tar.bz2 321897 BLAKE2B 3ca5d1da222e457ac01f3e87fb7573c6405e51fd5d270a2b3dab7601118f21be22232d5100b4d027273fc837e6a57f7a7d17d2c41ae59d7c5aa41f76bef5a03d SHA512 66aa0c40e912bf596b819098b87d88e9cf30b2e6352e607eeb778bd4f23bf9bb123fb6a6ecca2d4e4be3171e35d66200d632d2c9c80b1f2462bb45be8aa6912d -DIST usbmuxd-1.1.1_pre20200121.tar.bz2 51859 BLAKE2B 339d53904f7484bebb6d7524313ee065bf5a244efab16c77b30b8932071012105f21aa56083d82667b06088af83464ea8c86e3c28c5a45cb9abbe574a634533e SHA512 cc113b054e8e04d228af740ec43d2dbf29c015dc9d8e1cdd0eaf84bfcaa9838d5b1bf6db2efed30ffb84c35c88db5469983a115ffdbddbb6acd0df9fd2a5182f +DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da +DIST usbmuxd-1.1.1_p20231011.tar.gz 65638 BLAKE2B 68bfdcdf907241fbf3b8b41133e11f3b08c5007417a1ea86f5428a5c11f480f9e6a6a9073080976d84ed14b456f61e19ef2b2f161d5b1ec19367fe01eb89b435 SHA512 dfe2e39496aa6841aaa7c02dc5ad5425f4199d5e5ccf560438e5f07fff9050124918ce99a1b2e22fc5b8718e091aff81ff209467de16701a14279e994c5ceefe diff --git a/app-pda/usbmuxd/metadata.xml b/app-pda/usbmuxd/metadata.xml index 6f49eba8f496..3fe735a71c64 100644 --- a/app-pda/usbmuxd/metadata.xml +++ b/app-pda/usbmuxd/metadata.xml @@ -1,5 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> + <maintainer type="person" proxied="yes"> + <email>zurabid2016@gmail.com</email> + <name>Zurab Kvachadze</name> + </maintainer> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <maintainer type="person"> + <email>matthew@gentoo.org</email> + <name>Matthew Smith</name> + </maintainer> + <upstream> + <remote-id type="github">libimobiledevice/usbmuxd</remote-id> + </upstream> </pkgmetadata> diff --git a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild deleted file mode 100644 index 4220c366a73c..000000000000 --- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -AUTOTOOLS_AUTORECONF=1 -inherit autotools-utils udev user - -DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" -HOMEPAGE="http://www.libimobiledevice.org/" -SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2" - -# src/utils.h is LGPL-2.1+, rest is found in COPYING* -LICENSE="GPL-2 GPL-3 LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -IUSE="" - -RDEPEND=" - acct-group/plugdev - >=app-pda/libimobiledevice-1.1.6:= - <app-pda/libimobiledevice-1.2.1_pre0 - >=app-pda/libplist-1.11:= - virtual/libusb:1" -DEPEND="${RDEPEND} - virtual/os-headers - virtual/pkgconfig" - -pkg_setup() { - enewuser usbmux -1 -1 -1 "usb,plugdev" -} - -src_install() { - autotools-utils_src_install udevrulesdir="$(get_udevdir)"/rules.d -} diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild new file mode 100644 index 000000000000..59ac7d442a59 --- /dev/null +++ b/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd udev + +DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" +HOMEPAGE="https://libimobiledevice.org/" +SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P}.tar.bz2" + +# src/utils.h is LGPL-2.1+, rest is found in COPYING* +LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1+" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" +IUSE="selinux systemd" + +DEPEND=" + acct-user/usbmux + >=app-pda/libimobiledevice-1.3.0:= + >=app-pda/libplist-2.2:= <app-pda/libplist-2.3 + virtual/libusb:1= +" + +RDEPEND=" + ${DEPEND} + virtual/udev + selinux? ( sec-policy/selinux-usbmuxd ) + systemd? ( sys-apps/systemd ) +" + +BDEPEND=" + virtual/pkgconfig +" + +src_configure() { + econf \ + "$(use_with systemd)" \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + --with-udevrulesdir="$(get_udevdir)"/rules.d +} + +pkg_postrm() { + udev_reload +} + +pkg_postinst() { + udev_reload +} diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1_p20231011.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1_p20231011.ebuild new file mode 100644 index 000000000000..1e79cbeeeadb --- /dev/null +++ b/app-pda/usbmuxd/usbmuxd-1.1.1_p20231011.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools systemd udev + +MY_COMMIT=360619c5f721f93f0b9d8af1a2df0b926fbcf281 + +DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" +HOMEPAGE="https://libimobiledevice.org/" +SRC_URI="https://github.com/libimobiledevice/usbmuxd/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${MY_COMMIT} + +# src/utils.h is LGPL-2.1+, rest is found in COPYING* +LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +IUSE="selinux systemd" + +DEPEND=" + acct-user/usbmux + >=app-pda/libimobiledevice-1.3.0:= + app-pda/libimobiledevice-glue:= + >=app-pda/libplist-2.3:= + virtual/libusb:1= +" +RDEPEND=" + ${DEPEND} + virtual/udev + selinux? ( sec-policy/selinux-usbmuxd ) + systemd? ( sys-apps/systemd ) +" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + echo ${PV} > "${S}"/.tarball-version + eautoreconf +} + +src_configure() { + econf \ + "$(use_with systemd)" \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + --with-udevrulesdir="$(get_udevdir)"/rules.d +} + +pkg_postrm() { + udev_reload +} + +pkg_postinst() { + udev_reload +} diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild deleted file mode 100644 index 0451b37d3617..000000000000 --- a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -COMMIT="8a69f1a78a58476f77b66916091d2405d0cd815f" - -inherit autotools systemd udev - -DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices" -HOMEPAGE="https://www.libimobiledevice.org/" -SRC_URI="https://cgit.libimobiledevice.org/usbmuxd.git/snapshot/usbmuxd-${COMMIT}.tar.bz2 -> ${P}.tar.bz2" - -# src/utils.h is LGPL-2.1+, rest is found in COPYING* -LICENSE="GPL-2 GPL-3 LGPL-2.1+" -SLOT="0" -KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86" -IUSE="systemd" - -DEPEND=" - acct-user/usbmux - >=app-pda/libimobiledevice-1.2.1_pre0:= - >=app-pda/libplist-1.11:= - virtual/libusb:1" - -RDEPEND=" - ${DEPEND} - virtual/udev -" - -BDEPEND=" - virtual/pkgconfig -" - -S="${WORKDIR}/${PN}-${COMMIT}" - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - $(use_with systemd) \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - --with-udevrulesdir="$(get_udevdir)"/rules.d -} |