Skip to content

Commit a0f789d

Browse files
freakboy3742freakboy3742
committed
Update patch for v3.13.0rc2.
Also updates: - XZ 5.6.2 - OpenSSL 3.0.15
1 parent 18766a7 commit a0f789d

File tree

3 files changed

+65
-35
lines changed

3 files changed

+65
-35
lines changed

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BUILD_NUMBER=custom
1818
# of a release cycle, as official binaries won't be published.
1919
# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
2020
# PYTHON_VER is the major/minor version (e.g., 3.10)
21-
PYTHON_VERSION=3.13.0rc1
21+
PYTHON_VERSION=3.13.0rc2
2222
PYTHON_PKG_VERSION=$(PYTHON_VERSION)
2323
PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
2424
PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -29,8 +29,8 @@ PYTHON_VER=$(basename $(PYTHON_VERSION))
2929
BZIP2_VERSION=1.0.8-1
3030
LIBFFI_VERSION=3.4.6-1
3131
MPDECIMAL_VERSION=4.0.0-1
32-
OPENSSL_VERSION=3.0.14-1
33-
XZ_VERSION=5.4.7-1
32+
OPENSSL_VERSION=3.0.15-1
33+
XZ_VERSION=5.6.2-1
3434

3535
# Supported OS
3636
OS_LIST=macOS iOS tvOS watchOS

‎README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Python Apple Support
44
This is a meta-package for building a version of Python that can be embedded
55
into a macOS, iOS, tvOS or watchOS project.
66

7-
**This branch builds a packaged version of Python 3.13.0**.
7+
**This branch builds a packaged version of Python 3.13.0rc2**.
88
Other Python versions are available by cloning other branches of the main
99
repository:
1010

‎patch/Python/Python.patch

Lines changed: 61 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ index ec0857a4a99..2350e9dc821 100644
163163
# elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
164164
PLATFORM_TRIPLET=darwin
165165
diff --git a/configure b/configure
166-
index beffc1fd76c..b2daf3467cd 100755
166+
index 7e1e5e594ca..39a050c1451 100755
167167
--- a/configure
168168
+++ b/configure
169169
@@ -978,6 +978,8 @@
@@ -243,17 +243,17 @@ index beffc1fd76c..b2daf3467cd 100755
243243
esac
244244
fi
245245
@@ -4147,6 +4179,14 @@
246-
aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;;
247-
aarch64-apple-ios*) CXX=arm64-apple-ios-clang ;;
248-
x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang ;;
246+
aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
247+
aarch64-apple-ios*) CXX=arm64-apple-ios-clang++ ;;
248+
x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang++ ;;
249249
+
250-
+ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang ;;
251-
+ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang ;;
252-
+ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang ;;
250+
+ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
251+
+ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang++ ;;
252+
+ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang++ ;;
253253
+
254-
+ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang ;;
255-
+ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang ;;
256-
+ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang ;;
254+
+ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
255+
+ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang++ ;;
256+
+ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang++ ;;
257257
*)
258258
esac
259259
fi
@@ -709,8 +709,8 @@ index beffc1fd76c..b2daf3467cd 100755
709709
then
710710

711711
for ac_func in clock_settime
712-
@@ -24590,8 +24746,8 @@
713-
MODULE_LDFLAGS="\$(BLDLIBRARY)"
712+
@@ -24593,8 +24749,8 @@
713+
LIBPYTHON="\$(BLDLIBRARY)"
714714
fi
715715

716716
-# On iOS the shared libraries must be linked with the Python framework
@@ -720,7 +720,7 @@ index beffc1fd76c..b2daf3467cd 100755
720720
MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
721721
fi
722722

723-
@@ -27239,7 +27395,7 @@
723+
@@ -27242,7 +27398,7 @@
724724
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
725725
printf "%s\n" "$as_me: checking for device files" >&6;}
726726

@@ -729,7 +729,7 @@ index beffc1fd76c..b2daf3467cd 100755
729729
ac_cv_file__dev_ptmx=no
730730
ac_cv_file__dev_ptc=no
731731
else
732-
@@ -27672,7 +27828,7 @@
732+
@@ -27675,7 +27831,7 @@
733733
with_ensurepip=no ;; #(
734734
WASI) :
735735
with_ensurepip=no ;; #(
@@ -738,7 +738,7 @@ index beffc1fd76c..b2daf3467cd 100755
738738
with_ensurepip=no ;; #(
739739
*) :
740740
with_ensurepip=upgrade
741-
@@ -28699,7 +28855,7 @@
741+
@@ -28700,7 +28856,7 @@
742742
;; #(
743743
Darwin) :
744744
;; #(
@@ -747,7 +747,7 @@ index beffc1fd76c..b2daf3467cd 100755
747747

748748

749749

750-
@@ -32464,6 +32620,8 @@
750+
@@ -32465,6 +32621,8 @@
751751
"Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
752752
"Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
753753
"iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
@@ -757,7 +757,7 @@ index beffc1fd76c..b2daf3467cd 100755
757757
"Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
758758
"Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
759759
diff --git a/configure.ac b/configure.ac
760-
index 5842bd24c45..f97279331f6 100644
760+
index 58f54076ff2..4825d131142 100644
761761
--- a/configure.ac
762762
+++ b/configure.ac
763763
@@ -330,6 +330,12 @@
@@ -828,17 +828,17 @@ index 5842bd24c45..f97279331f6 100644
828828
esac
829829
fi
830830
@@ -421,6 +451,14 @@
831-
aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;;
832-
aarch64-apple-ios*) CXX=arm64-apple-ios-clang ;;
833-
x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang ;;
831+
aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
832+
aarch64-apple-ios*) CXX=arm64-apple-ios-clang++ ;;
833+
x86_64-apple-ios*-simulator) CXX=x86_64-apple-ios-simulator-clang++ ;;
834834
+
835-
+ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang ;;
836-
+ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang ;;
837-
+ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang ;;
835+
+ aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
836+
+ aarch64-apple-tvos*) CXX=arm64-apple-tvos-clang++ ;;
837+
+ x86_64-apple-tvos*-simulator) CXX=x86_64-apple-tvos-simulator-clang++ ;;
838838
+
839-
+ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang ;;
840-
+ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang ;;
841-
+ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang ;;
839+
+ aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
840+
+ aarch64-apple-watchos*) CXX=arm64_32-apple-watchos-clang++ ;;
841+
+ x86_64-apple-watchos*-simulator) CXX=x86_64-apple-watchos-simulator-clang++ ;;
842842
*)
843843
esac
844844
fi
@@ -1211,8 +1211,8 @@ index 5842bd24c45..f97279331f6 100644
12111211
then
12121212
AC_CHECK_FUNCS([clock_settime], [], [
12131213
AC_CHECK_LIB([rt], [clock_settime], [
1214-
@@ -6176,8 +6316,8 @@
1215-
MODULE_LDFLAGS="\$(BLDLIBRARY)"
1214+
@@ -6179,8 +6319,8 @@
1215+
LIBPYTHON="\$(BLDLIBRARY)"
12161216
fi
12171217

12181218
-# On iOS the shared libraries must be linked with the Python framework
@@ -1222,7 +1222,7 @@ index 5842bd24c45..f97279331f6 100644
12221222
MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
12231223
fi
12241224

1225-
@@ -6785,7 +6925,7 @@
1225+
@@ -6788,7 +6928,7 @@
12261226
dnl NOTE: Inform user how to proceed with files when cross compiling.
12271227
dnl Some cross-compile builds are predictable; they won't ever
12281228
dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
@@ -1231,7 +1231,7 @@ index 5842bd24c45..f97279331f6 100644
12311231
ac_cv_file__dev_ptmx=no
12321232
ac_cv_file__dev_ptc=no
12331233
else
1234-
@@ -7042,7 +7182,7 @@
1234+
@@ -7045,7 +7185,7 @@
12351235
AS_CASE([$ac_sys_system],
12361236
[Emscripten], [with_ensurepip=no],
12371237
[WASI], [with_ensurepip=no],
@@ -1240,7 +1240,7 @@ index 5842bd24c45..f97279331f6 100644
12401240
[with_ensurepip=upgrade]
12411241
)
12421242
])
1243-
@@ -7452,7 +7592,7 @@
1243+
@@ -7454,7 +7594,7 @@
12441244
[VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
12451245
dnl The _scproxy module is available on macOS
12461246
[Darwin], [],
@@ -1428,6 +1428,11 @@ index c3e261ecd9e..26ef7a95de4 100644
14281428
+#!/bin/bash
14291429
+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos $@
14301430
--- /dev/null
1431+
+++ b/tvOS/Resources/bin/arm64-apple-tvos-clang++
1432+
@@ -0,0 +1,2 @@
1433+
+#!/bin/bash
1434+
+xcrun --sdk appletvos${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos $@
1435+
--- /dev/null
14311436
+++ b/tvOS/Resources/bin/arm64-apple-tvos-cpp
14321437
@@ -0,0 +1,2 @@
14331438
+#!/bin/bash
@@ -1443,6 +1448,11 @@ index c3e261ecd9e..26ef7a95de4 100644
14431448
+#!/bin/bash
14441449
+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos-simulator $@
14451450
--- /dev/null
1451+
+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang++
1452+
@@ -0,0 +1,2 @@
1453+
+#!/bin/bash
1454+
+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos-simulator $@
1455+
--- /dev/null
14461456
+++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-cpp
14471457
@@ -0,0 +1,2 @@
14481458
+#!/bin/bash
@@ -1458,6 +1468,11 @@ index c3e261ecd9e..26ef7a95de4 100644
14581468
+#!/bin/bash
14591469
+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos-simulator $@
14601470
--- /dev/null
1471+
+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang++
1472+
@@ -0,0 +1,2 @@
1473+
+#!/bin/bash
1474+
+xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target x86_64-apple-tvos-simulator $@
1475+
--- /dev/null
14611476
+++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-cpp
14621477
@@ -0,0 +1,2 @@
14631478
+#!/bin/bash
@@ -1660,6 +1675,11 @@ index c3e261ecd9e..26ef7a95de4 100644
16601675
+#!/bin/bash
16611676
+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target arm64-apple-watchos-simulator $@
16621677
--- /dev/null
1678+
+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang++
1679+
@@ -0,0 +1,2 @@
1680+
+#!/bin/bash
1681+
+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target arm64-apple-watchos-simulator $@
1682+
--- /dev/null
16631683
+++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-cpp
16641684
@@ -0,0 +1,2 @@
16651685
+#!/bin/bash
@@ -1675,6 +1695,11 @@ index c3e261ecd9e..26ef7a95de4 100644
16751695
+#!/bin/bash
16761696
+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos $@
16771697
--- /dev/null
1698+
+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-clang++
1699+
@@ -0,0 +1,2 @@
1700+
+#!/bin/bash
1701+
+xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang++ -target arm64_32-apple-watchos $@
1702+
--- /dev/null
16781703
+++ b/watchOS/Resources/bin/arm64_32-apple-watchos-cpp
16791704
@@ -0,0 +1,2 @@
16801705
+#!/bin/bash
@@ -1690,6 +1715,11 @@ index c3e261ecd9e..26ef7a95de4 100644
16901715
+#!/bin/bash
16911716
+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos-simulator $@
16921717
--- /dev/null
1718+
+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang++
1719+
@@ -0,0 +1,2 @@
1720+
+#!/bin/bash
1721+
+xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target x86_64-apple-watchos-simulator $@
1722+
--- /dev/null
16931723
+++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-cpp
16941724
@@ -0,0 +1,2 @@
16951725
+#!/bin/bash

0 commit comments

Comments
 (0)