summaryrefslogtreecommitdiffstats
path: root/external/python3/python-3.3.0-darwin.patch.1
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-01-17 15:38:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-01-25 13:07:44 +0000
commitdebc1a25704830de92a088f8ed13a90d2a326cc2 (patch)
tree3243742af1c2b3e1af6500683d635aedce04fdcc /external/python3/python-3.3.0-darwin.patch.1
parenttdf#104050 - Add Breeze palette (diff)
downloadcore-debc1a25704830de92a088f8ed13a90d2a326cc2.tar.gz
core-debc1a25704830de92a088f8ed13a90d2a326cc2.zip
python3: upgrade to release 3.5.3
- fixes some minor CVEs - drop python-vc2013.patch.1 - drop python-3.3.3-py17797.patch.1: the bug was fixed in MSVC2015 runtime so not relevant - drop python-lsan.patch.0: fixed upstream - ubsan.patch.0: drop hunks that were fixed upstream - python-3.5.0-tcltk.disable.patch: merge into msvc-disable.patch.1 Change-Id: I2aecae446539d28eaf3eb64ee67581596019335d Reviewed-on: https://gerrit.libreoffice.org/33225 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 743f9fc86f3d3b6e87bf58c0654bcdccab0ab383) Reviewed-on: https://gerrit.libreoffice.org/33262 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit baf09e572b377f569b00e61c10710787b1c151ba) Reviewed-on: https://gerrit.libreoffice.org/33497 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/python3/python-3.3.0-darwin.patch.1')
-rw-r--r--external/python3/python-3.3.0-darwin.patch.14
1 files changed, 1 insertions, 3 deletions
diff --git a/external/python3/python-3.3.0-darwin.patch.1 b/external/python3/python-3.3.0-darwin.patch.1
index 2cf5bbb9e1bd..d5cb17e339a2 100644
--- a/external/python3/python-3.3.0-darwin.patch.1
+++ b/external/python3/python-3.3.0-darwin.patch.1
@@ -27,8 +27,6 @@ diff -ru python3.orig/configure python3/configure
LIPO_32BIT_FLAGS=""
ARCH_RUN_32BIT=""
;;
-Only in python3: .#configure
-Only in python3: #configure#
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
@@ -51,7 +49,7 @@ diff -ru python3.orig/Mac/Resources/app/Info.plist.in python3/Mac/Resources/app/
- <string>Python</string>
+ <string>LibreOfficePython</string>
<key>CFBundleGetInfoString</key>
- <string>%version%, (c) 2001-2015 Python Software Foundation.</string>
+ <string>%version%, (c) 2001-2016 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