diff --git a/common/shlibs b/common/shlibs index 32d7b9301cfd59..77809c23f5e2ef 100644 --- a/common/shlibs +++ b/common/shlibs @@ -986,8 +986,8 @@ libisc-9.16.22.so bind-libs-9.16.22_1 libisccc-9.16.22.so bind-libs-9.16.22_1 libisccfg-9.16.22.so bind-libs-9.16.22_1 libns-9.16.22.so bind-libs-9.16.22_1 -libplist-2.0.so.3 libplist-2.2.0_1 -libplist++-2.0.so.3 libplist++-2.2.0_1 +libplist-2.0.so.4 libplist-2.7.0_1 +libplist++-2.0.so.4 libplist++-2.7.0_1 libnsbmp.so.0 libnsbmp-0.0.3_1 libnsgif.so.1 libnsgif-1.0.0_1 libparserutils.so.0 libparserutils-0.1.1_1 @@ -2277,8 +2277,9 @@ libQCoro6WebSockets.so.0 qcoro-qt6-0.10.0_1 libnpth.so.0 npth-1.1_1 libnpupnp.so.13 libnpupnp-6.1.1_1 libglfw.so.3 glfw-3.0.4_1 -libusbmuxd-2.0.so.6 libusbmuxd-2.0.2_1 +libusbmuxd-2.0.so.7 libusbmuxd-2.1.1_1 libimobiledevice-1.0.so.6 libimobiledevice-1.3.0_2 +libimobiledevice-glue-1.0.so.0 libimobiledevice-glue-1.3.2_1 libstfl.so.0 stfl-0.23_1 libCDApplet.so cairo-dock-plugins-3.4.0_1 libldns.so.3 libldns-1.7.1_4 @@ -3184,7 +3185,7 @@ libgstreamerd-3.so.0 libgstreamerd-3.7.0_2 libgtkdgl-3.so.0 libgtkdgl-3.7.0_2 libmega.so.30703 MEGAsdk-3.7.3c_2 libopenglrecorder.so.0 libopenglrecorder-0.1.0_1 -libgpod.so.4 libgpod-0.8.3_1 +libgpod.so.4 libgpod-0.8.3_5 libi2c.so.0 i2c-tools-4.0_1 libmarisa.so.0 marisa-0.2.5_1 libopencc.so.1.1 opencc-1.1.1_1 @@ -4175,6 +4176,7 @@ libstable-sort-private-samba.so samba-libs-4.20.1_1 libsys-rw-private-samba.so samba-libs-4.20.1_1 libtalloc-report-private-samba.so samba-libs-4.20.1_1 libtalloc-report-printf-private-samba.so samba-libs-4.20.1_1 +libtatsu.so.0 libtatsu-1.0.5_1 libtdb-wrap-private-samba.so samba-libs-4.20.1_1 libtime-basic-private-samba.so samba-libs-4.20.1_1 libtorture-private-samba.so samba-libs-4.20.1_1 diff --git a/srcpkgs/UxPlay/template b/srcpkgs/UxPlay/template index d4b5293bae0cd4..4b085c11ff5d3b 100644 --- a/srcpkgs/UxPlay/template +++ b/srcpkgs/UxPlay/template @@ -1,7 +1,7 @@ # Template file for 'UxPlay' pkgname=UxPlay version=1.72.3 -revision=1 +revision=2 build_style=cmake configure_args="-DNO_MARCH_NATIVE=ON" hostmakedepends="pkg-config" diff --git a/srcpkgs/clementine/template b/srcpkgs/clementine/template index 1b4a6b0e0f564f..348d59808970e0 100644 --- a/srcpkgs/clementine/template +++ b/srcpkgs/clementine/template @@ -1,7 +1,7 @@ # Template file for 'clementine' pkgname=clementine version=1.4.1 -revision=3 +revision=4 _fullver=${version}-35-g400085808 build_style=cmake configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON diff --git a/srcpkgs/droidcam/template b/srcpkgs/droidcam/template index 65ea52f89f5256..5a0f06213fde7d 100644 --- a/srcpkgs/droidcam/template +++ b/srcpkgs/droidcam/template @@ -1,7 +1,7 @@ # Template file for 'droidcam' pkgname=droidcam version=2.1.4 -revision=1 +revision=2 build_style=gnu-makefile make_use_env=true make_build_args="USBMUXD=-lusbmuxd-2.0 APPINDICATOR=ayatana-appindicator3-0.1" diff --git a/srcpkgs/gtkpod/template b/srcpkgs/gtkpod/template index f2c4197b958621..ebc229a41bdd31 100644 --- a/srcpkgs/gtkpod/template +++ b/srcpkgs/gtkpod/template @@ -1,7 +1,7 @@ # Template file for 'gtkpod' pkgname=gtkpod version=2.1.5 -revision=7 +revision=8 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="flex intltool pkg-config glib" diff --git a/srcpkgs/gvfs/template b/srcpkgs/gvfs/template index 1e6cf445f2f63f..82f2aabf46f25f 100644 --- a/srcpkgs/gvfs/template +++ b/srcpkgs/gvfs/template @@ -1,7 +1,7 @@ # Template file for 'gvfs' pkgname=gvfs version=1.56.1 -revision=2 +revision=3 build_style=meson configure_args="-Dsystemduserunitdir=no -Dtmpfilesdir=no -Dlogind=false -Dman=true -Dgoogle=false" diff --git a/srcpkgs/ideviceinstaller/template b/srcpkgs/ideviceinstaller/template index d0466f375bc33b..1dc6d09537de13 100644 --- a/srcpkgs/ideviceinstaller/template +++ b/srcpkgs/ideviceinstaller/template @@ -1,6 +1,6 @@ # Template file for 'ideviceinstaller' pkgname=ideviceinstaller -version=1.1.1 +version=1.2.0 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" @@ -12,9 +12,10 @@ license="GPL-2.0-or-later" homepage="https://libimobiledevice.org" changelog="https://raw.githubusercontent.com/libimobiledevice/ideviceinstaller/master/NEWS" distfiles="https://github.com/libimobiledevice/${pkgname}/archive/${version}.tar.gz" -checksum=b1401678a61f28c4aca95375c100b5a83ccc2cdfa0222c0de7ad0a2cfb4e3c9f +checksum=95d83ec07addd4e2f5a020c8cdbeb3a48eda20abcab9c6820216d07ab55b3b59 pre_configure() { sed -i "/AS_COMPILER_FLAGS(/s/-Werror//" configure.ac + echo $version > .tarball-version NOCONFIGURE=1 ./autogen.sh } diff --git a/srcpkgs/ifuse/template b/srcpkgs/ifuse/template index 95c48dbe8cd125..d60f650be4e215 100644 --- a/srcpkgs/ifuse/template +++ b/srcpkgs/ifuse/template @@ -1,10 +1,10 @@ # Template file for 'ifuse' pkgname=ifuse -version=1.1.4 +version=1.2.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config automake" -makedepends="fuse-devel libimobiledevice-devel" +makedepends="fuse3-devel libimobiledevice-devel" depends="usbmuxd" short_desc="FUSE filesystem to access the contents of an iPhone or iPod Touch" maintainer="Orphaned " @@ -12,8 +12,9 @@ license="LGPL-2.1-or-later" homepage="http://libimobiledevice.org/" changelog="https://raw.githubusercontent.com/libimobiledevice/ifuse/master/NEWS" distfiles="http://github.com/libimobiledevice/ifuse/archive/${version}.tar.gz" -checksum=2a00769e8f1d8bad50898b9d00baf12c8ae1cda2d19ff49eaa9bf580e5dbe78c +checksum=29ab853037d781ef19f734936454c7f7806d1c46fbcca6e15ac179685ab37c9c pre_configure() { + echo $version > .tarball-version autoreconf -fi } diff --git a/srcpkgs/kf6-solid/template b/srcpkgs/kf6-solid/template index dc8fe079e92dac..9eb72a9f0de356 100644 --- a/srcpkgs/kf6-solid/template +++ b/srcpkgs/kf6-solid/template @@ -1,7 +1,7 @@ # Template file for 'kf6-solid' pkgname=kf6-solid version=6.21.0 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt6-tools qt6-base flex pkg-config" makedepends="qt6-base-devel libmount-devel libplist-devel diff --git a/srcpkgs/kio-extras/template b/srcpkgs/kio-extras/template index d2dc0f53335f36..69ae0f33dddd16 100644 --- a/srcpkgs/kio-extras/template +++ b/srcpkgs/kio-extras/template @@ -1,7 +1,7 @@ # Template file for 'kio-extras' pkgname=kio-extras version=25.12.0 -revision=1 +revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF -DKF6_HOST_TOOLING=/usr/lib/cmake -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index ec90bbe5536555..2ec32ab3a13adf 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=21.2 -revision=3 +revision=4 _codename="Omega" _crossguid_ver="ca1bf4b810e2d188d04cb6286f957008ee1b7681" _dvdcss_ver="1.4.3-Next-Nexus-Alpha2-2" diff --git a/srcpkgs/libgpod/patches/0003-Fixed-PList-deprecation.patch b/srcpkgs/libgpod/patches/0003-Fixed-PList-deprecation.patch new file mode 100644 index 00000000000000..3fe60782956077 --- /dev/null +++ b/srcpkgs/libgpod/patches/0003-Fixed-PList-deprecation.patch @@ -0,0 +1,42 @@ +From e6994dc234395f68fd7195bbe7424f83c39d0f3d Mon Sep 17 00:00:00 2001 +From: Tuukka Pasanen +Date: Thu, 22 Oct 2015 09:53:05 +0300 +Subject: [PATCH 3/3] Fixed PList deprication +--- + tools/ipod-lockdown.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) +diff --git a/tools/ipod-lockdown.c b/tools/ipod-lockdown.c +index f345726..8503798 100644 +--- a/tools/ipod-lockdown.c ++++ b/tools/ipod-lockdown.c +@@ -100,7 +100,7 @@ read_sysinfo_extended_by_uuid (const char *uuid) + plist_get_string_val(ptr, &str); + if (str != NULL) { + ptr = plist_new_string(str); +- plist_dict_insert_item(value, "SerialNumber", ptr); ++ plist_dict_set_item(value, "SerialNumber", ptr); + free(str); + } + +@@ -112,15 +112,15 @@ read_sysinfo_extended_by_uuid (const char *uuid) + plist_get_string_val(ptr, &str); + if (str != NULL) { + ptr = plist_new_string(str); +- plist_dict_insert_item(value, "VisibleBuildID", ptr); ++ plist_dict_set_item(value, "VisibleBuildID", ptr); + free(str); + } + + ptr = plist_new_string(uuid); +- plist_dict_insert_item(value, "FireWireGUID", ptr); ++ plist_dict_set_item(value, "FireWireGUID", ptr); + + ptr = plist_new_string(uuid); +- plist_dict_insert_item(value, "UniqueDeviceID", ptr); ++ plist_dict_set_item(value, "UniqueDeviceID", ptr); + + plist_to_xml(value, &xml, &xml_length); + +-- +2.1.4 + diff --git a/srcpkgs/libgpod/patches/gcc14.patch b/srcpkgs/libgpod/patches/gcc14.patch new file mode 100644 index 00000000000000..09ab654f125ce9 --- /dev/null +++ b/srcpkgs/libgpod/patches/gcc14.patch @@ -0,0 +1,32 @@ +--- libgpod-0.8.3.orig/src/ithumb-writer.c ++++ libgpod-0.8.3/src/ithumb-writer.c +@@ -728,7 +728,7 @@ + { + return gdk_pixbuf_rotate_simple (pixbuf, *rotation); + } +- return g_object_ref (G_OBJECT (pixbuf)); ++ return GDK_PIXBUF(g_object_ref (G_OBJECT (pixbuf))); + } + + /* On the iPhone, thumbnails are presented as squares in a grid. +@@ -968,7 +968,7 @@ + else if (thumb->data_type == ITDB_THUMB_TYPE_PIXBUF) + { + Itdb_Thumb_Pixbuf *thumb_pixbuf = (Itdb_Thumb_Pixbuf *)thumb; +- pixbuf = g_object_ref (G_OBJECT (thumb_pixbuf->pixbuf)); ++ pixbuf = GDK_PIXBUF(g_object_ref (G_OBJECT (thumb_pixbuf->pixbuf))); + } + + if (pixbuf == NULL) +--- libgpod-0.8.3.orig/tools/generic-callout.c ++++ libgpod-0.8.3/tools/generic-callout.c +@@ -664,7 +664,7 @@ + } + + +-static char *get_info_from_usb (usb_bus_number, usb_device_number) ++static char *get_info_from_usb (gint usb_bus_number, gint usb_device_number) + { + #ifdef HAVE_LIBUSB + return read_sysinfo_extended_from_usb (usb_bus_number, + diff --git a/srcpkgs/libgpod/template b/srcpkgs/libgpod/template index 2fe5fa4da10806..efeac891ed2112 100644 --- a/srcpkgs/libgpod/template +++ b/srcpkgs/libgpod/template @@ -1,7 +1,7 @@ # Template file for 'libgpod' pkgname=libgpod version=0.8.3 -revision=4 +revision=5 build_style=gnu-configure configure_args="--with-udev-dir=/usr/lib/udev --enable-udev" hostmakedepends="intltool pkg-config automake gettext-devel glib-devel libtool gtk-doc" diff --git a/srcpkgs/libimobiledevice-glue-devel b/srcpkgs/libimobiledevice-glue-devel new file mode 120000 index 00000000000000..093b3eedd21c0b --- /dev/null +++ b/srcpkgs/libimobiledevice-glue-devel @@ -0,0 +1 @@ +./libimobiledevice-glue \ No newline at end of file diff --git a/srcpkgs/libimobiledevice-glue/template b/srcpkgs/libimobiledevice-glue/template new file mode 100644 index 00000000000000..7c7ffb3f3a4ee4 --- /dev/null +++ b/srcpkgs/libimobiledevice-glue/template @@ -0,0 +1,30 @@ +# Template file for 'libimobiledevice-glue' +pkgname=libimobiledevice-glue +version=1.3.2 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool pkgconf" +makedepends="libplist-devel" +short_desc="Common code used by libimobiledevice projects" +maintainer="al20ov " +license="LGPL-2.1-only" +homepage="https://libimobiledevice.org" +changelog="https://raw.githubusercontent.com/libimobiledevice/libimobiledevice-glue/master/NEWS" +distfiles="https://github.com/libimobiledevice/libimobiledevice-glue/archive/refs/tags/${version}.tar.gz" +checksum=1f780f40797e84ee60840a47d828f390071a0fb30501cb9ea092c2e8be6a874d + +pre_configure() { + echo $version > .tarball-version + autoreconf -fi +} + +libimobiledevice-glue-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.so + vmove usr/lib/*.a + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/libimobiledevice/patches/00.cython3.patch b/srcpkgs/libimobiledevice/patches/00.cython3.patch deleted file mode 100644 index ce76f5d8465f42..00000000000000 --- a/srcpkgs/libimobiledevice/patches/00.cython3.patch +++ /dev/null @@ -1,24 +0,0 @@ -From fb1dec7e2cbb2eae14536d8d68db25d3f9384ac1 Mon Sep 17 00:00:00 2001 -From: aymenim -Date: Tue, 15 Mar 2016 23:56:08 +0300 -Subject: [PATCH] cython: fixed notification_proxy callback gil lock - -cython notification proxy bug segmentation fault when callback called -without gil ---- - cython/notification_proxy.pxi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cython/notification_proxy.pxi b/cython/notification_proxy.pxi -index 4ffbf0742..203c7835d 100644 ---- 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) with gil: - (py_callback)(notification) - - cdef class NotificationProxyError(BaseError): diff --git a/srcpkgs/libimobiledevice/patches/01.cython3.patch b/srcpkgs/libimobiledevice/patches/01.cython3.patch deleted file mode 100644 index 865e5c02901504..00000000000000 --- a/srcpkgs/libimobiledevice/patches/01.cython3.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 59ec38cb6465f794cf8e2ab204711b9a10dd9eda Mon Sep 17 00:00:00 2001 -From: Andrea Oliveri -Date: Thu, 11 Jan 2024 22:05:00 +0100 -Subject: [PATCH] cython: Fix cython3 noexcept compilation error - ---- - cython/imobiledevice.pyx | 2 +- - cython/installation_proxy.pxi | 2 +- - cython/notification_proxy.pxi | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cython/imobiledevice.pyx b/cython/imobiledevice.pyx -index 2a125aa18..8da229626 100644 ---- 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/cython/installation_proxy.pxi b/cython/installation_proxy.pxi -index bf2c1da4c..1d3e3234d 100644 ---- 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): -diff --git a/cython/notification_proxy.pxi b/cython/notification_proxy.pxi -index 203c7835d..261200ef0 100644 ---- 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) with gil: -+cdef void np_notify_cb(const_char_ptr notification, void *py_callback) noexcept: - (py_callback)(notification) - - cdef class NotificationProxyError(BaseError): diff --git a/srcpkgs/libimobiledevice/patches/python3.patch b/srcpkgs/libimobiledevice/patches/python3.patch deleted file mode 100644 index 74e17ddd4b2b91..00000000000000 --- a/srcpkgs/libimobiledevice/patches/python3.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 6198152e8708a36782d48bc9d3a5835b19be3330 Mon Sep 17 00:00:00 2001 -From: Andrew Udvare -Date: Tue, 22 May 2018 17:02:38 -0400 -Subject: [PATCH] Fix for Python 3 - ---- - cython/debugserver.pxi | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git cython/debugserver.pxi cython/debugserver.pxi -index ddbe0667..42430113 100644 ---- a/cython/debugserver.pxi -+++ b/cython/debugserver.pxi -@@ -43,14 +43,13 @@ cdef class DebugServerError(BaseError): - BaseError.__init__(self, *args, **kwargs) - - --# from http://stackoverflow.com/a/17511714 --from cpython.string cimport PyString_AsString -+from cpython.bytes cimport PyBytes_AS_STRING - cdef char ** to_cstring_array(list_str): - if not list_str: - return NULL - cdef char **ret = malloc(len(list_str) * sizeof(char *)) - for i in xrange(len(list_str)): -- ret[i] = PyString_AsString(list_str[i]) -+ ret[i] = PyBytes_AS_STRING(list_str[i]) - return ret - - diff --git a/srcpkgs/libimobiledevice/template b/srcpkgs/libimobiledevice/template index a1a8bca58b7c8c..4b4d3579b03fc2 100644 --- a/srcpkgs/libimobiledevice/template +++ b/srcpkgs/libimobiledevice/template @@ -1,32 +1,27 @@ # Template file for 'libimobiledevice' pkgname=libimobiledevice -version=1.3.0 -revision=8 +version=1.4.0 +revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkgconf python3-Cython" -makedepends="python3-devel libglib-devel openssl-devel - libusb-devel libplist-devel libusbmuxd-devel" +makedepends="python3-devel libglib-devel openssl-devel libusb-devel + libplist-devel libusbmuxd-devel libimobiledevice-glue-devel libtatsu-devel" short_desc="Library to communicate with Apple devices" maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://libimobiledevice.org" changelog="https://raw.githubusercontent.com/libimobiledevice/libimobiledevice/master/NEWS" distfiles="https://github.com/libimobiledevice/libimobiledevice/archive/${version}.tar.gz" -checksum=acbfb73eabee162e64c0d9de207d71c0a5f47c40cd5ad32a5097f734328ce10a +checksum=99e042acc1513815c36816723de52e0d0892e081f36ec29672531ce99ed59ccd if [ "$CROSS_BUILD" ]; then configure_args="ac_cv_sys_file_offset_bits=yes ac_cv_sys_large_file=yes" fi -post_patch() { - # LibreSSL does not provide this function - vsed -e '/SSL_CTX_set_security_level/d' -i src/idevice.c - vsed -e 's,-L$(libdir),,g' -i cython/Makefile.am -} - pre_configure() { export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" export PYTHON_LDFLAGS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}" + echo $version > .tarball-version autoreconf -fi } diff --git a/srcpkgs/libplist/patches/cython-3.1.patch b/srcpkgs/libplist/patches/cython-3.1.patch deleted file mode 100644 index 81752deb3f47c2..00000000000000 --- a/srcpkgs/libplist/patches/cython-3.1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d7fe479707af57aeedf7e41c08e7fb698cd2e2a3 Mon Sep 17 00:00:00 2001 -From: Nikias Bassen -Date: Tue, 13 May 2025 18:32:50 +0200 -Subject: [PATCH] cython: Fix build with cython 3.1+ - ---- - cython/plist.pyx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cython/plist.pyx b/cython/plist.pyx -index b5f4ef67..4d1f8aae 100644 ---- a/cython/plist.pyx -+++ b/cython/plist.pyx -@@ -851,7 +851,7 @@ cdef plist_t native_to_plist_t(object native): - return plist_new_string(native) - if isinstance(native, bool): - return plist_new_bool(native) -- if isinstance(native, int) or isinstance(native, long): -+ if isinstance(native, int): - return plist_new_uint(native) - if isinstance(native, float): - return plist_new_real(native) diff --git a/srcpkgs/libplist/template b/srcpkgs/libplist/template index 8c8dbc423aad0c..2b025bed5c6c2e 100644 --- a/srcpkgs/libplist/template +++ b/srcpkgs/libplist/template @@ -1,7 +1,7 @@ # Template file for 'libplist' pkgname=libplist -version=2.2.0 -revision=7 +version=2.7.0 +revision=1 build_style=gnu-configure configure_args="--disable-static" hostmakedepends="automake libtool pkgconf python3 python3-Cython" @@ -12,12 +12,13 @@ license="LGPL-2.1-only" homepage="https://libimobiledevice.org" changelog="https://raw.githubusercontent.com/libimobiledevice/libplist/master/NEWS" distfiles="https://github.com/libimobiledevice/libplist/archive/${version}.tar.gz" -checksum=7e654bdd5d8b96f03240227ed09057377f06ebad08e1c37d0cfa2abe6ba0cee2 +checksum=66fa17a29270cb25ceaf189430ea38037c066652c2989b58d7ef6120b1a208d3 pre_configure() { sed -i 's,-L$(libdir),,g' cython/Makefile.am export PYTHON_CPPFLAGS=" -I${XBPS_CROSS_BASE}/${py3_inc}" export PYTHON_LDFLAGS=" -L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}" + echo $version > .tarball-version autoreconf -fi sed -i "s#\$PYTHON-config#__DOES_NOT_EXIST__#" configure } diff --git a/srcpkgs/libtatsu-devel b/srcpkgs/libtatsu-devel new file mode 120000 index 00000000000000..0c9936a18d79fb --- /dev/null +++ b/srcpkgs/libtatsu-devel @@ -0,0 +1 @@ +./libtatsu \ No newline at end of file diff --git a/srcpkgs/libtatsu/template b/srcpkgs/libtatsu/template new file mode 100644 index 00000000000000..bfabce87ed5924 --- /dev/null +++ b/srcpkgs/libtatsu/template @@ -0,0 +1,30 @@ +# Template file for 'libtatsu' +pkgname=libtatsu +version=1.0.5 +revision=1 +build_style=gnu-configure +hostmakedepends="automake libtool pkgconf" +makedepends="libplist-devel libcurl-devel" +short_desc="Library handling the communication with Apple's Tatsu Signing Server" +maintainer="al20ov " +license="LGPL-2.1-only" +homepage="https://libimobiledevice.org" +changelog="https://raw.githubusercontent.com/libimobiledevice/libtatsu/master/NEWS" +distfiles="https://github.com/libimobiledevice/libtatsu/archive/refs/tags/${version}.tar.gz" +checksum=d98e973747b3a03c1befb1875fa43b1a109b1b332ae2252d8d471b4cfb91df6d + +pre_configure() { + echo $version > .tarball-version + autoreconf -fi +} + +libtatsu-devel_package() { + short_desc+=" - development files" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib/*.a + vmove usr/lib/*.so + vmove usr/lib/pkgconfig + } +} diff --git a/srcpkgs/libusbmuxd/patches/musl.patch b/srcpkgs/libusbmuxd/patches/musl.patch deleted file mode 100644 index f3d3ee896fabe5..00000000000000 --- a/srcpkgs/libusbmuxd/patches/musl.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git tools/inetcat.c tools/inetcat.c -index b306a47..74bb91b 100644 ---- a/tools/inetcat.c -+++ b/tools/inetcat.c -@@ -21,6 +21,9 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#ifndef fd_set -+#include -+#endif - #include - #include - #include diff --git a/srcpkgs/libusbmuxd/template b/srcpkgs/libusbmuxd/template index e3ae03e51b9c13..e66e7df99fb477 100644 --- a/srcpkgs/libusbmuxd/template +++ b/srcpkgs/libusbmuxd/template @@ -1,19 +1,20 @@ # Template file for 'libusbmuxd' pkgname=libusbmuxd -version=2.0.2 +version=2.1.1 revision=1 build_style=gnu-configure hostmakedepends="automake libtool pkg-config" -makedepends="libusb-devel libplist-devel" +makedepends="libusb-devel libplist-devel libimobiledevice-glue-devel" short_desc="USB Multiplex Daemon library" maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://libimobiledevice.org" changelog="https://raw.githubusercontent.com/libimobiledevice/libusbmuxd/master/NEWS" distfiles="https://github.com/libimobiledevice/libusbmuxd/archive/${version}.tar.gz" -checksum=8ae3e1d9340177f8f3a785be276435869363de79f491d05d8a84a59efc8a8fdc +checksum=bcc185615a0f4ba80b617696235a084c64b68a1bf546a1dedd85da6b62b8cfbe pre_configure() { + echo $version > .tarball-version autoreconf -fi } diff --git a/srcpkgs/rhythmbox/template b/srcpkgs/rhythmbox/template index 941a475c61b8c6..f1e262817796b4 100644 --- a/srcpkgs/rhythmbox/template +++ b/srcpkgs/rhythmbox/template @@ -1,7 +1,7 @@ # Template file for 'rhythmbox' pkgname=rhythmbox version=3.4.8 -revision=2 +revision=3 build_style=meson build_helper=gir configure_args="-Dgudev=enabled $(vopt_feature gir plugins_vala) -Ddaap=enabled" diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template index 6bace22de561f5..4808f7cb06226f 100644 --- a/srcpkgs/strawberry/template +++ b/srcpkgs/strawberry/template @@ -1,7 +1,7 @@ # Template file for 'strawberry' pkgname=strawberry version=1.2.17 -revision=1 +revision=2 build_style=cmake configure_args="-DQT_HOST_PATH=/usr" hostmakedepends="pkg-config protobuf gettext qt6-base qt6-tools" diff --git a/srcpkgs/upower/template b/srcpkgs/upower/template index 4d267d5bdc29f1..3dee058af2a446 100644 --- a/srcpkgs/upower/template +++ b/srcpkgs/upower/template @@ -1,7 +1,7 @@ # Template file for 'upower' pkgname=upower version=1.90.9 -revision=2 +revision=3 build_helper="gir" build_style=meson configure_args="-Dos_backend=linux -Dsystemdsystemunitdir=no diff --git a/srcpkgs/usbmuxd/patches/plist_format_t.patch b/srcpkgs/usbmuxd/patches/plist_format_t.patch new file mode 100644 index 00000000000000..bc13735f36846f --- /dev/null +++ b/srcpkgs/usbmuxd/patches/plist_format_t.patch @@ -0,0 +1,32 @@ +the plist_format_t enum is now defined in libplist, and it's typedef'ed + +diff -u src-orig/utils.c src/utils.c +--- a/src/utils.c ++++ b/src/utils.c +@@ -302,7 +302,7 @@ + return 1; + } + +-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format) ++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format) + { + char *buffer = NULL; + uint32_t length; +diff -u src-orig/utils.h src/utils.h +--- a/src/utils.h ++++ b/src/utils.h +@@ -78,13 +78,8 @@ + int buffer_read_from_filename(const char *filename, char **buffer, uint64_t *length); + int buffer_write_to_filename(const char *filename, const char *buffer, uint64_t length); + +-enum plist_format_t { +- PLIST_FORMAT_XML, +- PLIST_FORMAT_BINARY +-}; +- + int plist_read_from_filename(plist_t *plist, const char *filename); +-int plist_write_to_filename(plist_t plist, const char *filename, enum plist_format_t format); ++int plist_write_to_filename(plist_t plist, const char *filename, plist_format_t format); + + uint64_t mstime64(void); + void get_tick_count(struct timeval * tv); diff --git a/srcpkgs/usbmuxd/template b/srcpkgs/usbmuxd/template index 93cee835575ad6..4ce76718c680bc 100644 --- a/srcpkgs/usbmuxd/template +++ b/srcpkgs/usbmuxd/template @@ -1,7 +1,7 @@ # Template file for 'usbmuxd' pkgname=usbmuxd version=1.1.1 -revision=1 +revision=2 build_style=gnu-configure configure_args="--without-systemd" make_dirs="/var/lib/lockdown 0755 usbmux usbmux"