Update patch for v3.13.0rc2.

Also updates: - XZ 5.6.2 - OpenSSL 3.0.15
beeware · Sep 9, 2024 · a0f789d · a0f789d
1 parent 18766a7
commit a0f789d
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 35 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ BUILD_NUMBER=custom
 # of a release cycle, as official binaries won't be published.
 # PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
 # PYTHON_VER is the major/minor version (e.g., 3.10)
-PYTHON_VERSION=3.13.0rc1
+PYTHON_VERSION=3.13.0rc2
 PYTHON_PKG_VERSION=$(PYTHON_VERSION)
 PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Eo "\d+\.\d+\.\d+")
 PYTHON_PKG_MICRO_VERSION=$(shell echo $(PYTHON_PKG_VERSION) | grep -Eo "\d+\.\d+\.\d+")
@@ -29,8 +29,8 @@ PYTHON_VER=$(basename $(PYTHON_VERSION))
 BZIP2_VERSION=1.0.8-1
 LIBFFI_VERSION=3.4.6-1
 MPDECIMAL_VERSION=4.0.0-1
-OPENSSL_VERSION=3.0.14-1
-XZ_VERSION=5.4.7-1
+OPENSSL_VERSION=3.0.15-1
+XZ_VERSION=5.6.2-1
 
 # Supported OS
 OS_LIST=macOS iOS tvOS watchOS

diff --git a/README.rst b/README.rst
@@ -4,7 +4,7 @@ Python Apple Support
 This is a meta-package for building a version of Python that can be embedded
 into a macOS, iOS, tvOS or watchOS project.
 
-**This branch builds a packaged version of Python 3.13.0**.
+**This branch builds a packaged version of Python 3.13.0rc2**.
 Other Python versions are available by cloning other branches of the main
 repository:
 

diff --git a/patch/Python/Python.patch b/patch/Python/Python.patch
@@ -163,7 +163,7 @@ index ec0857a4a99..2350e9dc821 100644
  #  elif !defined(TARGET_OS_OSX) || TARGET_OS_OSX
  PLATFORM_TRIPLET=darwin
 diff --git a/configure b/configure
-index beffc1fd76c..b2daf3467cd 100755
+index 7e1e5e594ca..39a050c1451 100755
 --- a/configure
 +++ b/configure
 @@ -978,6 +978,8 @@
@@ -243,17 +243,17 @@ index beffc1fd76c..b2daf3467cd 100755
  	esac
  fi
 @@ -4147,6 +4179,14 @@
- 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;;
- 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang ;;
- 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang ;;
+ 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+ 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+ 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
 +
-+		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang ;;
-+		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang ;;
-+		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang ;;
++		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
++		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
++		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
 +
-+		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang ;;
-+		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang ;;
-+		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang ;;
++		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
++		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
++		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
  		*)
  	esac
  fi
@@ -709,8 +709,8 @@ index beffc1fd76c..b2daf3467cd 100755
  then
 
    for ac_func in clock_settime
-@@ -24590,8 +24746,8 @@
-   MODULE_LDFLAGS="\$(BLDLIBRARY)"
+@@ -24593,8 +24749,8 @@
+   LIBPYTHON="\$(BLDLIBRARY)"
  fi
 
 -# On iOS the shared libraries must be linked with the Python framework
@@ -720,7 +720,7 @@ index beffc1fd76c..b2daf3467cd 100755
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
 
-@@ -27239,7 +27395,7 @@
+@@ -27242,7 +27398,7 @@
  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for device files" >&5
  printf "%s\n" "$as_me: checking for device files" >&6;}
 
@@ -729,7 +729,7 @@ index beffc1fd76c..b2daf3467cd 100755
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -27672,7 +27828,7 @@
+@@ -27675,7 +27831,7 @@
      with_ensurepip=no ;; #(
    WASI) :
      with_ensurepip=no ;; #(
@@ -738,7 +738,7 @@ index beffc1fd76c..b2daf3467cd 100755
      with_ensurepip=no ;; #(
    *) :
      with_ensurepip=upgrade
-@@ -28699,7 +28855,7 @@
+@@ -28700,7 +28856,7 @@
   ;; #(
      Darwin) :
       ;; #(
@@ -747,7 +747,7 @@ index beffc1fd76c..b2daf3467cd 100755
 
 
 
-@@ -32464,6 +32620,8 @@
+@@ -32465,6 +32621,8 @@
      "Mac/Resources/framework/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/framework/Info.plist" ;;
      "Mac/Resources/app/Info.plist") CONFIG_FILES="$CONFIG_FILES Mac/Resources/app/Info.plist" ;;
      "iOS/Resources/Info.plist") CONFIG_FILES="$CONFIG_FILES iOS/Resources/Info.plist" ;;
@@ -757,7 +757,7 @@ index beffc1fd76c..b2daf3467cd 100755
      "Misc/python.pc") CONFIG_FILES="$CONFIG_FILES Misc/python.pc" ;;
      "Misc/python-embed.pc") CONFIG_FILES="$CONFIG_FILES Misc/python-embed.pc" ;;
 diff --git a/configure.ac b/configure.ac
-index 5842bd24c45..f97279331f6 100644
+index 58f54076ff2..4825d131142 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -330,6 +330,12 @@
@@ -828,17 +828,17 @@ index 5842bd24c45..f97279331f6 100644
  	esac
  fi
 @@ -421,6 +451,14 @@
- 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang ;;
- 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang ;;
- 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang ;;
+ 		aarch64-apple-ios*-simulator) CXX=arm64-apple-ios-simulator-clang++ ;;
+ 		aarch64-apple-ios*)           CXX=arm64-apple-ios-clang++ ;;
+ 		x86_64-apple-ios*-simulator)  CXX=x86_64-apple-ios-simulator-clang++ ;;
 +
-+		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang ;;
-+		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang ;;
-+		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang ;;
++		aarch64-apple-tvos*-simulator) CXX=arm64-apple-tvos-simulator-clang++ ;;
++		aarch64-apple-tvos*)           CXX=arm64-apple-tvos-clang++ ;;
++		x86_64-apple-tvos*-simulator)  CXX=x86_64-apple-tvos-simulator-clang++ ;;
 +
-+		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang ;;
-+		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang ;;
-+		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang ;;
++		aarch64-apple-watchos*-simulator) CXX=arm64-apple-watchos-simulator-clang++ ;;
++		aarch64-apple-watchos*)           CXX=arm64_32-apple-watchos-clang++ ;;
++		x86_64-apple-watchos*-simulator)  CXX=x86_64-apple-watchos-simulator-clang++ ;;
  		*)
  	esac
  fi
@@ -1211,8 +1211,8 @@ index 5842bd24c45..f97279331f6 100644
  then
    AC_CHECK_FUNCS([clock_settime], [], [
        AC_CHECK_LIB([rt], [clock_settime], [
-@@ -6176,8 +6316,8 @@
-   MODULE_LDFLAGS="\$(BLDLIBRARY)"
+@@ -6179,8 +6319,8 @@
+   LIBPYTHON="\$(BLDLIBRARY)"
  fi
 
 -# On iOS the shared libraries must be linked with the Python framework
@@ -1222,7 +1222,7 @@ index 5842bd24c45..f97279331f6 100644
    MODULE_DEPS_SHARED="$MODULE_DEPS_SHARED \$(PYTHONFRAMEWORKDIR)/\$(PYTHONFRAMEWORK)"
  fi
 
-@@ -6785,7 +6925,7 @@
+@@ -6788,7 +6928,7 @@
  dnl NOTE: Inform user how to proceed with files when cross compiling.
  dnl Some cross-compile builds are predictable; they won't ever
  dnl have /dev/ptmx or /dev/ptc, so we can set them explicitly.
@@ -1231,7 +1231,7 @@ index 5842bd24c45..f97279331f6 100644
    ac_cv_file__dev_ptmx=no
    ac_cv_file__dev_ptc=no
  else
-@@ -7042,7 +7182,7 @@
+@@ -7045,7 +7185,7 @@
        AS_CASE([$ac_sys_system],
          [Emscripten], [with_ensurepip=no],
          [WASI], [with_ensurepip=no],
@@ -1240,7 +1240,7 @@ index 5842bd24c45..f97279331f6 100644
          [with_ensurepip=upgrade]
        )
      ])
-@@ -7452,7 +7592,7 @@
+@@ -7454,7 +7594,7 @@
    [VxWorks*], [PY_STDLIB_MOD_SET_NA([_scproxy], [termios], [grp])],
    dnl The _scproxy module is available on macOS
    [Darwin], [],
@@ -1428,6 +1428,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#!/bin/bash
 +xcrun --sdk appletvos${TVOS_SDK_VERSION} clang -target arm64-apple-tvos $@
 --- /dev/null
++++ b/tvOS/Resources/bin/arm64-apple-tvos-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvos${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos $@
+--- /dev/null
 +++ b/tvOS/Resources/bin/arm64-apple-tvos-cpp
 @@ -0,0 +1,2 @@
 +#!/bin/bash
@@ -1443,6 +1448,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#!/bin/bash
 +xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target arm64-apple-tvos-simulator $@
 --- /dev/null
++++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target arm64-apple-tvos-simulator $@
+--- /dev/null
 +++ b/tvOS/Resources/bin/arm64-apple-tvos-simulator-cpp
 @@ -0,0 +1,2 @@
 +#!/bin/bash
@@ -1458,6 +1468,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#!/bin/bash
 +xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang -target x86_64-apple-tvos-simulator $@
 --- /dev/null
++++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk appletvsimulator${TVOS_SDK_VERSION} clang++ -target x86_64-apple-tvos-simulator $@
+--- /dev/null
 +++ b/tvOS/Resources/bin/x86_64-apple-tvos-simulator-cpp
 @@ -0,0 +1,2 @@
 +#!/bin/bash
@@ -1660,6 +1675,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#!/bin/bash
 +xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target arm64-apple-watchos-simulator $@
 --- /dev/null
++++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target arm64-apple-watchos-simulator $@
+--- /dev/null
 +++ b/watchOS/Resources/bin/arm64-apple-watchos-simulator-cpp
 @@ -0,0 +1,2 @@
 +#!/bin/bash
@@ -1675,6 +1695,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#!/bin/bash
 +xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang -target arm64_32-apple-watchos $@
 --- /dev/null
++++ b/watchOS/Resources/bin/arm64_32-apple-watchos-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchos${WATCHOS_SDK_VERSION} clang++ -target arm64_32-apple-watchos $@
+--- /dev/null
 +++ b/watchOS/Resources/bin/arm64_32-apple-watchos-cpp
 @@ -0,0 +1,2 @@
 +#!/bin/bash
@@ -1690,6 +1715,11 @@ index c3e261ecd9e..26ef7a95de4 100644
 +#!/bin/bash
 +xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang -target x86_64-apple-watchos-simulator $@
 --- /dev/null
++++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-clang++
+@@ -0,0 +1,2 @@
++#!/bin/bash
++xcrun --sdk watchsimulator${WATCHOS_SDK_VERSION} clang++ -target x86_64-apple-watchos-simulator $@
+--- /dev/null
 +++ b/watchOS/Resources/bin/x86_64-apple-watchos-simulator-cpp
 @@ -0,0 +1,2 @@
 +#!/bin/bash