[neon/backports-jammy/pythran/Neon/unstable] debian/patches: fix the patches mess
Carlos De Maine
null at kde.org
Tue Aug 22 23:54:54 BST 2023
Git commit 916926fc2f8d428e8f0f554ad406a8497fa72f74 by Carlos De Maine.
Committed on 23/08/2023 at 00:54.
Pushed by carlosdem into branch 'Neon/unstable'.
fix the patches mess
M +1 -3 debian/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
M +4 -27 debian/patches/0004-Enhance-atlas-auto-detection.patch
D +0 -25 debian/patches/patches/0001-Remove-Wno-absolute-value-flag-in-tests.patch
D +0 -24 debian/patches/patches/0002-Exclude-pythran-pythonic-patch-README.rst.patch
D +0 -20 debian/patches/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
D +0 -21 debian/patches/patches/0004-Enhance-atlas-auto-detection.patch
D +0 -34 debian/patches/patches/0005-Disable-jupyter-based-documentation-examples.patch
D +0 -13 debian/patches/patches/scikit-image_greyreconstruct_int.patch
D +0 -6 debian/patches/patches/series
M +2 -2 debian/patches/series
https://invent.kde.org/neon/backports-jammy/pythran/-/commit/916926fc2f8d428e8f0f554ad406a8497fa72f74
diff --git a/debian/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch b/debian/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
index 3329d1a..357f194 100644
--- a/debian/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
+++ b/debian/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
@@ -8,11 +8,9 @@ using a CDN, in order to avoid the "privacy-breach-generic" lintian warning.
docs/conf.py | 4 ++++
1 file changed, 4 insertions(+)
-diff --git a/docs/conf.py b/docs/conf.py
-index 983f7bf..2043001 100644
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -280,3 +280,7 @@ html_show_sourcelink = False
+@@ -282,3 +282,7 @@
# Output file base name for HTML help builder.
htmlhelp_basename = 'Pythrandoc'
diff --git a/debian/patches/0004-Enhance-atlas-auto-detection.patch b/debian/patches/0004-Enhance-atlas-auto-detection.patch
index 754a96c..803faac 100644
--- a/debian/patches/0004-Enhance-atlas-auto-detection.patch
+++ b/debian/patches/0004-Enhance-atlas-auto-detection.patch
@@ -9,36 +9,13 @@ list of libraries and directories returned by numpy.
pythran/config.py | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
-Index: pythran/pythran/config.py
-===================================================================
---- pythran.orig/pythran/config.py 2022-06-25 14:39:16.441047797 +0200
-+++ pythran/pythran/config.py 2022-06-25 14:39:16.433047726 +0200
-@@ -10,6 +10,7 @@
+--- a/pythran/config.py
++++ b/pythran/config.py
+@@ -8,6 +8,7 @@
import os
from shlex import split as shsplit
import sys
+from itertools import product
- logger = logging.getLogger('pythran')
+ import numpy
-@@ -249,9 +250,17 @@
- # Numpy can pollute stdout with checks
- with silent():
- numpy_blas = numpy_sys.get_info(user_blas)
-- # required to cope with atlas missing extern "C"
-- extension['define_macros'].append('PYTHRAN_BLAS_{}'
-- .format(user_blas.upper()))
-+ # Potential paths of the atlas libraries.
-+ library_files = [os.path.join(dir, "lib{}.so".format(lib))
-+ for dir, lib in product(numpy_blas["library_dirs"],
-+ numpy_blas["libraries"])]
-+
-+ if any('atlas' in os.path.realpath(f) for f in library_files):
-+ extension['define_macros'].append('PYTHRAN_BLAS_ATLAS')
-+ else:
-+ # required to cope with atlas missing extern "C"
-+ extension['define_macros'].append('PYTHRAN_BLAS_{}'
-+ .format(user_blas.upper()))
- extension['libraries'].extend(numpy_blas.get('libraries', []))
- extension['library_dirs'].extend(
- numpy_blas.get('library_dirs', []))
diff --git a/debian/patches/patches/0001-Remove-Wno-absolute-value-flag-in-tests.patch b/debian/patches/patches/0001-Remove-Wno-absolute-value-flag-in-tests.patch
deleted file mode 100644
index 14238e4..0000000
--- a/debian/patches/patches/0001-Remove-Wno-absolute-value-flag-in-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: "Diego M. Rodriguez" <diego at moreda.io>
-Date: Thu, 9 Sep 2021 11:09:44 +0200
-Subject: Remove -Wno-absolute-value flag in tests
-
-Remove the `-Wno-absolute-value` flag:
-
-```
-error: command-line option '-Wno-absolute-value' is valid for C/ObjC but not for C++ [-Werror]
-```
----
- pythran/tests/__init__.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pythran/tests/__init__.py b/pythran/tests/__init__.py
-index e9f45bc..f01278a 100644
---- a/pythran/tests/__init__.py
-+++ b/pythran/tests/__init__.py
-@@ -76,7 +76,6 @@ class TestEnv(unittest.TestCase):
- '-Wno-int-in-bool-context',
- '-Wno-unknown-warning-option',
- '-Wno-unused-local-typedefs',
-- '-Wno-absolute-value',
- '-Wno-missing-braces',
- '-Wno-unknown-pragmas',
- ] if sys.platform != "win32" else []
diff --git a/debian/patches/patches/0002-Exclude-pythran-pythonic-patch-README.rst.patch b/debian/patches/patches/0002-Exclude-pythran-pythonic-patch-README.rst.patch
deleted file mode 100644
index b3247fb..0000000
--- a/debian/patches/patches/0002-Exclude-pythran-pythonic-patch-README.rst.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: "Diego M. Rodriguez" <diego at moreda.io>
-Date: Fri, 24 Sep 2021 12:51:25 +0200
-Subject: Exclude pythran/pythonic/patch/README.rst
-
-Exclude the "pythran/pythonic/patch/README.rst" file in the final
-distribution, in order to comply with the lintian warning
-package-contains-documentation-outside-usr-share-doc.
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 74d3c81..59d68ec 100644
---- a/setup.py
-+++ b/setup.py
-@@ -124,7 +124,7 @@ class DevelopWithThirdParty(develop, BuildWithThirdParty):
- # Cannot use glob here, as the files may not be generated yet
- boost_headers = ['boost/' + '*/' * i + '*.hpp' for i in range(1, 20)]
- xsimd_headers = ['xsimd/' + '*/' * i + '*.hpp' for i in range(1, 20)]
--pythonic_headers = ['*/' * i + '*.hpp' for i in range(9)] + ['patch/*']
-+pythonic_headers = ['*/' * i + '*.hpp' for i in range(9)] + ['patch/complex']
-
-
- # read longdescr from README
diff --git a/debian/patches/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch b/debian/patches/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
deleted file mode 100644
index 357f194..0000000
--- a/debian/patches/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: "Diego M. Rodriguez" <diego at moreda.io>
-Date: Fri, 24 Sep 2021 14:48:47 +0200
-Subject: Use the debian copy of requirejs, mathjax in doc
-
-Use the files from the requirejs and mathjax debian packages instead of
-using a CDN, in order to avoid the "privacy-breach-generic" lintian warning.
----
- docs/conf.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -282,3 +282,7 @@
- # Output file base name for HTML help builder.
- htmlhelp_basename = 'Pythrandoc'
-
-+# Use the debian copy of requirejs and mathjax instead of cdn.
-+nbsphinx_requirejs_path = 'file:///usr/share/javascript/requirejs/require.min.js'
-+nbsphinx_requirejs_options = {'crossorigin': 'anonymous'}
-+mathjax_path = 'file:///usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML'
diff --git a/debian/patches/patches/0004-Enhance-atlas-auto-detection.patch b/debian/patches/patches/0004-Enhance-atlas-auto-detection.patch
deleted file mode 100644
index 803faac..0000000
--- a/debian/patches/patches/0004-Enhance-atlas-auto-detection.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Diego M. Rodriguez" <diego at moreda.io>
-Date: Mon, 22 Nov 2021 12:27:17 +0100
-Subject: Enhance atlas auto detection
-
-Add more automation for attempting to find the atlas libraries when
-the config file specifies a generic blas, by searching through the
-list of libraries and directories returned by numpy.
----
- pythran/config.py | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
---- a/pythran/config.py
-+++ b/pythran/config.py
-@@ -8,6 +8,7 @@
- import os
- from shlex import split as shsplit
- import sys
-+from itertools import product
-
- import numpy
-
diff --git a/debian/patches/patches/0005-Disable-jupyter-based-documentation-examples.patch b/debian/patches/patches/0005-Disable-jupyter-based-documentation-examples.patch
deleted file mode 100644
index 1db0eb0..0000000
--- a/debian/patches/patches/0005-Disable-jupyter-based-documentation-examples.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: "Diego M. Rodriguez" <diego at moreda.io>
-Date: Wed, 29 Dec 2021 16:19:05 +0100
-Subject: Disable jupyter-based documentation examples
-
-Remove the "docs/examples" references in the documentation, along with
-the requirement of "nbsphinx", in order to allow the documentation
-package to be built while work in #1001283 is ongoing.
-
-See also: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001283
----
- docs/conf.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/docs/conf.py b/docs/conf.py
-index 2043001..b8197c8 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -27,7 +27,6 @@ with open("../README.rst") as readme:
-
-
- MANUAL
-- EXAMPLES
- CLI
- SUPPORT
- DEVGUIDE
-@@ -124,7 +123,7 @@ with open('SUPPORT.rst', 'w') as support:
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
- # ones.
--extensions = ['nbsphinx',]
-+extensions = []
-
- # Add any paths that contain templates here, relative to this directory.
- templates_path = ['_templates']
diff --git a/debian/patches/patches/scikit-image_greyreconstruct_int.patch b/debian/patches/patches/scikit-image_greyreconstruct_int.patch
deleted file mode 100644
index aab4a89..0000000
--- a/debian/patches/patches/scikit-image_greyreconstruct_int.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pythran/pythran/tests/scikit-image/_greyreconstruct.py
-===================================================================
---- pythran.orig/pythran/tests/scikit-image/_greyreconstruct.py 2021-11-14 12:13:52.488862487 +0100
-+++ pythran/pythran/tests/scikit-image/_greyreconstruct.py 2022-05-31 11:17:06.127162778 +0200
-@@ -45,7 +45,7 @@
- while current_idx != -1:
- if current_idx < image_stride:
- current_rank = ranks[current_idx]
-- if current_rank == 0:
-+ if not current_rank:
- break
- for i in range(nstrides):
- neighbor_idx = current_idx + strides[i]
diff --git a/debian/patches/patches/series b/debian/patches/patches/series
deleted file mode 100644
index 90865cb..0000000
--- a/debian/patches/patches/series
+++ /dev/null
@@ -1,6 +0,0 @@
-#0001-Remove-Wno-absolute-value-flag-in-tests.patch
-0002-Exclude-pythran-pythonic-patch-README.rst.patch
-0003-Use-the-debian-copy-of-requirejs-in-doc.patch
-0004-Enhance-atlas-auto-detection.patch
-0005-Disable-jupyter-based-documentation-examples.patch
-#scikit-image_greyreconstruct_int.patch
diff --git a/debian/patches/series b/debian/patches/series
index 919e457..90865cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
-0001-Remove-Wno-absolute-value-flag-in-tests.patch
+#0001-Remove-Wno-absolute-value-flag-in-tests.patch
0002-Exclude-pythran-pythonic-patch-README.rst.patch
0003-Use-the-debian-copy-of-requirejs-in-doc.patch
0004-Enhance-atlas-auto-detection.patch
0005-Disable-jupyter-based-documentation-examples.patch
-scikit-image_greyreconstruct_int.patch
+#scikit-image_greyreconstruct_int.patch
More information about the Neon-commits
mailing list