[Libreoffice-commits] core.git: 2 commits - external/python3 vcl/osx

[Libreoffice Gerrit user]

 external/python3/UnpackedTarball_python3.mk |    1 +
 external/python3/darwin.patch.0             |   10 ++++++++++
 vcl/osx/DragSource.cxx                      |    1 +
 3 files changed, 12 insertions(+)

New commits:
commit e5bc69087a6e67f0872317c130dfac4fe242c448
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Dec 29 11:02:15 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Dec 29 14:22:25 2018 +0100

    external/python3: Work around macOS Clang trunk error
    
    ..."target does not support '.file' without a number", which was introduced into
    LLVM with <http://llvm.org/viewvc/llvm-project?view=revision&revision=349976>
    "[MC] Enable .file support on COFF and diagnose it on unsupported targets",
    stating:  "The 'single parameter' .file directive appears to be an ELF-only
    featurea [sic] that is intended to insert the main source filename into the
    string table table [sic]."
    
    And <https://sourceware.org/binutils/docs-2.31/as/File.html> states about the
    default single (file name) argument version:  "This statement may go away in
    future: it is only recognized to be compatible with old as programs."
    
    As external/python3 builds just fine on macOS with that .file directive removed,
    lets just do that for now.
    
    Change-Id: Ib28c29d0cacd151437447ccb2f6cfb8925e3e85a
    Reviewed-on: https://gerrit.libreoffice.org/65704
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk
index 35d6e643a1b0..ea5e160c3536 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
 	external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
 	external/python3/ubsan.patch.0 \
 	external/python3/python-3.5.tweak.strip.soabi.patch \
+	external/python3/darwin.patch.0 \
 ))
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),)
diff --git a/external/python3/darwin.patch.0 b/external/python3/darwin.patch.0
new file mode 100644
index 000000000000..139cdc9780bb
--- /dev/null
+++ b/external/python3/darwin.patch.0
@@ -0,0 +1,10 @@
+--- Modules/_ctypes/libffi_osx/x86/darwin64.S
++++ Modules/_ctypes/libffi_osx/x86/darwin64.S
+@@ -29,7 +29,6 @@
+ #include <fficonfig.h>
+ #include <ffi.h>
+ 
+- .file "darwin64.S"
+ .text
+ 
+ /* ffi_call_unix64 (void *args, unsigned long bytes, unsigned flags,
commit 5c4e96b466e8dc1903d5b24762e8117269e64da7
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sat Dec 29 10:56:28 2018 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sat Dec 29 14:22:12 2018 +0100

    Initialize DragSource::mDragSourceHelper
    
    At least during CppunitTest_basctl_dialogs_test, DragSource::initialize
    apparently throws an exception before initializing mDragSourceHelper, so that
    
        [mDragSourceHelper release];
    
    in ~DragSource may cause a crash.
    
    Change-Id: Ic11b5d7a1dbfd5636d6f25b30b509d0d8a381262
    Reviewed-on: https://gerrit.libreoffice.org/65702
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/vcl/osx/DragSource.cxx b/vcl/osx/DragSource.cxx
index 11ba53d9ee6c..6203152829eb 100644
--- a/vcl/osx/DragSource.cxx
+++ b/vcl/osx/DragSource.cxx
@@ -146,6 +146,7 @@ DragSource::DragSource():
   mView(nullptr),
   mpFrame(nullptr),
   mLastMouseEventBeforeStartDrag(nil),
+  mDragSourceHelper(nil),
   m_MouseButton(0)
 {
 }