[Python-modules-commits] [python-llfuse] 08/08: merge patched into master
Nikolaus Rath
nikratio-guest at moszumanska.debian.org
Mon Feb 1 18:32:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
nikratio-guest pushed a commit to branch master
in repository python-llfuse.
commit 6ddde82955210f0d6a0bb216630bb358576b1644
Merge: 12e2cfb 72287b8
Author: Nikolaus Rath <Nikolaus at rath.org>
Date: Mon Feb 1 10:23:09 2016 -0800
merge patched into master
debian/.git-dpm | 4 ++--
...ead-of-cython.patch => 0001-Use-cython3-instead-of-cython.patch} | 2 +-
debian/patches/force_xattr_api.diff | 2 +-
debian/patches/mips_dev_t.diff | 6 +++---
debian/patches/series | 2 +-
debian/patches/use-local-intersphinx-inventory.patch | 2 +-
src/llfuse.pyx | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --cc debian/.git-dpm
index 9dd5b25,0000000..adda563
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 60a9beccd0b6b77f7019e034b003495c7cfdb792
- 60a9beccd0b6b77f7019e034b003495c7cfdb792
++72287b8c48be269af7338bf1c876212332edbd98
++72287b8c48be269af7338bf1c876212332edbd98
+1de78f8c7c630dbc2338f5a51ed35328e2f79449
+1de78f8c7c630dbc2338f5a51ed35328e2f79449
+python-llfuse_0.42.1+dfsg.orig.tar.gz
+23b9a0256f43de3fc8c232ffebfcbde852aee315
+254890
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-cython3-instead-of-cython.patch
index 535bf89,0000000..7b5f654
mode 100644,000000..100644
--- a/debian/patches/0001-Use-cython3-instead-of-cython.patch
+++ b/debian/patches/0001-Use-cython3-instead-of-cython.patch
@@@ -1,34 -1,0 +1,34 @@@
- From 60a9beccd0b6b77f7019e034b003495c7cfdb792 Mon Sep 17 00:00:00 2001
++From 5a7fcc2d5d160bc6ef6880dde4e58749b9ae65ef Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Mon, 1 Feb 2016 10:15:47 -0800
+Subject: Use 'cython3' instead of 'cython'
+
+In Debian, the 'cython' command is provided by the Python 2.x version
+of Python. While both versions work, it's nicer to use the more recent
+version.
+---
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index d028..c53d 100755
+--- a/setup.py
++++ b/setup.py
+@@ -211,7 +211,7 @@ class build_cython(setuptools.Command):
+
+ def run(self):
+ try:
+- version = subprocess.check_output(['cython', '--version'],
++ version = subprocess.check_output(['cython3', '--version'],
+ universal_newlines=True,
+ stderr=subprocess.STDOUT)
+ except OSError:
+@@ -221,7 +221,7 @@ class build_cython(setuptools.Command):
+ if not hit or LooseVersion(hit.group(1)) < "0.24":
+ raise SystemExit('Need Cython 0.24 or newer, found ' + version)
+
+- cmd = ['cython', '-Wextra', '--force', '-3', '--fast-fail',
++ cmd = ['cython3', '-Wextra', '--force', '-3', '--fast-fail',
+ '--directive', 'embedsignature=True', '--include-dir',
+ os.path.join(basedir, 'Include'), '--verbose' ]
+ if DEVELOPER_MODE:
diff --cc debian/patches/force_xattr_api.diff
index 14b3d80,0000000..ebe94cf
mode 100644,000000..100644
--- a/debian/patches/force_xattr_api.diff
+++ b/debian/patches/force_xattr_api.diff
@@@ -1,42 -1,0 +1,42 @@@
- From 9c1ab2d3c7c9f0b255a77e61185552ff61202260 Mon Sep 17 00:00:00 2001
++From 20cd7de7f3346459b3bd5a9af32d498546610562 Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Mon, 1 Feb 2016 08:40:44 -0800
+Subject: Force use of libattr1-dev API
+
+Forwarded: not-needed
+Patch-Name: force_xattr_api.diff
+
+Compilation under GNU/kFreeBSD fails because none of upstream's
+preprocessor macros matches this combination. It is also not clear
+how to properly test for the extended attribute API without
+introducing something heavyweight like autoconf. In Debian, however,
+the libattr1-dev API is available for all supported architectures,
+so it is safe to just hardcode the use of this API. This is what
+this patch does.
+---
+ src/llfuse.h | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/src/llfuse.h b/src/llfuse.h
+index 159e..1606 100644
+--- a/src/llfuse.h
++++ b/src/llfuse.h
+@@ -12,18 +12,7 @@ the terms of the GNU LGPL.
+ #define PLATFORM_BSD 2
+ #define PLATFORM_DARWIN 3
+
+-#ifdef __gnu_linux__
+ #define PLATFORM PLATFORM_LINUX
+-#elif __FreeBSD__
+-#define PLATFORM PLATFORM_BSD
+-#elif __NetBSD__
+-#define PLATFORM PLATFORM_BSD
+-#elif __APPLE__ && __MACH__
+-#define PLATFORM PLATFORM_DARWIN
+-#include "darwin_compat.h"
+-#else
+-#error "Unable to determine system (Linux/FreeBSD/NetBSD/Darwin)"
+-#endif
+
+ #include <fuse.h>
+
diff --cc debian/patches/mips_dev_t.diff
index fb84957,0000000..b35b0f8
mode 100644,000000..100644
--- a/debian/patches/mips_dev_t.diff
+++ b/debian/patches/mips_dev_t.diff
@@@ -1,53 -1,0 +1,53 @@@
- From 8d0b3c6a5ec067e7ca8852ab8e38aab63d3218fc Mon Sep 17 00:00:00 2001
++From 72287b8c48be269af7338bf1c876212332edbd98 Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Mon, 1 Feb 2016 09:40:04 -0800
+Subject: Work around bug in mips+mipsel libc
+
+Forwarded: no
+Patch-Name: mips_dev_t.diff
+
+On mips and mipsel, the st_dev and st_rdev members of struct stat do not
+have type dev_t. This breaks POSIX compatibility, but is difficult to fix
+(cf. https://sourceware.org/bugzilla/show_bug.cgi?id=17786).
+
+To work around the issue, we change the definition of struct stat that
+is used by Cython when we are compiling under mips. Note that this
+requires the Cython compilation to run under mips, and that the
+resulting C file will be mips specific (without the patch, the
+generated C file is suitable for any architecture).
+
+Upstream is not interested in this change for obvious reasons.
+---
+ src/llfuse.pyx | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/llfuse.pyx b/src/llfuse.pyx
- index 53a6..8754 100644
++index 53a6..10c6 100644
+--- a/src/llfuse.pyx
++++ b/src/llfuse.pyx
+@@ -20,7 +20,24 @@ cdef extern from "llfuse.h":
+
+ from fuse_lowlevel cimport *
+ from pthread cimport *
+-from posix.stat cimport struct_stat, S_IFMT, S_IFDIR, S_IFREG
++IF UNAME_MACHINE.startswith('mips64'):
++ cdef extern from "sys/stat.h" nogil:
++ struct stat:
++ int st_dev
- + ino_t st_ino
+++ ino_t st_ino
++ mode_t st_mode
++ nlink_t st_nlink
++ uid_t st_uid
++ gid_t st_gid
++ int st_rdev
++ off_t st_size
++ blksize_t st_blksize
++ blkcnt_t st_blocks
++ time_t st_atime
++ time_t st_mtime
++ time_t st_ctime
++ELSE:
++ from posix.stat cimport struct_stat, S_IFMT, S_IFDIR, S_IFREG
+ from posix.types cimport mode_t, dev_t, off_t
+ from libc.stdint cimport uint32_t
+ from libc.stdlib cimport const_char
diff --cc debian/patches/series
index 60b7fa9,0000000..cfa6b0d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,4 @@@
++0001-Use-cython3-instead-of-cython.patch
+use-local-intersphinx-inventory.patch
+force_xattr_api.diff
+mips_dev_t.diff
- 0004-Use-cython3-instead-of-cython.patch
diff --cc debian/patches/use-local-intersphinx-inventory.patch
index 445e407,0000000..3a7ce63
mode 100644,000000..100644
--- a/debian/patches/use-local-intersphinx-inventory.patch
+++ b/debian/patches/use-local-intersphinx-inventory.patch
@@@ -1,28 -1,0 +1,28 @@@
- From acd7a1b7ea0f16ef66ab95e68301acb28a6f207a Mon Sep 17 00:00:00 2001
++From eebc91afcb443f6144fde2f0708fc4a493221afd Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus at rath.org>
+Date: Thu, 8 Oct 2015 12:24:34 -0700
+Subject: Use local intersphinx inventory
+
+Forwarded: not-needed
+Last-Update: 2011-07-06
+ Instead of downloading the Python intersphinx directory
+ at build time, use the cached copy shipped in debian/.
+Patch-Name: use-local-intersphinx-inventory.patch
+---
+ rst/conf.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/rst/conf.py b/rst/conf.py
+index 2290..f642 100644
+--- a/rst/conf.py
++++ b/rst/conf.py
+@@ -27,7 +27,8 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
+ 'sphinx_cython' ]
+
+ # Link to Python standard library
+-intersphinx_mapping = {'python': ('http://docs.python.org/3/', None) }
++intersphinx_mapping = {'python': ('http://docs.python.org/3/',
++ '../debian/python.inv')}
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-llfuse.git
More information about the Python-modules-commits
mailing list