[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/settings officecfg/registry solenv/win64

[Damjan Jovanovic]

 odk/settings/settings.mk                                           |    8 --
 officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu |    2 
 solenv/win64/win64.patch                                           |   28 ++++++++++
 3 files changed, 29 insertions(+), 9 deletions(-)

New commits:
commit ddd858ea859bab6078d1add02ecb57578385f3b7
Author: Damjan Jovanovic <damjan at apache.org>
Date:   Tue Mar 6 16:59:52 2018 +0000

    Revert 1825956 and put it into the win64.patch file instead,
    
    as it may break building 32 bit AOO on 64 bit Windows.
    
    Patch by: me

diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index f22d2d1eedb2..0976ec27b988 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -57,8 +57,6 @@ JAVABIN=bin
 ifeq "$(PLATFORM)" "windows"
 # Settings for Windows using Microsoft compiler/linker
 
-PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 's/^i.86$$/i386/')
-
 OS=WIN
 PS=\\
 ICL=$$
@@ -121,14 +119,8 @@ SDK_JAVA_INCLUDES = -I"$(OO_SDK_JAVA_HOME)/include" -I"$(OO_SDK_JAVA_HOME)/inclu
 # define for used compiler necessary for UNO
 # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
 
-ifeq "$(PROCTYPE)" "i386"
 CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
 CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
-endif
-ifeq "$(PROCTYPE)" "x86_64"
-CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
-CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
-endif
 CC_OUTPUT_SWITCH=-Fo
 
 LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
diff --git a/solenv/win64/win64.patch b/solenv/win64/win64.patch
index ff17fc5e4865..17f96f0cee1b 100644
--- a/solenv/win64/win64.patch
+++ b/solenv/win64/win64.patch
@@ -252,3 +252,31 @@ Index: solenv/inc/wnt.mk
  # --- changes for W32-tcsh - should move into settings.mk ---
  JAVAC=javac
  JAVA=java
+Index: main/odk/settings/settings.mk
+===================================================================
+--- main/odk/settings/settings.mk	(revision 1825955)
++++ main/odk/settings/settings.mk	(revision 1825956)
+@@ -57,6 +57,8 @@
+ ifeq "$(PLATFORM)" "windows"
+ # Settings for Windows using Microsoft compiler/linker
+ 
++PROCTYPE := $(shell $(PRJ)/config.guess | cut -d"-" -f1 | sed -e 's/^i.86$$/i386/')
++
+ OS=WIN
+ PS=\\
+ ICL=$$
+@@ -119,8 +121,14 @@
+ # define for used compiler necessary for UNO
+ # -DCPPU_ENV=msci -- windows msvc 4.x - 7.x
+ 
++ifeq "$(PROCTYPE)" "i386"
+ CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
+ CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=msci
++endif
++ifeq "$(PROCTYPE)" "x86_64"
++CC_DEFINES_JNI=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
++CC_DEFINES=-DWIN32 -DWNT -D_DLL -DCPPU_ENV=mscx
++endif
+ CC_OUTPUT_SWITCH=-Fo
+ 
+ LIBRARY_LINK_FLAGS=/NODEFAULTLIB /DLL /DEBUGTYPE:cv
commit 9e642822f4394464c52af6f2268511154f5bc744
Author: Matthias Seidel <mseidel at apache.org>
Date:   Tue Mar 6 15:21:07 2018 +0000

    Changed links to https to avoid redirection

diff --git a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
index 39a7c7077a61..fbc98bc46f3a 100644
--- a/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/ExtensionManager.xcu
@@ -26,7 +26,7 @@
 <oor:component-data oor:name="ExtensionManager" oor:package="org.openoffice.Office" xmlns:oor="http://openoffice.org/2001/registry">
   <node oor:name="ExtensionRepositories">
     <prop oor:name="WebsiteLink">
-      <value>http://extensions.openoffice.org/getmore?cid=920794</value>
+      <value>https://extensions.openoffice.org/getmore?cid=920794</value>
     </prop>
   </node>
 </oor:component-data>