adamm/python311
SHA256
1
0
Fork 0
Code Pull Requests Activity

Readjust patches.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python311?expand=0&rev=6
This commit is contained in:
Matej Cepl 2022-05-10 11:17:42 +00:00 committed by Git OBS Bridge
parent 887681833e
commit 5e1455c810
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F00251-change-user-install-location.patch
View File

@ -39,7 +39,7 @@ Fedora Change: https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
if self.exec_prefix is None: if self.exec_prefix is None:
--- a/Lib/site.py --- a/Lib/site.py
+++ b/Lib/site.py +++ b/Lib/site.py
@@ -380,8 +380,15 @@ def getsitepackages(prefixes=None): @@ -377,8 +377,15 @@ def getsitepackages(prefixes=None):
return sitepackages return sitepackages
def addsitepackages(known_paths, prefixes=None): def addsitepackages(known_paths, prefixes=None):

12
bpo-31046_ensurepip_honours_prefix.patch
View File

@ -55,7 +55,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
.. note:: .. note::
--- a/Lib/ensurepip/__init__.py --- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py
@@ -113,27 +113,27 @@ def _disable_pip_configuration_settings( @@ -112,27 +112,27 @@ def _disable_pip_configuration_settings(
os.environ['PIP_CONFIG_FILE'] = os.devnull os.environ['PIP_CONFIG_FILE'] = os.devnull
@ -88,7 +88,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
Note that calling this function will alter both sys.path and os.environ. Note that calling this function will alter both sys.path and os.environ.
""" """
@@ -183,6 +183,8 @@ def _bootstrap(*, root=None, upgrade=Fal @@ -182,6 +182,8 @@ def _bootstrap(*, root=None, upgrade=Fal
args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir] args = ["install", "--no-cache-dir", "--no-index", "--find-links", tmpdir]
if root: if root:
args += ["--root", root] args += ["--root", root]
@ -97,7 +97,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
if upgrade: if upgrade:
args += ["--upgrade"] args += ["--upgrade"]
if user: if user:
@@ -258,6 +260,11 @@ def _main(argv=None): @@ -257,6 +259,11 @@ def _main(argv=None):
help="Install everything relative to this alternate root directory.", help="Install everything relative to this alternate root directory.",
) )
parser.add_argument( parser.add_argument(
@ -109,7 +109,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
"--altinstall", "--altinstall",
action="store_true", action="store_true",
default=False, default=False,
@@ -276,6 +283,7 @@ def _main(argv=None): @@ -275,6 +282,7 @@ def _main(argv=None):
return _bootstrap( return _bootstrap(
root=args.root, root=args.root,
@ -139,7 +139,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -1278,7 +1278,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni @@ -1733,7 +1733,7 @@ install: @FRAMEWORKINSTALLFIRST@ commoni
install|*) ensurepip="" ;; \ install|*) ensurepip="" ;; \
esac; \ esac; \
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \
@ -148,7 +148,7 @@ Co-Authored-By: Xavier de Gaye <xdegaye@gmail.com>
fi fi
altinstall: commoninstall altinstall: commoninstall
@@ -1288,7 +1288,7 @@ altinstall: commoninstall @@ -1743,7 +1743,7 @@ altinstall: commoninstall
install|*) ensurepip="--altinstall" ;; \ install|*) ensurepip="--altinstall" ;; \
esac; \ esac; \
$(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \ $(RUNSHARED) $(PYTHON_FOR_BUILD) -m ensurepip \

8
fix_configure_rst.patch
View File

@ -5,7 +5,7 @@
--- a/Doc/using/configure.rst --- a/Doc/using/configure.rst
+++ b/Doc/using/configure.rst +++ b/Doc/using/configure.rst
@@ -42,7 +42,6 @@ General Options @@ -41,7 +41,6 @@ General Options
See :data:`sys.int_info.bits_per_digit <sys.int_info>`. See :data:`sys.int_info.bits_per_digit <sys.int_info>`.
@ -13,7 +13,7 @@
.. cmdoption:: --with-cxx-main=COMPILER .. cmdoption:: --with-cxx-main=COMPILER
Compile the Python ``main()`` function and link Python executable with C++ Compile the Python ``main()`` function and link Python executable with C++
@@ -457,13 +456,11 @@ macOS Options @@ -511,13 +510,11 @@ macOS Options
See ``Mac/README.rst``. See ``Mac/README.rst``.
@ -29,8 +29,8 @@
Create a Python.framework rather than a traditional Unix install. Optional Create a Python.framework rather than a traditional Unix install. Optional
--- a/Misc/NEWS --- a/Misc/NEWS
+++ b/Misc/NEWS +++ b/Misc/NEWS
@@ -2038,7 +2038,7 @@ C API @@ -5480,7 +5480,7 @@ C API
----- - bpo-40939: Removed documentation for the removed ``PyParser_*`` C API.
- bpo-43795: The list in :ref:`stable-abi-list` now shows the public name - bpo-43795: The list in :ref:`stable-abi-list` now shows the public name
- :c:struct:`PyFrameObject` rather than ``_frame``. The non-existing entry - :c:struct:`PyFrameObject` rather than ``_frame``. The non-existing entry

4
python-3.3.0b1-fix_date_time_compiler.patch
View File

@ -4,7 +4,7 @@
--- a/Makefile.pre.in --- a/Makefile.pre.in
+++ b/Makefile.pre.in +++ b/Makefile.pre.in
@@ -784,11 +784,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ @@ -1222,11 +1222,18 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
$(DTRACE_OBJS) \ $(DTRACE_OBJS) \
$(srcdir)/Modules/getbuildinfo.c $(srcdir)/Modules/getbuildinfo.c
$(CC) -c $(PY_CORE_CFLAGS) \ $(CC) -c $(PY_CORE_CFLAGS) \
@ -20,6 +20,6 @@
+ -DCOMPILER='"[GCC]"' \ + -DCOMPILER='"[GCC]"' \
+ -o $@ $(srcdir)/Python/getcompiler.c + -o $@ $(srcdir)/Python/getcompiler.c
+ +
Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile Modules/getpath.o: $(srcdir)/Modules/getpath.c Python/frozen_modules/getpath.h Makefile $(PYTHON_HEADERS)
$(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
-DPREFIX='"$(prefix)"' \ -DPREFIX='"$(prefix)"' \

2
python-3.3.0b1-test-posix_fadvise.patch
View File

@ -4,7 +4,7 @@
--- a/Lib/test/test_posix.py --- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py +++ b/Lib/test/test_posix.py
@@ -425,7 +425,7 @@ class PosixTester(unittest.TestCase): @@ -434,7 +434,7 @@ class PosixTester(unittest.TestCase):
def test_posix_fadvise(self): def test_posix_fadvise(self):
fd = os.open(os_helper.TESTFN, os.O_RDONLY) fd = os.open(os_helper.TESTFN, os.O_RDONLY)
try: try:

2
subprocess-raise-timeout.patch
View File

@ -4,7 +4,7 @@
--- a/Lib/test/test_subprocess.py --- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py
@@ -261,7 +261,8 @@ class ProcessTestCase(BaseTestCase): @@ -272,7 +272,8 @@ class ProcessTestCase(BaseTestCase):
"time.sleep(3600)"], "time.sleep(3600)"],
# Some heavily loaded buildbots (sparc Debian 3.x) require # Some heavily loaded buildbots (sparc Debian 3.x) require
# this much time to start and print. # this much time to start and print.