From 080a6ad2c3759083c02506e1348b689f2194d4eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 29 Feb 2024 11:41:17 +0000 Subject: gentoo auto-resync : 29:02:2024 - 11:41:17 --- app-pda/libimobiledevice/Manifest | 2 + .../files/libimobiledevice-1.3.0-cython3.patch | 48 +++++++++ .../libimobiledevice-1.3.0-r4.ebuild | 115 +++++++++++++++++++++ 3 files changed, 165 insertions(+) create mode 100644 app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch create mode 100644 app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild (limited to 'app-pda/libimobiledevice') diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest index a3e6638ff8ea..7ce5208c2e2b 100644 --- a/app-pda/libimobiledevice/Manifest +++ b/app-pda/libimobiledevice/Manifest @@ -1,6 +1,8 @@ +AUX libimobiledevice-1.3.0-cython3.patch 2349 BLAKE2B a7949577819e7e3431a97db508bd8e5dfa445393ae62ae8e85c652e655aaad3625af14d948b5dd3977cf682caaf9e21ec38273198b7037af5e5c75cf7125ddcc SHA512 d67f1c3941d9057fc1c5a71d5108ac2fad0680c2527b647e5e0016fcc61b338dfe69abac0f3aa84d2432039a32a987c58ea0a0da309b36cfb408e0bb886006a2 AUX libimobiledevice-1.3.0-missing_libflags.patch 796 BLAKE2B 2887ea67b4eaaca48d4fb63e8a7e46d7f66a8a255256a702b186426dc522ad4fc2727810cec9712b36ab78fd12dd4995110d945b0ff4f21ade0cc38a6211fc64 SHA512 25a0257260d85bb0722185251a430a5cc75fb7fd3b3eeeac8e2378fde0a223836c0d827473208663ee2cad9dbe8eabd7f15eb542509e3a2dba30067f21d52dd4 AUX libimobiledevice-1.3.0-python.patch 9419 BLAKE2B 63cde286cc51ef7448084abc0efab98a593caf6e039aff5bf97b3ff5def8c8904e935dc27cb552c7b7e601db3b29136341ec3a37978a66906d0e122c3ffe2c36 SHA512 ed6f18d41a55c616f0ed1625753ffc717facc970d4dfa0f8912559f1b8b7e22e09e0972a32ab1632fe948d370c56e77b6a125db3e241dfed679b89e57121d589 AUX libimobiledevice-1.3.0-slibtool.patch 5477 BLAKE2B 963072a0e577c52a2434d011bf684c5955a473154ad9726e77ba6e818071c9955bdc72e510721b6161031e96db49069e84948dff8458fc510526b9f21f8d78e1 SHA512 5064091b7bf858f78df9aec94f39fad98ac4969aa5c8889891840d07b8a404a0ba46949a22688805610cfcf287695c08dc11912494d7fbb9de75e6867d8a1b4f DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8 EBUILD libimobiledevice-1.3.0-r3.ebuild 2637 BLAKE2B 32282310ae530e77f641f944ff2ca6ca59101dbc6a2fe8d49683a4f7466af463de47c20d54db6b7d2060c46ff7b0117c70d48519b024a54de7a2204ecdfda6e9 SHA512 297a7a597c97b8a5f9399a333d5f9ee9553e1b109af73d4306a453db3429c41e1a943398f142ed497d2ecbdc186f060e927d864bf06dca09704c8ab04b56eed1 +EBUILD libimobiledevice-1.3.0-r4.ebuild 2657 BLAKE2B 53d087c1bb18262ab9bc4d735d1a6496df4d7a56859c0686345759ae265c607f2fcf2d2887b6fd4f5a93d1df635f40cff93070c3c8b1db2a0a75fd7234bfe3d9 SHA512 54f1c7721d57b23426312dd3b8552023f651b8c0aca767cc48ec863399e8b474e5279a8c6d16c86e9a7e8a9d395e0dab853e8fdcf175009854165922bf39482f MISC metadata.xml 346 BLAKE2B 5979763c0edb5ba8ea839769460571c50fff06027fa402e66b8f6927179e8898bde50732d847e775683b065eae274afa900b7a9ca6643ad98b4362fb9ec1385f SHA512 6252917ccb0280baea04596905530e2a37e364dfab87281987d9e8369e3fadc7eedded779d50bce6c0f2a39a9d224641c69bbc668f41765ff6f453bee4ea050b 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: + (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 +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: + (py_callback)(notification) + + cdef class NotificationProxyError(BaseError): + +From 7739a4bf61a0fa549646d6062978f126a1ff06fa Mon Sep 17 00:00:00 2001 +From: IridiumXOR +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 + (user_data)(event) diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild new file mode 100644 index 000000000000..2f506adc337c --- /dev/null +++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=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://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/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-2.2.0:= =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= + ) + python? ( + ${PYTHON_DEPS} + app-pda/libplist[python(-),${PYTHON_USEDEP}] + ) +" +DEPEND=" + ${RDEPEND} +" +BDEPEND=" + virtual/pkgconfig + doc? ( app-text/doxygen ) + python? ( dev-python/cython[${PYTHON_USEDEP}] ) +" + +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 +} + +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 \ + VPATH="${S}/cython:$1/cython" \ + imobiledevice_la_LIBADD="$1/src/libimobiledevice-1.0.la" + } + + emake -C "${BUILD_DIR}" + use python && python_foreach_impl python_compile "${BUILD_DIR}" + + if use doc; then + doxygen "${BUILD_DIR}"/doxygen.cfg || die + fi +} + +src_install() { + python_install() { + emake -C "${BUILD_DIR}/cython" install \ + DESTDIR="${D}" \ + VPATH="${S}/cython:$1/cython" + } + + emake -C "${BUILD_DIR}" install DESTDIR="${D}" + use python && python_foreach_impl python_install "${BUILD_DIR}" + use doc && dodoc docs/html/* + + if use python; then + insinto /usr/include/${PN}/cython + doins cython/imobiledevice.pxd + fi + + find "${D}" -name '*.la' -delete || die +} -- cgit v1.2.3