jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-30 22:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

python3: bump to version 3.4.1

Browse Source 
A few minor updates on the patches were needed to resolve some
conflicts on the main Makefile.pre.in file, in the list of modules to
build/install.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2014-07-08 12:42:39 +02:00 committed by Peter Korsgaard
parent 63c735b60a
commit a5dcdf3706
15 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/python3/python3-003-sysconfigdata-install-location.patch
View File

@ -52,7 +52,7 @@ Index: b/Makefile.pre.in
@for d in $(LIBSUBDIRS); \ @for d in $(LIBSUBDIRS); \
do \ do \
a=$(srcdir)/Lib/$$d; \ a=$(srcdir)/Lib/$$d; \
@@ -1513,7 +1521,7 @@ @@ -1514,7 +1522,7 @@
find build -name 'fficonfig.h' -exec rm -f {} ';' || true find build -name 'fficonfig.h' -exec rm -f {} ';' || true
find build -name '*.py' -exec rm -f {} ';' || true find build -name '*.py' -exec rm -f {} ';' || true
find build -name '*.py[co]' -exec rm -f {} ';' || true find build -name '*.py[co]' -exec rm -f {} ';' || true

2
package/python3/python3-006-cross-compile-getaddrinfo.patch
View File

@ -10,7 +10,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -3423,7 +3423,7 @@ @@ -3412,7 +3412,7 @@
AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)

2
package/python3/python3-007-disable-extensions.patch
View File

@ -73,7 +73,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2360,6 +2360,8 @@ @@ -2349,6 +2349,8 @@
AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) AC_PATH_TOOL([PKG_CONFIG], [pkg-config])

20
package/python3/python3-100-optional-test-modules.patch
View File

@ -42,16 +42,16 @@ Index: b/Makefile.pre.in
+ curses pydoc_data $(MACHDEPS) + curses pydoc_data $(MACHDEPS)
+ +
+TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ +TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
+ test test/test_asyncio ctypes/test \ + test test/test_asyncio \
+ test/test_email test/test_email/data \ + test/test_email test/test_email/data \
+ test/test_json \ + test/test_json \
test/audiodata \ test/audiodata \
test/capath test/data \ test/capath test/data \
test/cjkencodings test/decimaltestdata test/xmltestdata \ test/cjkencodings test/decimaltestdata test/xmltestdata \
@@ -1148,28 +1170,20 @@ @@ -1148,28 +1170,22 @@
test/namespace_pkgs/project3/parent/child \ test/test_importlib/namespace_pkgs/project3/parent/child \
test/namespace_pkgs/module_and_namespace_package \ test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/namespace_pkgs/module_and_namespace_package/a_test \ test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
- asyncio \ - asyncio \
- test/test_asyncio \ - test/test_asyncio \
- collections concurrent concurrent/futures encodings \ - collections concurrent concurrent/futures encodings \
@ -61,6 +61,7 @@ Index: b/Makefile.pre.in
- sqlite3 sqlite3/test \ - sqlite3 sqlite3/test \
- logging csv wsgiref urllib \ - logging csv wsgiref urllib \
- lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ - lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
+ sqlite3/test \
+ lib2to3/tests \ + lib2to3/tests \
lib2to3/tests/data lib2to3/tests/data/fixers \ lib2to3/tests/data lib2to3/tests/data/fixers \
lib2to3/tests/data/fixers/myfixes \ lib2to3/tests/data/fixers/myfixes \
@ -68,7 +69,9 @@ Index: b/Makefile.pre.in
- idlelib idlelib/Icons idlelib/idle_test \ - idlelib idlelib/Icons idlelib/idle_test \
- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \ - distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \
- importlib test/test_importlib test/test_importlib/builtin \ - importlib test/test_importlib test/test_importlib/builtin \
+ sqlite3/test idlelib/idle_test \ + ctypes/test \
+ idlelib/idle_test \
+ distutils/tests \
+ test/test_importlib test/test_importlib/builtin \ + test/test_importlib test/test_importlib/builtin \
test/test_importlib/extension test/test_importlib/frozen \ test/test_importlib/extension test/test_importlib/frozen \
test/test_importlib/import_ test/test_importlib/source \ test/test_importlib/import_ test/test_importlib/source \
@ -77,8 +80,7 @@ Index: b/Makefile.pre.in
- unittest unittest/test unittest/test/testmock \ - unittest unittest/test unittest/test/testmock \
- venv venv/scripts venv/scripts/posix \ - venv venv/scripts venv/scripts/posix \
- curses pydoc_data $(MACHDEPS) - curses pydoc_data $(MACHDEPS)
+ unittest/test unittest/test/testmock \ + unittest/test unittest/test/testmock
+ distutils/tests
+ +
+ifeq (@TEST_MODULES@,yes) +ifeq (@TEST_MODULES@,yes)
+LIBSUBDIRS += $(TESTSUBDIRS) +LIBSUBDIRS += $(TESTSUBDIRS)
@ -91,7 +93,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2667,6 +2667,12 @@ @@ -2656,6 +2656,12 @@
fi fi

14
package/python3/python3-101-optional-pydoc.patch
View File

@ -34,10 +34,10 @@ Index: b/Makefile.pre.in
+ curses $(MACHDEPS) + curses $(MACHDEPS)
TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
test test/test_asyncio ctypes/test \ test test/test_asyncio \
@@ -1180,6 +1182,10 @@ @@ -1182,6 +1184,10 @@
unittest/test unittest/test/testmock \ test/test_importlib/import_ test/test_importlib/source \
distutils/tests unittest/test unittest/test/testmock
+ifeq (@PYDOC@,yes) +ifeq (@PYDOC@,yes)
+LIBSUBDIRS += pydoc_data +LIBSUBDIRS += pydoc_data
@ -50,7 +50,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2666,6 +2666,11 @@ @@ -2655,6 +2655,11 @@
AC_CHECK_FUNCS(pthread_atfork) AC_CHECK_FUNCS(pthread_atfork)
fi fi
@ -66,7 +66,7 @@ Index: b/setup.py
=================================================================== ===================================================================
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -2182,6 +2182,12 @@ @@ -2203,6 +2203,12 @@
# turn off warnings when deprecated modules are imported # turn off warnings when deprecated modules are imported
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)
@ -79,7 +79,7 @@ Index: b/setup.py
setup(# PyPI Metadata (PEP 301) setup(# PyPI Metadata (PEP 301)
name = "Python", name = "Python",
version = sys.version.split()[0], version = sys.version.split()[0],
@@ -2206,8 +2212,7 @@ @@ -2227,8 +2233,7 @@
# If you change the scripts installed here, you also need to # If you change the scripts installed here, you also need to
# check the PyBuildScripts command above, and change the links # check the PyBuildScripts command above, and change the links
# created by the bininstall target in Makefile.pre.in # created by the bininstall target in Makefile.pre.in

22
package/python3/python3-102-optional-2to3.patch
View File

@ -34,17 +34,17 @@ Index: b/Makefile.pre.in
ctypes ctypes/macholib \ ctypes ctypes/macholib \
idlelib idlelib/Icons \ idlelib idlelib/Icons \
distutils distutils/command $(XMLLIBSUBDIRS) \ distutils distutils/command $(XMLLIBSUBDIRS) \
@@ -1172,9 +1173,6 @@ @@ -1173,9 +1174,6 @@
test/namespace_pkgs/project3/parent/child \ test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/namespace_pkgs/module_and_namespace_package \ test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
test/namespace_pkgs/module_and_namespace_package/a_test \ sqlite3/test \
- lib2to3/tests \ - lib2to3/tests \
- lib2to3/tests/data lib2to3/tests/data/fixers \ - lib2to3/tests/data lib2to3/tests/data/fixers \
- lib2to3/tests/data/fixers/myfixes \ - lib2to3/tests/data/fixers/myfixes \
sqlite3/test idlelib/idle_test \ ctypes/test \
test/test_importlib test/test_importlib/builtin \ idlelib/idle_test \
test/test_importlib/extension test/test_importlib/frozen \ distutils/tests \
@@ -1186,6 +1184,14 @@ @@ -1188,6 +1186,14 @@
LIBSUBDIRS += pydoc_data LIBSUBDIRS += pydoc_data
endif endif
@ -59,7 +59,7 @@ Index: b/Makefile.pre.in
ifeq (@TEST_MODULES@,yes) ifeq (@TEST_MODULES@,yes)
LIBSUBDIRS += $(TESTSUBDIRS) LIBSUBDIRS += $(TESTSUBDIRS)
endif endif
@@ -1281,10 +1287,12 @@ @@ -1283,10 +1289,12 @@
-d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \ -d $(LIBDEST)/site-packages -f $(STDLIB_CACHE_FLAGS) \
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
endif endif
@ -76,7 +76,7 @@ Index: b/setup.py
=================================================================== ===================================================================
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -2183,10 +2183,11 @@ @@ -2204,10 +2204,11 @@
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)
@ -94,7 +94,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2678,6 +2678,12 @@ @@ -2667,6 +2667,12 @@
AS_HELP_STRING([--disable-test-modules], [disable test modules]), AS_HELP_STRING([--disable-test-modules], [disable test modules]),
[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])

21
package/python3/python3-103-optional-sqlite.patch
View File

@ -12,7 +12,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2666,6 +2666,15 @@ @@ -2655,6 +2655,15 @@
AC_CHECK_FUNCS(pthread_atfork) AC_CHECK_FUNCS(pthread_atfork)
fi fi
@ -40,16 +40,15 @@ Index: b/Makefile.pre.in
logging csv wsgiref urllib \ logging csv wsgiref urllib \
ctypes ctypes/macholib \ ctypes ctypes/macholib \
idlelib idlelib/Icons \ idlelib idlelib/Icons \
@@ -1173,7 +1172,7 @@ @@ -1173,7 +1172,6 @@
test/namespace_pkgs/project3/parent/child \ test/test_importlib/namespace_pkgs/project3/parent/child \
test/namespace_pkgs/module_and_namespace_package \ test/test_importlib/namespace_pkgs/module_and_namespace_package \
test/namespace_pkgs/module_and_namespace_package/a_test \ test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \
- sqlite3/test idlelib/idle_test \ - sqlite3/test \
+ idlelib/idle_test \ ctypes/test \
test/test_importlib test/test_importlib/builtin \ idlelib/idle_test \
test/test_importlib/extension test/test_importlib/frozen \ distutils/tests \
test/test_importlib/import_ test/test_importlib/source \ @@ -1194,6 +1192,11 @@
@@ -1192,6 +1191,11 @@
lib2to3/tests/data/fixers/myfixes lib2to3/tests/data/fixers/myfixes
endif endif

8
package/python3/python3-104-optional-tk.patch
View File

@ -26,12 +26,12 @@ Index: b/Makefile.pre.in
curses $(MACHDEPS) curses $(MACHDEPS)
-TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ -TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \
- test test/test_asyncio ctypes/test \ - test test/test_asyncio \
+TESTSUBDIRS = test test/test_asyncio ctypes/test \ +TESTSUBDIRS = test test/test_asyncio \
test/test_email test/test_email/data \ test/test_email test/test_email/data \
test/test_json \ test/test_json \
test/audiodata \ test/audiodata \
@@ -1196,6 +1195,12 @@ @@ -1197,6 +1196,12 @@
TESTSUBDIRS += sqlite3/test TESTSUBDIRS += sqlite3/test
endif endif
@ -48,7 +48,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2675,6 +2675,15 @@ @@ -2664,6 +2664,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi fi

6
package/python3/python3-105-optional-curses.patch
View File

@ -19,9 +19,9 @@ Index: b/Makefile.pre.in
- curses $(MACHDEPS) - curses $(MACHDEPS)
+ $(MACHDEPS) + $(MACHDEPS)
TESTSUBDIRS = test test/test_asyncio ctypes/test \ TESTSUBDIRS = test test/test_asyncio \
test/test_email test/test_email/data \ test/test_email test/test_email/data \
@@ -1201,6 +1201,10 @@ @@ -1202,6 +1202,10 @@
tkinter/test/test_ttk tkinter/test/test_ttk
endif endif
@ -36,7 +36,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2684,6 +2684,15 @@ @@ -2673,6 +2673,15 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
fi fi

6
package/python3/python3-106-optional-expat.patch
View File

@ -28,7 +28,7 @@ Index: b/Makefile.pre.in
importlib \ importlib \
turtledemo \ turtledemo \
multiprocessing multiprocessing/dummy \ multiprocessing multiprocessing/dummy \
@@ -1205,6 +1205,10 @@ @@ -1206,6 +1206,10 @@
LIBSUBDIRS += curses LIBSUBDIRS += curses
endif endif
@ -43,7 +43,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2363,13 +2363,21 @@ @@ -2352,13 +2352,21 @@
AC_SUBST(DISABLED_EXTENSIONS) AC_SUBST(DISABLED_EXTENSIONS)
# Check for use of the system expat library # Check for use of the system expat library
@ -74,7 +74,7 @@ Index: b/setup.py
=================================================================== ===================================================================
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -1396,7 +1396,7 @@ @@ -1417,7 +1417,7 @@
# #
# More information on Expat can be found at www.libexpat.org. # More information on Expat can be found at www.libexpat.org.
# #

2
package/python3/python3-107-optional-codecs-cjk.patch
View File

@ -10,7 +10,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2683,6 +2683,12 @@ @@ -2672,6 +2672,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
fi fi

2
package/python3/python3-108-optional-nis.patch
View File

@ -13,7 +13,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2689,6 +2689,12 @@ @@ -2678,6 +2678,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
fi]) fi])

2
package/python3/python3-109-optional-unicodedata.patch
View File

@ -10,7 +10,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2695,6 +2695,12 @@ @@ -2684,6 +2684,12 @@
DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
fi]) fi])

6
package/python3/python3-110-optional-idle.patch
View File

@ -33,7 +33,7 @@ Index: b/Makefile.pre.in
distutils distutils/command \ distutils distutils/command \
importlib \ importlib \
turtledemo \ turtledemo \
@@ -1209,6 +1210,10 @@ @@ -1210,6 +1211,10 @@
LIBSUBDIRS += $(XMLLIBSUBDIRS) LIBSUBDIRS += $(XMLLIBSUBDIRS)
endif endif
@ -48,7 +48,7 @@ Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -2737,6 +2737,12 @@ @@ -2726,6 +2726,12 @@
AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
@ -65,7 +65,7 @@ Index: b/setup.py
=================================================================== ===================================================================
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -2183,11 +2183,13 @@ @@ -2204,11 +2204,13 @@
import warnings import warnings
warnings.filterwarnings("ignore",category=DeprecationWarning) warnings.filterwarnings("ignore",category=DeprecationWarning)

2
package/python3/python3.mk
View File

@ -5,7 +5,7 @@
################################################################################ ################################################################################
PYTHON3_VERSION_MAJOR = 3.4 PYTHON3_VERSION_MAJOR = 3.4
PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).0 PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).1
PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
PYTHON3_SITE = http://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_SITE = http://python.org/ftp/python/$(PYTHON3_VERSION)