[openoffice] branch trunk updated: When building icu on FreeBSD with ports gcc, use the rpath to find libstdc++.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 1d36aa0 When building icu on FreeBSD with ports gcc, use the rpath to find libstdc++. 1d36aa0 is described below commit 1d36aa0df1278425e9b61485862a22aa6631ea9e Author: Don Lewis AuthorDate: Sat Nov 16 21:03:49 2019 -0800 When building icu on FreeBSD with ports gcc, use the rpath to find libstdc++. This many only be needed with gcc is installed with a non-default PREFIX and/or ldconifig is not run on that directory. --- main/icu/makefile.mk | 5 + 1 file changed, 5 insertions(+) diff --git a/main/icu/makefile.mk b/main/icu/makefile.mk index 72e2230..36fb05d 100644 --- a/main/icu/makefile.mk +++ b/main/icu/makefile.mk @@ -86,6 +86,11 @@ LDFLAGSADD += -Wl,--hash-style=both LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo .ENDIF +# FreeBSD with gcc from ports needs -Wl,-rpath= to find the matching libstdc++ +.IF "$(OS)"=="FREEBSD" +LDFLAGSADD+=$(FBSD_GCC_RPATH) +.ENDIF + CONFIGURE_DIR=source CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
[openoffice] branch AOO42X updated: When building icu on FreeBSD with ports gcc, use the rpath to find libstdc++.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new dbde6b5 When building icu on FreeBSD with ports gcc, use the rpath to find libstdc++. dbde6b5 is described below commit dbde6b5d296fc7bca5b0d47f96f707c9b8023156 Author: Don Lewis AuthorDate: Sat Nov 16 21:03:49 2019 -0800 When building icu on FreeBSD with ports gcc, use the rpath to find libstdc++. This many only be needed with gcc is installed with a non-default PREFIX and/or ldconifig is not run on that directory. --- main/icu/makefile.mk | 5 + 1 file changed, 5 insertions(+) diff --git a/main/icu/makefile.mk b/main/icu/makefile.mk index 72e2230..36fb05d 100644 --- a/main/icu/makefile.mk +++ b/main/icu/makefile.mk @@ -86,6 +86,11 @@ LDFLAGSADD += -Wl,--hash-style=both LDFLAGSADD += -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo .ENDIF +# FreeBSD with gcc from ports needs -Wl,-rpath= to find the matching libstdc++ +.IF "$(OS)"=="FREEBSD" +LDFLAGSADD+=$(FBSD_GCC_RPATH) +.ENDIF + CONFIGURE_DIR=source CONFIGURE_ACTION+=sh -c 'CFLAGS="$(icu_CFLAGS)" CXXFLAGS="$(icu_CXXFLAGS)" LDFLAGS="$(icu_LDFLAGS) $(LDFLAGSADD)" ./configure --enable-layout --enable-static --enable-shared=yes $(DISABLE_64BIT)'
[openoffice] branch trunk updated: Add missing test command to fix gcc libstdc++ rpath detection on FreeBSD.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/trunk by this push: new 47982d0 Add missing test command to fix gcc libstdc++ rpath detection on FreeBSD. 47982d0 is described below commit 47982d080d866254171d508773537511f9ad568c Author: Don Lewis AuthorDate: Sat Nov 16 20:57:44 2019 -0800 Add missing test command to fix gcc libstdc++ rpath detection on FreeBSD. --- main/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/configure.ac b/main/configure.ac index ce3e1bf..4ec5594 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -2291,7 +2291,7 @@ AC_SUBST(COMNAME) if test "$_os" = "FreeBSD"; then FBSD_GCC_RPATH= -if "$COM" = "GCC"; then +if test "$COM" = "GCC"; then rpath=`$CC --print-file-name libstdc++.so` rpath=`realpath $rpath` rpath=`dirname $rpath`
[openoffice] branch AOO42X updated: Add missing test command to fix gcc libstdc++ rpath detection on FreeBSD.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO42X by this push: new eda2f9d Add missing test command to fix gcc libstdc++ rpath detection on FreeBSD. eda2f9d is described below commit eda2f9d6f967b9887de01e09e16788a85f8d4241 Author: Don Lewis AuthorDate: Sat Nov 16 20:57:44 2019 -0800 Add missing test command to fix gcc libstdc++ rpath detection on FreeBSD. --- main/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/configure.ac b/main/configure.ac index ce3e1bf..4ec5594 100644 --- a/main/configure.ac +++ b/main/configure.ac @@ -2291,7 +2291,7 @@ AC_SUBST(COMNAME) if test "$_os" = "FreeBSD"; then FBSD_GCC_RPATH= -if "$COM" = "GCC"; then +if test "$COM" = "GCC"; then rpath=`$CC --print-file-name libstdc++.so` rpath=`realpath $rpath` rpath=`dirname $rpath`
buildbot success in on openoffice-linux64-nightly
The Buildbot has detected a restored build on builder openoffice-linux64-nightly while building . Full details are available at: https://ci.apache.org/builders/openoffice-linux64-nightly/builds/586 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb_slave8_ubuntu Build Reason: forced: by IRC user (privmsg): None Build Source Stamp: HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 79b8682 Fixed typos, removed whitespace
79b8682 is described below
commit 79b868258f4b267f418930c8d4240c8a16651212
Author: mseidel
AuthorDate: Sat Nov 16 19:01:34 2019 +0100
Fixed typos, removed whitespace
(cherry picked from commit c36aa0f147e300f1e12fc96d3a3427fe1c697165)
---
.../indexingfilter/restartindexingservice.cxx | 160 ++---
.../customactions/reg4allmsdoc/reg4allmsi.cxx | 50 +++
2 files changed, 105 insertions(+), 105 deletions(-)
diff --git
a/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
b/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
index 66ef55d..c8027b1 100644
---
a/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++
b/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,29 +7,29 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
-/*
-After installation of the OOo filter for the indexing service
-it is necessary to restart the indexing service in order to
+/*
+After installation of the AOO filter for the indexing service
+it is necessary to restart the indexing service in order to
activate the filter. This is the most reliable way to get the
indexing service working. We only restart the service if it is
already running. If we have insufficient privileges to restart
-the service we do nothing.
+the service we do nothing.
*/
-
+
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
@@ -59,70 +59,70 @@ QueryServiceStatus_t QueryServiceStatus_ = NULL;
StartService_t StartService_ = NULL;
const LPTSTR INDEXING_SERVICE_NAME = TEXT("cisvc");
-
+
bool StopIndexingService(SC_HANDLE hService)
{
-SERVICE_STATUS status;
-
+SERVICE_STATUS status;
+
if (ControlService_(hService, SERVICE_CONTROL_STOP, &status))
-{
- // Check the status until the service is no longer stop pending.
-if (QueryServiceStatus_(hService, &status))
-{
+{
+ // Check the status until the service is no longer stop pending.
+if (QueryServiceStatus_(hService, &status))
+{
DWORD startTime = GetTickCount();
DWORD oldCheckPoint = status.dwCheckPoint;
-while (status.dwCurrentState == SERVICE_STOP_PENDING)
-{
-// Do not wait longer than the wait hint. A good interval is
-// one tenth the wait hint, but no less than 1 second and no
-// more than 10 seconds.
+while (status.dwCurrentState == SERVICE_STOP_PENDING)
+{
+// Do not wait longer than the wait hint. A good interval is
+// one tenth the wait hint, but no less than 1 second and no
+// more than 10 seconds.
DWORD waitTime = status.dwWaitHint / 10;
-
+
if (waitTime < 1000)
waitTime = 1000;
else if (waitTime > 1)
waitTime = 1;
-
+
Sleep(waitTime);
-// Check the status again.
+// Check the status again.
if (!QueryServiceStatus_(hService, &status) ||
-(status.dwCurrentState == SERVICE_STOPPED))
+(status.dwCurrentState == SERVICE_STOPPED))
break;
-
+
if (status.dwCheckPoint > oldCheckPoint)
-{
+{
startTime = GetTickCount()
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new c36aa0f Fixed typos, removed whitespace
c36aa0f is described below
commit c36aa0f147e300f1e12fc96d3a3427fe1c697165
Author: mseidel
AuthorDate: Sat Nov 16 19:01:34 2019 +0100
Fixed typos, removed whitespace
---
.../indexingfilter/restartindexingservice.cxx | 160 ++---
.../customactions/reg4allmsdoc/reg4allmsi.cxx | 50 +++
2 files changed, 105 insertions(+), 105 deletions(-)
diff --git
a/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
b/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
index 66ef55d..c8027b1 100644
---
a/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
+++
b/main/setup_native/source/win32/customactions/indexingfilter/restartindexingservice.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,29 +7,29 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
-/*
-After installation of the OOo filter for the indexing service
-it is necessary to restart the indexing service in order to
+/*
+After installation of the AOO filter for the indexing service
+it is necessary to restart the indexing service in order to
activate the filter. This is the most reliable way to get the
indexing service working. We only restart the service if it is
already running. If we have insufficient privileges to restart
-the service we do nothing.
+the service we do nothing.
*/
-
+
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */
#endif
@@ -59,70 +59,70 @@ QueryServiceStatus_t QueryServiceStatus_ = NULL;
StartService_t StartService_ = NULL;
const LPTSTR INDEXING_SERVICE_NAME = TEXT("cisvc");
-
+
bool StopIndexingService(SC_HANDLE hService)
{
-SERVICE_STATUS status;
-
+SERVICE_STATUS status;
+
if (ControlService_(hService, SERVICE_CONTROL_STOP, &status))
-{
- // Check the status until the service is no longer stop pending.
-if (QueryServiceStatus_(hService, &status))
-{
+{
+ // Check the status until the service is no longer stop pending.
+if (QueryServiceStatus_(hService, &status))
+{
DWORD startTime = GetTickCount();
DWORD oldCheckPoint = status.dwCheckPoint;
-while (status.dwCurrentState == SERVICE_STOP_PENDING)
-{
-// Do not wait longer than the wait hint. A good interval is
-// one tenth the wait hint, but no less than 1 second and no
-// more than 10 seconds.
+while (status.dwCurrentState == SERVICE_STOP_PENDING)
+{
+// Do not wait longer than the wait hint. A good interval is
+// one tenth the wait hint, but no less than 1 second and no
+// more than 10 seconds.
DWORD waitTime = status.dwWaitHint / 10;
-
+
if (waitTime < 1000)
waitTime = 1000;
else if (waitTime > 1)
waitTime = 1;
-
+
Sleep(waitTime);
-// Check the status again.
+// Check the status again.
if (!QueryServiceStatus_(hService, &status) ||
-(status.dwCurrentState == SERVICE_STOPPED))
+(status.dwCurrentState == SERVICE_STOPPED))
break;
-
+
if (status.dwCheckPoint > oldCheckPoint)
-{
+{
startTime = GetTickCount();
oldCheckPoint = status.dwCheckPoint;
}
[openoffice] branch AOO42X updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new edd5c1e Fixed typos, removed whitespace
edd5c1e is described below
commit edd5c1e389a75fad274944e498d96d324819c5b0
Author: mseidel
AuthorDate: Sat Nov 16 17:02:38 2019 +0100
Fixed typos, removed whitespace
(cherry picked from commit 09316e06825712f4b194db859b4b9bb529374218)
---
.../win32/customactions/javafilter/jfregca.cxx | 139 +++--
1 file changed, 70 insertions(+), 69 deletions(-)
diff --git
a/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
b/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
index 5d009bf..7afa530 100644
--- a/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
+++ b/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
+
//#include
#ifdef _MSC_VER
@@ -37,52 +38,52 @@
#endif
#include
-//Simple function prototypes
+// Simple function prototypes
bool update_activesync_regvalues(bool, bool, char** );
void createKeys(HKEY hKey, char **);
void deleteKeys(HKEY hKey, char **);
bool isMulti(MSIHANDLE);
-//Simple data arrays for registry values
+// Simple data arrays for registry values
TCHAR *pxlData[8]= {
- "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", //CLSID 1 - key name at
InstalledFilters Key
- "{43887C67-4D5D-4127-BAAC-87A288494C7C}", //CLSID 2 - key value for
Default Export
- ".pxl",
//Registry key for device type - already there if ActiveSync installerd
- ".sxc",
//New registry key for SO docs
- "InstalledFilters",
//Sub-key of device/so doc key
- "DefaultImport", //Key
name added at device/so level key
- "DefaultExport", //Key
name added at device/so level key
- "Binary Copy",//Key
value for DefaultImport
+ "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", // CLSID 1 - key name at
InstalledFilters Key
+ "{43887C67-4D5D-4127-BAAC-87A288494C7C}", // CLSID 2 - key value for
Default Export
+ ".pxl",
// Registry key for device type - already there if ActiveSync installed
+ ".sxc",
// New registry key for SO docs
+ "InstalledFilters", //
Sub-key of device/so doc key
+ "DefaultImport", //
Key name added at device/so level key
+ "DefaultExport", //
Key name added at device/so level key
+ "Binary Copy",//
Key value for DefaultImport
};
TCHAR *pswData[8] = {
- "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}", //CLSID 1 - key name at
InstalledFilters Key
- "{CB43F086-838D-4FA4-B5F6-3406B9A57439}", //CLSID 2 - key value for
Default Export
- ".psw",
//Registry key for device type - already there if ActiveSync installe
- ".sxw",
//New registry key for SO docs
- "InstalledFilters",
//Sub-key of device/so doc key
- "DefaultImport", //Key
name added at device/so level key
- "DefaultExport", //Key
name added at device/so level key
-
[openoffice] branch trunk updated: Fixed typos, removed whitespace
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 09316e0 Fixed typos, removed whitespace
09316e0 is described below
commit 09316e06825712f4b194db859b4b9bb529374218
Author: mseidel
AuthorDate: Sat Nov 16 17:02:38 2019 +0100
Fixed typos, removed whitespace
---
.../win32/customactions/javafilter/jfregca.cxx | 139 +++--
1 file changed, 70 insertions(+), 69 deletions(-)
diff --git
a/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
b/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
index 5d009bf..7afa530 100644
--- a/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
+++ b/main/setup_native/source/win32/customactions/javafilter/jfregca.cxx
@@ -1,5 +1,5 @@
/**
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,19 +7,20 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
+
//#include
#ifdef _MSC_VER
@@ -37,52 +38,52 @@
#endif
#include
-//Simple function prototypes
+// Simple function prototypes
bool update_activesync_regvalues(bool, bool, char** );
void createKeys(HKEY hKey, char **);
void deleteKeys(HKEY hKey, char **);
bool isMulti(MSIHANDLE);
-//Simple data arrays for registry values
+// Simple data arrays for registry values
TCHAR *pxlData[8]= {
- "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", //CLSID 1 - key name at
InstalledFilters Key
- "{43887C67-4D5D-4127-BAAC-87A288494C7C}", //CLSID 2 - key value for
Default Export
- ".pxl",
//Registry key for device type - already there if ActiveSync installerd
- ".sxc",
//New registry key for SO docs
- "InstalledFilters",
//Sub-key of device/so doc key
- "DefaultImport", //Key
name added at device/so level key
- "DefaultExport", //Key
name added at device/so level key
- "Binary Copy",//Key
value for DefaultImport
+ "{C6AB3E74-9F4F-4370-8120-A8A6FABB7A7C}", // CLSID 1 - key name at
InstalledFilters Key
+ "{43887C67-4D5D-4127-BAAC-87A288494C7C}", // CLSID 2 - key value for
Default Export
+ ".pxl",
// Registry key for device type - already there if ActiveSync installed
+ ".sxc",
// New registry key for SO docs
+ "InstalledFilters", //
Sub-key of device/so doc key
+ "DefaultImport", //
Key name added at device/so level key
+ "DefaultExport", //
Key name added at device/so level key
+ "Binary Copy",//
Key value for DefaultImport
};
TCHAR *pswData[8] = {
- "{BDD611C3-7BAB-460F-8711-5B9AC9EF6020}", //CLSID 1 - key name at
InstalledFilters Key
- "{CB43F086-838D-4FA4-B5F6-3406B9A57439}", //CLSID 2 - key value for
Default Export
- ".psw",
//Registry key for device type - already there if ActiveSync installe
- ".sxw",
//New registry key for SO docs
- "InstalledFilters",
//Sub-key of device/so doc key
- "DefaultImport", //Key
name added at device/so level key
- "DefaultExport", //Key
name added at device/so level key
- "Binary Copy",//Key
value f
