diff --git a/mingw-w64-libplist/001-cython-module.patch b/mingw-w64-libplist/001-cython-module.patch index 42c4309363..d550e2778f 100644 --- a/mingw-w64-libplist/001-cython-module.patch +++ b/mingw-w64-libplist/001-cython-module.patch @@ -1,14 +1,14 @@ ---- libplist-2.0.0/cython/Makefile.am.orig 2015-01-17 19:17:30.724800000 +0300 -+++ libplist-2.0.0/cython/Makefile.am 2015-01-17 19:17:43.813200000 +0300 -@@ -20,8 +20,10 @@ - plist_LTLIBRARIES = plist.la - plist_la_SOURCES = plist_util.c plist_util.h plist.pyx - plist_la_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src $(PYTHON_CPPFLAGS) $(AM_CFLAGS) -Wno-shadow -Wno-redundant-decls -Wno-switch-default -Wno-strict-aliasing -Wno-implicit-function-declaration -fvisibility=default +--- libplist-2.2.0/cython/Makefile.am.orig 2015-01-17 19:17:30.724800000 +0300 ++++ libplist-2.2.0/cython/Makefile.am 2015-01-17 19:17:43.813200000 +0300 +@@ -39,8 +39,10 @@ + -Wno-implicit-function-declaration \ + -fvisibility=default + -plist_la_LDFLAGS = -module -avoid-version $(PYTHON_LIBS) $(AM_LDFLAGS) +plist_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LIBS) $(AM_LDFLAGS) - plist_la_LIBADD = $(top_builddir)/src/libplist.la + plist_la_LIBADD = $(top_builddir)/src/libplist-2.0.la +otherincludedir = $(includedir)/plist/cython -+otherinclude_HEADERS = plist_util.h plist.pxd ++otherinclude_HEADERS = plist_util.h plist.pxd plist.c: plist.pyx $(PXDINCLUDES) $(PXIINCLUDES) diff --git a/mingw-w64-libplist/003-fix-py-soext.patch b/mingw-w64-libplist/003-fix-py-soext.patch index e40f61c0fd..4390d801f9 100644 --- a/mingw-w64-libplist/003-fix-py-soext.patch +++ b/mingw-w64-libplist/003-fix-py-soext.patch @@ -10,14 +10,14 @@ else CYTHON=false fi ---- libplist-2.1.0/cython/Makefile.am.orig 2020-04-26 14:50:32.957877900 +0200 -+++ libplist-2.1.0/cython/Makefile.am 2020-04-26 14:50:50.787782000 +0200 -@@ -19,7 +19,7 @@ - plist_LTLIBRARIES = plist.la - plist_la_SOURCES = plist_util.c plist_util.h plist.pyx - plist_la_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src $(PYTHON_CPPFLAGS) $(AM_CFLAGS) -Wno-shadow -Wno-redundant-decls -Wno-switch-default -Wno-strict-aliasing -Wno-implicit-function-declaration -fvisibility=default +--- libplist-2.2.0/cython/Makefile.am.orig 2020-04-26 14:50:32.957877900 +0200 ++++ libplist-2.2.0/cython/Makefile.am 2020-04-26 14:50:50.787782000 +0200 +@@ -39,7 +39,7 @@ + -Wno-implicit-function-declaration \ + -fvisibility=default + -plist_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LIBS) $(AM_LDFLAGS) +plist_la_LDFLAGS = -module -avoid-version -no-undefined $(PYTHON_LIBS) $(AM_LDFLAGS) -shrext $(PYTHON_SO) - plist_la_LIBADD = $(top_builddir)/src/libplist.la + plist_la_LIBADD = $(top_builddir)/src/libplist-2.0.la otherincludedir = $(includedir)/plist/cython otherinclude_HEADERS = plist_util.h plist.pxd diff --git a/mingw-w64-libplist/004-exports.patch b/mingw-w64-libplist/004-exports.patch index 688a011bcd..26d292e05e 100644 --- a/mingw-w64-libplist/004-exports.patch +++ b/mingw-w64-libplist/004-exports.patch @@ -608,19 +608,19 @@ diff -Naur libplist-2.1.0-orig/src/bplist.c libplist-2.1.0/src/bplist.c { free(plist_bin); } -diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c ---- libplist-2.1.0-orig/src/plist.c 2019-11-09 23:34:55.209125500 +0300 -+++ libplist-2.1.0/src/plist.c 2019-11-09 23:55:35.675076100 +0300 -@@ -112,7 +112,7 @@ +diff -Naur libplist-2.2.0-orig/src/plist.c libplist-2.2.0/src/plist.c +--- libplist-2.2.0-orig/src/plist.c 2019-11-09 23:34:55.209125500 +0300 ++++ libplist-2.2.0/src/plist.c 2019-11-09 23:55:35.675076100 +0300 +@@ -166,7 +166,7 @@ + } #endif - -PLIST_API int plist_is_binary(const char *plist_data, uint32_t length) +int plist_is_binary(const char *plist_data, uint32_t length) { if (length < 8) { return 0; -@@ -122,7 +122,7 @@ +@@ -176,7 +176,7 @@ } @@ -629,7 +629,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (length < 8) { *plist = NULL; -@@ -225,14 +225,14 @@ +@@ -279,14 +279,14 @@ return node_index; } @@ -646,7 +646,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_ARRAY; -@@ -249,7 +249,7 @@ +@@ -303,7 +303,7 @@ return plist_new_node(data); } @@ -655,7 +655,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_STRING; -@@ -258,7 +258,7 @@ +@@ -312,7 +312,7 @@ return plist_new_node(data); } @@ -664,7 +664,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_BOOLEAN; -@@ -267,7 +267,7 @@ +@@ -321,7 +321,7 @@ return plist_new_node(data); } @@ -673,7 +673,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_UINT; -@@ -276,7 +276,7 @@ +@@ -330,7 +330,7 @@ return plist_new_node(data); } @@ -682,7 +682,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_UID; -@@ -285,7 +285,7 @@ +@@ -339,7 +339,7 @@ return plist_new_node(data); } @@ -691,7 +691,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_REAL; -@@ -294,7 +294,7 @@ +@@ -348,7 +348,7 @@ return plist_new_node(data); } @@ -700,7 +700,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_DATA; -@@ -304,7 +304,7 @@ +@@ -358,7 +358,7 @@ return plist_new_node(data); } @@ -709,7 +709,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_data_t data = plist_new_plist_data(); data->type = PLIST_DATE; -@@ -313,7 +313,7 @@ +@@ -367,7 +367,7 @@ return plist_new_node(data); } @@ -718,14 +718,14 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (plist) { -@@ -389,12 +389,12 @@ +@@ -443,12 +443,12 @@ return newnode; } -PLIST_API plist_t plist_copy(plist_t node) +plist_t plist_copy(plist_t node) { - return plist_copy_node(node); + return node ? plist_copy_node(node) : NULL; } -PLIST_API uint32_t plist_array_get_size(plist_t node) @@ -733,7 +733,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { uint32_t ret = 0; if (node && PLIST_ARRAY == plist_get_node_type(node)) -@@ -404,7 +404,7 @@ +@@ -458,7 +458,7 @@ return ret; } @@ -742,7 +742,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t ret = NULL; if (node && PLIST_ARRAY == plist_get_node_type(node) && n < INT_MAX) -@@ -419,7 +419,7 @@ +@@ -473,7 +473,7 @@ return ret; } @@ -751,7 +751,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t father = plist_get_parent(node); if (PLIST_ARRAY == plist_get_node_type(father)) -@@ -451,7 +451,7 @@ +@@ -505,7 +505,7 @@ } } @@ -760,8 +760,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (node && PLIST_ARRAY == plist_get_node_type(node) && n < INT_MAX) { -@@ -474,7 +474,7 @@ - return; +@@ -527,7 +527,7 @@ + } } -PLIST_API void plist_array_append_item(plist_t node, plist_t item) @@ -769,8 +769,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (node && PLIST_ARRAY == plist_get_node_type(node)) { -@@ -484,7 +484,7 @@ - return; +@@ -536,7 +536,7 @@ + } } -PLIST_API void plist_array_insert_item(plist_t node, plist_t item, uint32_t n) @@ -778,8 +778,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (node && PLIST_ARRAY == plist_get_node_type(node) && n < INT_MAX) { -@@ -494,7 +494,7 @@ - return; +@@ -545,7 +545,7 @@ + } } -PLIST_API void plist_array_remove_item(plist_t node, uint32_t n) @@ -787,8 +787,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (node && PLIST_ARRAY == plist_get_node_type(node) && n < INT_MAX) { -@@ -511,7 +511,7 @@ - return; +@@ -561,7 +561,7 @@ + } } -PLIST_API void plist_array_item_remove(plist_t node) @@ -796,7 +796,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t father = plist_get_parent(node); if (PLIST_ARRAY == plist_get_node_type(father)) -@@ -526,7 +526,7 @@ +@@ -576,7 +576,7 @@ } } @@ -805,8 +805,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (iter) { -@@ -536,7 +536,7 @@ - return; +@@ -585,7 +585,7 @@ + } } -PLIST_API void plist_array_next_item(plist_t node, plist_array_iter iter, plist_t *item) @@ -814,8 +814,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { node_t** iter_node = (node_t**)iter; -@@ -556,7 +556,7 @@ - return; +@@ -604,7 +604,7 @@ + } } -PLIST_API uint32_t plist_dict_get_size(plist_t node) @@ -823,7 +823,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { uint32_t ret = 0; if (node && PLIST_DICT == plist_get_node_type(node)) -@@ -566,7 +566,7 @@ +@@ -614,7 +614,7 @@ return ret; } @@ -832,8 +832,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (iter) { -@@ -576,7 +576,7 @@ - return; +@@ -623,7 +623,7 @@ + } } -PLIST_API void plist_dict_next_item(plist_t node, plist_dict_iter iter, char **key, plist_t *val) @@ -841,8 +841,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { node_t** iter_node = (node_t**)iter; -@@ -605,7 +605,7 @@ - return; +@@ -651,7 +651,7 @@ + } } -PLIST_API void plist_dict_get_item_key(plist_t node, char **key) @@ -850,7 +850,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t father = plist_get_parent(node); if (PLIST_DICT == plist_get_node_type(father)) -@@ -614,7 +614,7 @@ +@@ -660,7 +660,7 @@ } } @@ -859,7 +859,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t ret = NULL; plist_t father = plist_get_parent(node); -@@ -625,7 +625,7 @@ +@@ -671,7 +671,7 @@ return ret; } @@ -868,7 +868,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t ret = NULL; -@@ -658,7 +658,7 @@ +@@ -704,7 +704,7 @@ return ret; } @@ -877,8 +877,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (node && PLIST_DICT == plist_get_node_type(node)) { node_t* old_item = plist_dict_get_item(node, key); -@@ -701,12 +701,12 @@ - return; +@@ -746,12 +746,12 @@ + } } -PLIST_API void plist_dict_insert_item(plist_t node, const char* key, plist_t item) @@ -892,8 +892,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (node && PLIST_DICT == plist_get_node_type(node)) { -@@ -725,7 +725,7 @@ - return; +@@ -769,7 +769,7 @@ + } } -PLIST_API void plist_dict_merge(plist_t *target, plist_t source) @@ -901,8 +901,8 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!target || !*target || (plist_get_node_type(*target) != PLIST_DICT) || !source || (plist_get_node_type(source) != PLIST_DICT)) return; -@@ -749,7 +749,7 @@ - free(it); +@@ -793,7 +793,7 @@ + free(it); } -PLIST_API plist_t plist_access_pathv(plist_t plist, uint32_t length, va_list v) @@ -910,7 +910,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t current = plist; plist_type type = PLIST_NONE; -@@ -773,7 +773,7 @@ +@@ -817,7 +817,7 @@ return current; } @@ -919,7 +919,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t ret = NULL; va_list v; -@@ -824,12 +824,12 @@ +@@ -868,12 +868,12 @@ } } @@ -934,7 +934,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (node) { -@@ -840,7 +840,7 @@ +@@ -884,7 +884,7 @@ return PLIST_NONE; } @@ -943,7 +943,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !val) return; -@@ -854,7 +854,7 @@ +@@ -898,7 +898,7 @@ assert(length == strlen(*val)); } @@ -952,7 +952,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !val) return; -@@ -868,7 +868,7 @@ +@@ -912,7 +912,7 @@ assert(length == strlen(*val)); } @@ -961,7 +961,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node) return NULL; -@@ -881,7 +881,7 @@ +@@ -925,7 +925,7 @@ return (const char*)data->strval; } @@ -970,7 +970,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !val) return; -@@ -893,7 +893,7 @@ +@@ -937,7 +937,7 @@ assert(length == sizeof(uint8_t)); } @@ -979,7 +979,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !val) return; -@@ -905,7 +905,7 @@ +@@ -949,7 +949,7 @@ assert(length == sizeof(uint64_t) || length == 16); } @@ -988,7 +988,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !val) return; -@@ -917,7 +917,7 @@ +@@ -961,7 +961,7 @@ assert(length == sizeof(uint64_t)); } @@ -997,7 +997,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !val) return; -@@ -929,7 +929,7 @@ +@@ -973,7 +973,7 @@ assert(length == sizeof(double)); } @@ -1006,7 +1006,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !val || !length) return; -@@ -939,7 +939,7 @@ +@@ -983,7 +983,7 @@ plist_get_type_and_value(node, &type, (void *) val, length); } @@ -1015,7 +1015,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node || !length) return NULL; -@@ -951,7 +951,7 @@ +@@ -995,7 +995,7 @@ return (const char*)data->buff; } @@ -1024,7 +1024,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { if (!node) return; -@@ -1027,7 +1027,7 @@ +@@ -1071,7 +1071,7 @@ return FALSE; } @@ -1033,7 +1033,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { return plist_data_compare(node_l, node_r); } -@@ -1086,7 +1086,7 @@ +@@ -1130,7 +1130,7 @@ } } @@ -1042,7 +1042,7 @@ diff -Naur libplist-2.1.0-orig/src/plist.c libplist-2.1.0/src/plist.c { plist_t father = plist_get_parent(node); plist_t item = plist_dict_get_item(father, val); -@@ -1096,37 +1096,37 @@ +@@ -1140,37 +1140,37 @@ plist_set_element_val(node, PLIST_KEY, val, strlen(val)); } diff --git a/mingw-w64-libplist/PKGBUILD b/mingw-w64-libplist/PKGBUILD index beff527d6f..996819d38d 100644 --- a/mingw-w64-libplist/PKGBUILD +++ b/mingw-w64-libplist/PKGBUILD @@ -3,8 +3,8 @@ _realname=libplist pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.1.0 -pkgrel=2 +pkgver=2.2.0 +pkgrel=1 pkgdesc='A library to handle Apple Property List format in binary or XML (mingw-w64)' arch=('any') url='https://www.libimobiledevice.org/' @@ -17,12 +17,12 @@ source=("${_realname}-${pkgver}.tar.gz"::https://github.com/libimobiledevice/lib depends=("${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-cython") options=('staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-python3") -sha256sums=('4b33f9af3f9208d54a3c3e1a8c149932513f451c98d1dd696fe42c06e30b7f03' - '328f9733976473eefdd599dfc32fd66787bc76951e417aabf42a869874005caf' +makedepends=("${MINGW_PACKAGE_PREFIX}-python") +sha256sums=('7e654bdd5d8b96f03240227ed09057377f06ebad08e1c37d0cfa2abe6ba0cee2' + '48320c5667bdf724eeab6c73340cb4ddb6fdc98109938e7fa4438d35e4439a29' '65f4603a85f63567fac917dfb6e2d974078973ed815652817bedea80e4467016' - 'cbd98ad8752211a41950958ac1f60400a522b5bcea5b66fbbddcb0532c3a8d0e' - '4ae62828e7cfda316074b14a22215ae1087cdd95eb4983a118aa9831c61564e9') + '1cca10b36021da73e436bc3c7765170fcd2f053fb8ebcb2e361359345905788f' + '51d783e6caa075cbf62c8c49554357b41ffa930decdb468cfe57cd5c414526de') prepare() { cd ${srcdir}/${_realname}-${pkgver}