Skip to content

Commit fef4a03

Browse files
committed
[recipes] Remove unneeded changes from the patch
1 parent 489b7e9 commit fef4a03

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

pythonforandroid/recipes/matplotlib/mpl_android_fixes.patch

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--- matplotlib-3.1.1/setupext.py.orig 2019-12-31 01:25:00.000000000 +0100
2-
+++ matplotlib-3.1.1/setupext.py 2020-01-04 15:30:50.453260814 +0100
2+
+++ matplotlib-3.1.1/setupext.py 2020-03-01 21:12:41.493350250 +0100
33
@@ -604,8 +604,7 @@ class Numpy(SetupPackage):
44
name = "numpy"
55

@@ -10,19 +10,15 @@
1010
ext.define_macros.extend([
1111
# Ensure that PY_ARRAY_UNIQUE_SYMBOL is uniquely defined for each
1212
# extension.
13-
@@ -617,10 +616,10 @@ class Numpy(SetupPackage):
13+
@@ -617,7 +616,7 @@ class Numpy(SetupPackage):
1414
])
1515

1616
def get_setup_requires(self):
1717
- return ['numpy>=1.11']
1818
+ return [] # don't need it for p4a, due to above changes
1919

2020
def get_install_requires(self):
21-
- return ['numpy>=1.11']
22-
+ return ['numpy==1.16.4'] # to match p4a's target version
23-
24-
25-
class LibAgg(SetupPackage):
21+
return ['numpy>=1.11']
2622
@@ -674,7 +673,7 @@ class FreeType(SetupPackage):
2723
if sys.platform == 'win32':
2824
libfreetype = 'libfreetype.lib'

0 commit comments

Comments
 (0)