From e2713c6dc68bedabee536b2ce674a5c33e6d4d85 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 7 Oct 2020 09:55:47 -0400 Subject: [PATCH] python3-llfuse: update to 1.3.7 --- .../python3-llfuse/patches/thread_id.patch | 36 +++++++++++++++++++ srcpkgs/python3-llfuse/template | 15 +++++--- 2 files changed, 46 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/python3-llfuse/patches/thread_id.patch diff --git a/srcpkgs/python3-llfuse/patches/thread_id.patch b/srcpkgs/python3-llfuse/patches/thread_id.patch new file mode 100644 index 0000000000..7f19db512f --- /dev/null +++ b/srcpkgs/python3-llfuse/patches/thread_id.patch @@ -0,0 +1,36 @@ +From https://github.com/python-llfuse/python-llfuse/issues/28 + +diff --git src/fuse_api.pxi src/fuse_api.pxi +index 48bda30..1d803de 100644 +--- src/fuse_api.pxi ++++ src/fuse_api.pxi +@@ -11,6 +11,9 @@ the terms of the GNU LGPL. + + ''' + ++from libc.stdint cimport intptr_t ++ ++ + def listdir(path): + '''Like `os.listdir`, but releases the GIL. + +@@ -382,6 +385,7 @@ ctypedef struct worker_data_t: + cdef void* worker_start(void* data) with gil: + cdef worker_data_t *wd + cdef int res ++ cdef intptr_t tid + global exc_info + + wd = data +@@ -393,8 +397,9 @@ cdef void* worker_start(void* data) with gil: + session_loop(wd.buf, wd.bufsize) + except: + fuse_session_exit(session) +- log.error('FUSE worker thread %d terminated with exception, ' +- 'aborting processing', wd.thread_id) ++ tid = wd.thread_id ++ log.error('FUSE worker thread %p terminated with exception, ' ++ 'aborting processing', tid) + res = pthread_mutex_lock(&exc_info_mutex) + if res != 0: + log.error('pthread_mutex_lock failed with %s', diff --git a/srcpkgs/python3-llfuse/template b/srcpkgs/python3-llfuse/template index 305924d199..9ee6facd06 100644 --- a/srcpkgs/python3-llfuse/template +++ b/srcpkgs/python3-llfuse/template @@ -1,15 +1,20 @@ # Template file for 'python3-llfuse' pkgname=python3-llfuse -version=1.3.6 -revision=2 +version=1.3.7 +revision=1 wrksrc="llfuse-${version}" build_style=python3-module -hostmakedepends="python3-setuptools pkg-config" +hostmakedepends="python3-setuptools python3-Cython pkg-config" makedepends="python3-devel fuse-devel attr-devel" depends="python3" short_desc="Python3 bindings for the low level FUSE API" maintainer="Leah Neukirchen " license="LGPL-2.0-or-later" homepage="https://github.com/python-llfuse/python-llfuse" -distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.bz2" -checksum=31a267f7ec542b0cd62e0f1268e1880fdabf3f418ec9447def99acfa6eff2ec9 +distfiles="${PYPI_SITE}/l/llfuse/llfuse-${version}.tar.gz" +checksum=95b750303735fdba836a46b3066e102ae74b9707c1e43581bb17329769340054 + +pre_build() { + rm src/llfuse.c + python3 setup.py build_cython +}