[Python-modules-commits] [python-datrie] 01/03: Revert "Add patches for libdatrie"
Filip Pytloun
fpytloun-guest at moszumanska.debian.org
Tue Sep 12 11:14:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
fpytloun-guest pushed a commit to branch master
in repository python-datrie.
commit 039ac05363483d32bd932162b07e7024b31673bb
Author: Filip Pytloun <filip at pytloun.cz>
Date: Tue Sep 12 11:05:29 2017 +0200
Revert "Add patches for libdatrie"
This reverts commit b6c9c9fc97b9a1582d7ea5578899a9ff6453e5bb.
---
.../patches/0002-Use-libdatrie-dev-for-build.patch | 22 ----
.../patches/0003-Don-t-use-bundled-libdatrie.patch | 118 ---------------------
debian/patches/series | 2 -
3 files changed, 142 deletions(-)
diff --git a/debian/patches/0002-Use-libdatrie-dev-for-build.patch b/debian/patches/0002-Use-libdatrie-dev-for-build.patch
deleted file mode 100644
index a0766e2..0000000
--- a/debian/patches/0002-Use-libdatrie-dev-for-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 28922d00f3b9271fd8a234a517598c2220b393dd Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Mon, 27 Jun 2016 15:35:48 +0200
-Subject: Use libdatrie-dev for build
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index eea48b6..cf002a0 100755
---- a/setup.py
-+++ b/setup.py
-@@ -6,7 +6,7 @@ import os
-
- from setuptools import setup, Extension
-
--LIBDATRIE_DIR = 'libdatrie'
-+LIBDATRIE_DIR = '/usr/include/datrie'
- LIBDATRIE_FILES = glob.glob(os.path.join(LIBDATRIE_DIR, "datrie", "*.c"))
-
- DESCRIPTION = __doc__
diff --git a/debian/patches/0003-Don-t-use-bundled-libdatrie.patch b/debian/patches/0003-Don-t-use-bundled-libdatrie.patch
deleted file mode 100644
index cfde8b2..0000000
--- a/debian/patches/0003-Don-t-use-bundled-libdatrie.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 757e906f7463c678f56224a1ad1f5a3f77c6cf64 Mon Sep 17 00:00:00 2001
-From: Filip Pytloun <filip at pytloun.cz>
-Date: Mon, 27 Jun 2016 15:52:10 +0200
-Subject: Don't use bundled libdatrie
-
----
- MANIFEST.in | 2 --
- setup.py | 7 ++-----
- src/cdatrie.c | 6 +++---
- src/cdatrie.pxd | 6 +++---
- src/datrie.c | 6 +++---
- 5 files changed, 11 insertions(+), 16 deletions(-)
-
-diff --git a/MANIFEST.in b/MANIFEST.in
-index 4279900..a077ffe 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -4,8 +4,6 @@ include COPYING
- include tox.ini
- include tox-bench.ini
- include update_c.sh
--recursive-include libdatrie *.h
--recursive-include libdatrie *.c
- include tests/words100k.txt.zip
- recursive-include tests *.py
-
-diff --git a/setup.py b/setup.py
-index cf002a0..74ae1a7 100755
---- a/setup.py
-+++ b/setup.py
-@@ -7,7 +7,6 @@ import os
- from setuptools import setup, Extension
-
- LIBDATRIE_DIR = '/usr/include/datrie'
--LIBDATRIE_FILES = glob.glob(os.path.join(LIBDATRIE_DIR, "datrie", "*.c"))
-
- DESCRIPTION = __doc__
- LONG_DESCRIPTION = open('README.rst').read() + open('CHANGES.rst').read()
-@@ -43,14 +42,12 @@ setup(name="datrie",
- license=LICENSE,
- url='https://github.com/kmike/datrie',
- classifiers=CLASSIFIERS,
-- libraries=[('libdatrie', {
-- "sources": LIBDATRIE_FILES,
-- "include_dirs": [LIBDATRIE_DIR]})],
- ext_modules=[
- Extension("datrie", [
- 'src/datrie.c',
- 'src/cdatrie.c',
- 'src/stdio_ext.c'
-- ], include_dirs=[LIBDATRIE_DIR])
-+ ], include_dirs=[LIBDATRIE_DIR],
-+ libraries=['datrie'])
- ],
- tests_require=["pytest", "hypothesis"])
-diff --git a/src/cdatrie.c b/src/cdatrie.c
-index 83f30a6..c5d5a2a 100644
---- a/src/cdatrie.c
-+++ b/src/cdatrie.c
-@@ -238,9 +238,9 @@ static CYTHON_INLINE float __PYX_NAN() {
- #define __PYX_HAVE_API__cdatrie
- #include "string.h"
- #include "stdio.h"
--#include "../libdatrie/datrie/triedefs.h"
--#include "../libdatrie/datrie/alpha-map.h"
--#include "../libdatrie/datrie/trie.h"
-+#include "/usr/include/datrie/triedefs.h"
-+#include "/usr/include/datrie/alpha-map.h"
-+#include "/usr/include/datrie/trie.h"
- #ifdef _OPENMP
- #include <omp.h>
- #endif /* _OPENMP */
-diff --git a/src/cdatrie.pxd b/src/cdatrie.pxd
-index 6a33393..f0414e5 100644
---- a/src/cdatrie.pxd
-+++ b/src/cdatrie.pxd
-@@ -1,13 +1,13 @@
- # cython: profile=False
- from libc cimport stdio
-
--cdef extern from "../libdatrie/datrie/triedefs.h":
-+cdef extern from "/usr/include/datrie/triedefs.h":
- ctypedef int AlphaChar # it should be utf32 letter
- ctypedef unsigned char TrieChar # 1 byte
- ctypedef int TrieIndex
- ctypedef int TrieData # int
-
--cdef extern from "../libdatrie/datrie/alpha-map.h":
-+cdef extern from "/usr/include/datrie/alpha-map.h":
-
- struct AlphaMap:
- pass
-@@ -20,7 +20,7 @@ cdef extern from "../libdatrie/datrie/alpha-map.h":
- int alpha_char_strlen (AlphaChar *str)
-
-
--cdef extern from "../libdatrie/datrie/trie.h":
-+cdef extern from "/usr/include/datrie/trie.h":
-
- ctypedef struct Trie:
- pass
-diff --git a/src/datrie.c b/src/datrie.c
-index 848d7c7..6758f31 100644
---- a/src/datrie.c
-+++ b/src/datrie.c
-@@ -239,9 +239,9 @@ static CYTHON_INLINE float __PYX_NAN() {
- #include "string.h"
- #include "stdlib.h"
- #include "stdio.h"
--#include "../libdatrie/datrie/triedefs.h"
--#include "../libdatrie/datrie/alpha-map.h"
--#include "../libdatrie/datrie/trie.h"
-+#include "/usr/include/datrie/triedefs.h"
-+#include "/usr/include/datrie/alpha-map.h"
-+#include "/usr/include/datrie/trie.h"
- #ifdef _OPENMP
- #include <omp.h>
- #endif /* _OPENMP */
diff --git a/debian/patches/series b/debian/patches/series
index e4d4e02..2c9265a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
0001-Don-t-require-pytest-running-on-regular-setup.patch
-0002-Use-libdatrie-dev-for-build.patch
-0003-Don-t-use-bundled-libdatrie.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-datrie.git
More information about the Python-modules-commits
mailing list