[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - external/coinmp

[Michael Stahl]

 external/coinmp/windows.build.patch.1 |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit baf8708ace3e0f2f6fb3cd1bc22f73e3bd1adf50
Author: Michael Stahl <mstahl at redhat.com>
Date:   Mon Jan 8 12:20:04 2018 +0100

    coinmp: link with /DYNAMICBASE
    
    No idea why this would be explicitly disabled.
    
    Change-Id: I1e06544ae4ae579de578560ce66e310da659ccb4
    (cherry picked from commit b0471fc84a065faf2aa38925c486b40b185ffa58)
    Reviewed-on: https://gerrit.libreoffice.org/47583
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/external/coinmp/windows.build.patch.1 b/external/coinmp/windows.build.patch.1
index e2e292e3ff28..2bd0526ac2c4 100644
--- a/external/coinmp/windows.build.patch.1
+++ b/external/coinmp/windows.build.patch.1
@@ -1966,7 +1966,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
 +      <ModuleDefinitionFile>..\..\..\..\CoinMP\src\CoinMP.def</ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
@@ -1987,7 +1987,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
@@ -2012,7 +2012,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
 +      <ModuleDefinitionFile>..\..\..\..\CoinMP\src\CoinMP.def</ModuleDefinitionFile>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Windows</SubSystem>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX64</TargetMachine>
 +    </Link>
@@ -2036,7 +2036,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/CoinMP/CoinMP.vcxproj coinmp/CoinM
 +      <SubSystem>Windows</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX64</TargetMachine>
 +    </Link>
@@ -2273,7 +2273,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
 +    <Link>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Console</SubSystem>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
@@ -2293,7 +2293,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
 +      <SubSystem>Console</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX86</TargetMachine>
 +    </Link>
@@ -2317,7 +2317,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
 +    <Link>
 +      <GenerateDebugInformation>true</GenerateDebugInformation>
 +      <SubSystem>Console</SubSystem>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX64</TargetMachine>
 +    </Link>
@@ -2340,7 +2340,7 @@ diff -urN coinmp.org/CoinMP/MSVisualStudio/v9/unitTest/unitTest.vcxproj coinmp/C
 +      <SubSystem>Console</SubSystem>
 +      <OptimizeReferences>true</OptimizeReferences>
 +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
++      <RandomizedBaseAddress>true</RandomizedBaseAddress>
 +      <DataExecutionPrevention />
 +      <TargetMachine>MachineX64</TargetMachine>
 +    </Link>