[neon/backports-jammy/pythran/Neon/release] debian/patches/patches: refresh patches
Carlos De Maine
null at kde.org
Tue Aug 22 00:51:42 BST 2023
Git commit b781bbf19bff94fbb5e580c3df428707d06497e8 by Carlos De Maine.
Committed on 22/08/2023 at 01:51.
Pushed by carlosdem into branch 'Neon/release'.
refresh patches
A +25 -0 debian/patches/patches/0001-Remove-Wno-absolute-value-flag-in-tests.patch
A +24 -0 debian/patches/patches/0002-Exclude-pythran-pythonic-patch-README.rst.patch
A +20 -0 debian/patches/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
A +21 -0 debian/patches/patches/0004-Enhance-atlas-auto-detection.patch
A +34 -0 debian/patches/patches/0005-Disable-jupyter-based-documentation-examples.patch
A +13 -0 debian/patches/patches/scikit-image_greyreconstruct_int.patch
A +6 -0 debian/patches/patches/series
https://invent.kde.org/neon/backports-jammy/pythran/-/commit/b781bbf19bff94fbb5e580c3df428707d06497e8
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
new file mode 100644
index 0000000..14238e4
--- /dev/null
+++ b/debian/patches/patches/0001-Remove-Wno-absolute-value-flag-in-tests.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..b3247fb
--- /dev/null
+++ b/debian/patches/patches/0002-Exclude-pythran-pythonic-patch-README.rst.patch
@@ -0,0 +1,24 @@
+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
new file mode 100644
index 0000000..357f194
--- /dev/null
+++ b/debian/patches/patches/0003-Use-the-debian-copy-of-requirejs-in-doc.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 0000000..803faac
--- /dev/null
+++ b/debian/patches/patches/0004-Enhance-atlas-auto-detection.patch
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000..1db0eb0
--- /dev/null
+++ b/debian/patches/patches/0005-Disable-jupyter-based-documentation-examples.patch
@@ -0,0 +1,34 @@
+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
new file mode 100644
index 0000000..aab4a89
--- /dev/null
+++ b/debian/patches/patches/scikit-image_greyreconstruct_int.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..90865cb
--- /dev/null
+++ b/debian/patches/patches/series
@@ -0,0 +1,6 @@
+#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
More information about the Neon-commits
mailing list