Michael Stahl
e0befe8bfe
`python-3.3.0-darwin.patch.1`: remove the adapting of `UNIVERSAL_ARCHS` This was only enabled on `CPU=INTEL` (32-bit IA32) which is no longer supported by/for MacOSX anyway. Signed-off-by: Michael Stahl <michael.stahl@collabora.com> Change-Id: I5a3f1de9b6ba21efa53319914d126395226ce075 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/2475 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com> (cherry picked from commit 7664bb2285fa968e2dd4e86f42057f671ec958f6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205152 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
41 lines
1.5 KiB
Groff
41 lines
1.5 KiB
Groff
-*- Mode: diff -*-
|
|
|
|
LO needs to build both against MacOSX SDK and not produce universal binaries.
|
|
|
|
diff -ru python3.orig/Mac/Makefile.in python3/Mac/Makefile.in
|
|
--- python3.orig/Mac/Makefile.in 2015-07-05 18:50:07.000000000 +0200
|
|
+++ python3/Mac/Makefile.in 2015-07-26 17:40:14.860514100 +0200
|
|
@@ -44,7 +44,7 @@
|
|
INSTALL_SCRIPT= @INSTALL_SCRIPT@
|
|
INSTALL_DATA=@INSTALL_DATA@
|
|
LN=@LN@
|
|
-STRIPFLAG=-s
|
|
+STRIPFLAG=
|
|
CPMAC=CpMac
|
|
|
|
APPTEMPLATE=$(srcdir)/Resources/app
|
|
diff -ru python3.orig/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/Info.plist.in
|
|
--- python3.orig/Mac/Resources/app/Info.plist.in 2015-07-05 18:50:07.000000000 +0200
|
|
+++ python3/Mac/Resources/app/Info.plist.in 2015-07-26 17:42:00.974521224 +0200
|
|
@@ -18,7 +18,7 @@
|
|
</dict>
|
|
</array>
|
|
<key>CFBundleExecutable</key>
|
|
- <string>Python</string>
|
|
+ <string>LibreOfficePython</string>
|
|
<key>CFBundleGetInfoString</key>
|
|
<string>%version%, (c) 2001-2024 Python Software Foundation.</string>
|
|
<key>CFBundleHelpBookFolder</key>
|
|
diff -ru python3.orig/Mac/Resources/framework/Info.plist.in python3/Mac/Resources/framework/Info.plist.in
|
|
--- python3.orig/Mac/Resources/framework/Info.plist.in 2015-07-05 18:50:07.000000000 +0200
|
|
+++ python3/Mac/Resources/framework/Info.plist.in 2015-07-26 17:41:15.996518204 +0200
|
|
@@ -5,7 +5,7 @@
|
|
<key>CFBundleDevelopmentRegion</key>
|
|
<string>English</string>
|
|
<key>CFBundleExecutable</key>
|
|
- <string>Python</string>
|
|
+ <string>@PYTHONFRAMEWORK@</string>
|
|
<key>CFBundleGetInfoString</key>
|
|
<string>Python Runtime and Library</string>
|
|
<key>CFBundleIdentifier</key>
|