[pybind11] 02/13: Drop the patch queue, no longer required

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Sep 14 11:28:04 UTC 2017


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch experimental
in repository pybind11.

commit be760d6c1a2cdca552056eed212ed7c9c4278996
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Sep 14 09:12:03 2017 +0100

    Drop the patch queue, no longer required
---
 .../Arch-indep-CMake-package-configuration.patch   | 25 ---------
 debian/patches/Use-the-system-include-path.patch   | 63 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 90 deletions(-)

diff --git a/debian/patches/Arch-indep-CMake-package-configuration.patch b/debian/patches/Arch-indep-CMake-package-configuration.patch
deleted file mode 100644
index 0937c93..0000000
--- a/debian/patches/Arch-indep-CMake-package-configuration.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Tue, 7 Feb 2017 20:08:59 +0000
-Subject: Arch-indep CMake package configuration
-
----
- CMakeLists.txt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 16f1d67..ef41e72 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -105,9 +105,12 @@ if (PYBIND11_INSTALL)
-   configure_package_config_file(tools/${PROJECT_NAME}Config.cmake.in
-                                 "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-                                 INSTALL_DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
-+  set(_PYBIND11_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
-+  unset(CMAKE_SIZEOF_VOID_P)
-   write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-                                    VERSION ${${PROJECT_NAME}_VERSION}
-                                    COMPATIBILITY AnyNewerVersion)
-+  set(CMAKE_SIZEOF_VOID_P ${_PYBIND11_CMAKE_SIZEOF_VOID_P})
-   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-                 ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-                 tools/FindPythonLibsNew.cmake
diff --git a/debian/patches/Use-the-system-include-path.patch b/debian/patches/Use-the-system-include-path.patch
deleted file mode 100644
index 94e991c..0000000
--- a/debian/patches/Use-the-system-include-path.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Date: Fri, 23 Dec 2016 16:31:56 +0000
-Subject: Use the system include path
-
----
- pybind11/__init__.py |  8 +-------
- setup.py             | 27 ++-------------------------
- 2 files changed, 3 insertions(+), 32 deletions(-)
-
-diff --git a/pybind11/__init__.py b/pybind11/__init__.py
-index a765692..a7d57c3 100644
---- a/pybind11/__init__.py
-+++ b/pybind11/__init__.py
-@@ -2,10 +2,4 @@ from ._version import version_info, __version__  # noqa: F401 imported but unuse
- 
- 
- def get_include(*args, **kwargs):
--    import os
--    try:
--        from pip import locations
--        return os.path.dirname(
--            locations.distutils_scheme('pybind11', *args, **kwargs)['headers'])
--    except ImportError:
--        return 'include'
-+    return '/usr/include'
-diff --git a/setup.py b/setup.py
-index 0cf4e47..de6a136 100644
---- a/setup.py
-+++ b/setup.py
-@@ -6,31 +6,8 @@ from setuptools import setup
- from pybind11 import __version__
- import os
- 
--# Prevent installation of pybind11 headers by setting
--# PYBIND11_USE_CMAKE.
--if os.environ.get('PYBIND11_USE_CMAKE'):
--    headers = []
--else:
--    headers = [
--        'include/pybind11/attr.h',
--        'include/pybind11/cast.h',
--        'include/pybind11/chrono.h',
--        'include/pybind11/class_support.h',
--        'include/pybind11/common.h',
--        'include/pybind11/complex.h',
--        'include/pybind11/descr.h',
--        'include/pybind11/eigen.h',
--        'include/pybind11/eval.h',
--        'include/pybind11/functional.h',
--        'include/pybind11/numpy.h',
--        'include/pybind11/operators.h',
--        'include/pybind11/options.h',
--        'include/pybind11/pybind11.h',
--        'include/pybind11/pytypes.h',
--        'include/pybind11/stl.h',
--        'include/pybind11/stl_bind.h',
--        'include/pybind11/typeid.h'
--    ]
-+# Prevent installation of pybind11 headers
-+headers = []
- 
- setup(
-     name='pybind11',
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 90c565a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Use-the-system-include-path.patch
-Arch-indep-CMake-package-configuration.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pybind11.git



More information about the debian-science-commits mailing list