[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 c3b7da3 Fixed typos, removed whitespace
c3b7da3 is described below
commit c3b7da30377815802429c889b153852f1ce44980
Author: mseidel
AuthorDate: Wed Aug 26 20:24:45 2020 +0200
Fixed typos, removed whitespace
---
.../OfficeDev/DesktopEnvironment/DocumentView.java | 16 +--
.../OfficeDev/DesktopEnvironment/StatusView.java | 20 ++--
.../AsciiFilter/FilterOptions.java | 20 ++--
main/offapi/com/sun/star/document/ExportFilter.idl | 117 +-
main/offapi/com/sun/star/document/ImportFilter.idl | 117 +-
main/offapi/com/sun/star/task/XStatusIndicator.idl | 133 +++--
6 files changed, 213 insertions(+), 210 deletions(-)
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index 247ee06..796f884 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -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,16 +7,16 @@
* 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.
- *
+ *
*/
@@ -192,7 +192,7 @@ public class DocumentView extendsJFrame
/**
* Create the view frame for showing the office documents on demand.
- * Dependend from given command line parameter we create
+ * Dependent from given command line parameter we create
* an office XFrame and initialize it with a window. This
* window can be a pure toolkit window (means toolkit of office!)
* or a plugged java canvas - office window combination.
@@ -200,8 +200,8 @@ public class DocumentView extendsJFrame
public void createFrame()
{
// create view frame (as a XFrame!) here
-// Look for right view mode setted by user command line parameter.
-// First try to get a new unambigous frame name from our global
ViewContainer.
+// Look for right view mode set by user command line parameter.
+// First try to get a new unambiguous frame name from our global
ViewContainer.
if(ViewContainer.mbInplace==true)
{
// inplace document view can't be initialized without a visible
parent window hierarchy!
@@ -333,7 +333,7 @@ public class DocumentView extendsJFrame
maInterceptor = null;
// close the frame and his document
-// Relaesing of our listener connections for disposing()
+// Releasing of our listener connections for disposing()
// will be forced automatically then. Because the frame
// will call us back ...
if (mxFrame!=null)
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
index a792044..53dca6c 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
@@ -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,16 +7,16 @@
* 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 permissi
[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 58a988d Fixed typos, removed whitespace
58a988d is described below
commit 58a988d92c9014b775be77867311d144409a6e16
Author: mseidel
AuthorDate: Wed Aug 26 20:24:45 2020 +0200
Fixed typos, removed whitespace
(cherry picked from commit c3b7da30377815802429c889b153852f1ce44980)
---
.../OfficeDev/DesktopEnvironment/DocumentView.java | 16 +--
.../OfficeDev/DesktopEnvironment/StatusView.java | 20 ++--
.../AsciiFilter/FilterOptions.java | 20 ++--
main/offapi/com/sun/star/document/ExportFilter.idl | 117 +-
main/offapi/com/sun/star/document/ImportFilter.idl | 117 +-
main/offapi/com/sun/star/task/XStatusIndicator.idl | 133 +++--
6 files changed, 213 insertions(+), 210 deletions(-)
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
index 247ee06..796f884 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java
@@ -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,16 +7,16 @@
* 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.
- *
+ *
*/
@@ -192,7 +192,7 @@ public class DocumentView extendsJFrame
/**
* Create the view frame for showing the office documents on demand.
- * Dependend from given command line parameter we create
+ * Dependent from given command line parameter we create
* an office XFrame and initialize it with a window. This
* window can be a pure toolkit window (means toolkit of office!)
* or a plugged java canvas - office window combination.
@@ -200,8 +200,8 @@ public class DocumentView extendsJFrame
public void createFrame()
{
// create view frame (as a XFrame!) here
-// Look for right view mode setted by user command line parameter.
-// First try to get a new unambigous frame name from our global
ViewContainer.
+// Look for right view mode set by user command line parameter.
+// First try to get a new unambiguous frame name from our global
ViewContainer.
if(ViewContainer.mbInplace==true)
{
// inplace document view can't be initialized without a visible
parent window hierarchy!
@@ -333,7 +333,7 @@ public class DocumentView extendsJFrame
maInterceptor = null;
// close the frame and his document
-// Relaesing of our listener connections for disposing()
+// Releasing of our listener connections for disposing()
// will be forced automatically then. Because the frame
// will call us back ...
if (mxFrame!=null)
diff --git
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
index a792044..53dca6c 100644
---
a/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
+++
b/main/odk/examples/DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java
@@ -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,16 +7,16 @@
* 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 expre
svn commit: r1881227 - /openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt
Author: marcus Date: Wed Aug 26 19:09:57 2020 New Revision: 1881227 URL: http://svn.apache.org/viewvc?rev=1881227&view=rev Log: Updated download numbers for August Modified: openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt Modified: openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt URL: http://svn.apache.org/viewvc/openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt?rev=1881227&r1=1881226&r2=1881227&view=diff == --- openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt (original) +++ openoffice/ooo-site/trunk/content/stats/aoo-downloads.txt Wed Aug 26 19:09:57 2020 @@ -3022,3 +3022,10 @@ 2020-08-14,42157,296344981 2020-08-15,32949,296377930 2020-08-16,0,296411260 +2020-08-17,47612,296458872 +2020-08-18,48801,296507673 +2020-08-19,49555,296557228 +2020-08-20,49201,296606429 +2020-08-21,42708,296649137 +2020-08-22,34047,296683184 +2020-08-23,37674,296720858
svn commit: r1064819 - in /websites/staging/ooo-site/trunk: cgi-bin/ content/ content/stats/aoo-downloads.txt
Author: buildbot Date: Wed Aug 26 19:12:36 2020 New Revision: 1064819 Log: Staging update by buildbot for ooo-site Modified: websites/staging/ooo-site/trunk/cgi-bin/ (props changed) websites/staging/ooo-site/trunk/content/ (props changed) websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt Propchange: websites/staging/ooo-site/trunk/cgi-bin/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Aug 26 19:12:36 2020 @@ -1 +1 @@ -1880969 +1881227 Propchange: websites/staging/ooo-site/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Aug 26 19:12:36 2020 @@ -1 +1 @@ -1880969 +1881227 Modified: websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt == --- websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt (original) +++ websites/staging/ooo-site/trunk/content/stats/aoo-downloads.txt Wed Aug 26 19:12:36 2020 @@ -3022,3 +3022,10 @@ 2020-08-14,42157,296344981 2020-08-15,32949,296377930 2020-08-16,0,296411260 +2020-08-17,47612,296458872 +2020-08-18,48801,296507673 +2020-08-19,49555,296557228 +2020-08-20,49201,296606429 +2020-08-21,42708,296649137 +2020-08-22,34047,296683184 +2020-08-23,37674,296720858
svn commit: r1064820 - in /websites/production/ooo-site: cgi-bin/ content/
Author: marcus Date: Wed Aug 26 19:15:21 2020 New Revision: 1064820 Log: Publishing svnmucc operation to ooo-site site by marcus Added: websites/production/ooo-site/cgi-bin/ - copied from r1064819, websites/staging/ooo-site/trunk/cgi-bin/ websites/production/ooo-site/content/ - copied from r1064819, websites/staging/ooo-site/trunk/content/
[openoffice] branch trunk updated: Fixed typos (sould -> should) and some more
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 3945fe2 Fixed typos (sould -> should) and some more
3945fe2 is described below
commit 3945fe28166b82700c7d567fedab7482a96de498
Author: mseidel
AuthorDate: Wed Aug 26 23:29:14 2020 +0200
Fixed typos (sould -> should) and some more
---
.../sun/star/ucb/XInteractionCookieHandling.idl| 11 +-
.../inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx | 14 +-
main/sw/source/core/layout/paintfrm.cxx| 104 +++
main/sw/source/filter/ww8/docxattributeoutput.cxx | 142 ++---
4 files changed, 137 insertions(+), 134 deletions(-)
diff --git a/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
b/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
index 917be4b..f3cd7c8 100644
--- a/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ b/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
@@ -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.
- *
+ *
*/
+
#ifndef __com_sun_star_ucb_XInteractionCookieHandling_idl__
#define __com_sun_star_ucb_XInteractionCookieHandling_idl__
@@ -65,7 +66,7 @@ published interface XInteractionCookieHandling:
com::sun::star::task::XInteracti
This method should be called before select().
@param ConfirmCookie
- A cookie that sould come from the sequence of
+ A cookie that should come from the sequence of
cookies offered by the
HandleCookiesRequest and that
should have a policy of
CookiePolicy::CONFIRM.
diff --git a/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
b/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index d05cb27..4c3a6e8 100644
--- a/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -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,16 +7,16 @@
* 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.
- *
+ *
*/
@@ -47,7 +47,7 @@ namespace drawinglayer
class SdrTextPrimitive2D : public
BufferedDecompositionPrimitive2D
{
private:
- // The text model data; this sould later just be the
OutlinerParaObject or
+ // The text model data; this should later just be the
OutlinerParaObject or
// something equal
::tools::WeakReference< SdrText > mrSdrText;
@@ -86,7 +86,7 @@ namespace drawinglayer
public:
SdrTextPrimitive2D(
-const SdrText* pSdrText,
+const SdrText* pSdrText,
const OutlinerParaObject& rOutlinerParaObjectPtr);
// get data
@@ -129,7 +129,7 @@ namespace drawinglayer
SdrContourTextPrimitive2D(
const SdrText* pSdrText,
const OutlinerParaObject& rOutlinerParaObjectPtr,
- const basegfx::B2DPolyPolygon&
rUnitPolyP
[openoffice] branch AOO42X updated: Fixed typos (sould -> should) and some more
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 f53e21f Fixed typos (sould -> should) and some more
f53e21f is described below
commit f53e21fac4b1c43788215084c50de8f59c59a49d
Author: mseidel
AuthorDate: Wed Aug 26 23:29:14 2020 +0200
Fixed typos (sould -> should) and some more
(cherry picked from commit 3945fe28166b82700c7d567fedab7482a96de498)
---
.../sun/star/ucb/XInteractionCookieHandling.idl| 11 +-
.../inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx | 14 +-
main/sw/source/core/layout/paintfrm.cxx| 104 +++
main/sw/source/filter/ww8/docxattributeoutput.cxx | 142 ++---
4 files changed, 137 insertions(+), 134 deletions(-)
diff --git a/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
b/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
index 917be4b..f3cd7c8 100644
--- a/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
+++ b/main/offapi/com/sun/star/ucb/XInteractionCookieHandling.idl
@@ -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.
- *
+ *
*/
+
#ifndef __com_sun_star_ucb_XInteractionCookieHandling_idl__
#define __com_sun_star_ucb_XInteractionCookieHandling_idl__
@@ -65,7 +66,7 @@ published interface XInteractionCookieHandling:
com::sun::star::task::XInteracti
This method should be called before select().
@param ConfirmCookie
- A cookie that sould come from the sequence of
+ A cookie that should come from the sequence of
cookies offered by the
HandleCookiesRequest and that
should have a policy of
CookiePolicy::CONFIRM.
diff --git a/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
b/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index d05cb27..4c3a6e8 100644
--- a/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/main/svx/inc/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -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,16 +7,16 @@
* 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.
- *
+ *
*/
@@ -47,7 +47,7 @@ namespace drawinglayer
class SdrTextPrimitive2D : public
BufferedDecompositionPrimitive2D
{
private:
- // The text model data; this sould later just be the
OutlinerParaObject or
+ // The text model data; this should later just be the
OutlinerParaObject or
// something equal
::tools::WeakReference< SdrText > mrSdrText;
@@ -86,7 +86,7 @@ namespace drawinglayer
public:
SdrTextPrimitive2D(
-const SdrText* pSdrText,
+const SdrText* pSdrText,
const OutlinerParaObject& rOutlinerParaObjectPtr);
// get data
@@ -129,7 +129,7 @@ namespace drawinglayer
SdrContourTextPrimitive2D(
const SdrText* pSdrText,
const OutlinerParaObject& rOutlinerParaObjec
[openoffice] branch AOO418 updated: Fix a compilation failure caused by missing include when debugging is enabled.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git The following commit(s) were added to refs/heads/AOO418 by this push: new 610a398 Fix a compilation failure caused by missing include when debugging is enabled. 610a398 is described below commit 610a39889210a09aa267c015f8686eed25d06c99 Author: Damjan Jovanovic AuthorDate: Thu Aug 13 16:23:54 2015 + Fix a compilation failure caused by missing include when debugging is enabled. git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1695735 13f79535-47bb-0310-9956-ffa450edef68 --- main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx index 992943b..284d184 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/uno2cpp.cxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include
[openoffice] 03/07: Initial support for the FreeBSD ARM platform.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 0bd9e244a1c349a04bd0330cfab559b72298733c
Author: pfg
AuthorDate: Tue Jan 3 04:15:40 2017 +
Initial support for the FreeBSD ARM platform.
This is just the skeleton, basically a copy of the linux support.
It wouldn't be surprising if it works without much trouble.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1777057
13f79535-47bb-0310-9956-ffa450edef68
---
.../source/cpp_uno/gcc3_freebsd_arm/armhelper.S| 57 ++
.../source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx| 546 +
.../source/cpp_uno/gcc3_freebsd_arm/except.cxx | 337 +++
.../source/cpp_uno/gcc3_freebsd_arm/makefile.mk| 80 +++
.../source/cpp_uno/gcc3_freebsd_arm/share.hxx | 96 +++
.../source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx| 665 +
main/set_soenv.in | 11 +
main/solenv/inc/unxfbsd.mk | 3 +
main/solenv/inc/unxfbsdr.mk| 46 ++
9 files changed, 1841 insertions(+)
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper.S
b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper.S
new file mode 100644
index 000..577403d
--- /dev/null
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/armhelper.S
@@ -0,0 +1,57 @@
+@
+@ 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
+@ regarding copyright ownership. The ASF licenses this file
+@ 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.
+@
+
+@ ARM support code for OpenOffice C++/UNO bridging
+@
+@ Written by Peter Naulls
+@ Modified by Caolan McNamara
+@ Fixed by Michael Casadevall
+
+#ifdef __ARM_EABI__
+# define UNWIND
+#else
+# define UNWIND @
+#endif
+
+ .file "armhelper.s"
+ .text
+ .align 4
+ .global privateSnippetExecutor
+ .type privateSnippetExecutor, %function
+privateSnippetExecutor:
+ UNWIND .fnstart@ start of unwinder entry
+
+ stmfd sp!, {r0-r3} @ follow other parameters on stack
+ UNWIND .pad #16 @ throw this data away on exception
+ mov r0, ip @ r0 points to functionoffset/vtable
+ mov r1, sp @ r1 points to this and params
+ @ (see cppuno.cxx:codeSnippet())
+ stmfd sp!, {r4,lr} @ save return address
+ @ (r4 pushed to preserve stack alignment)
+ UNWIND .save {r4,lr} @ restore these regs on exception
+
+ blcpp_vtable_call(PLT)
+
+ add sp, sp, #4 @ no need to restore r4 (we didn't touch it)
+ ldr pc, [sp], #20@ return, discarding function arguments
+
+ UNWIND .fnend @ end of unwinder entry
+
+ .size privateSnippetExecutor, . - privateSnippetExecutor
+.section.note.GNU-stack,"",%progbits
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx
b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx
new file mode 100644
index 000..bcc5f8e
--- /dev/null
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx
@@ -0,0 +1,546 @@
+/**
+ *
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * 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
+#include
+
+#include
[openoffice] 06/07: freebsd-arm: obvious fix.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 44db7cb5cea090dff31d4a8b466798cd4362509d Author: Pedro Giffuni AuthorDate: Sun Oct 1 04:53:39 2017 + freebsd-arm: obvious fix. git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1810249 13f79535-47bb-0310-9956-ffa450edef68 --- main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx index bcc5f8e..f6b1ff2 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx @@ -21,7 +21,7 @@ -#include +#include #include #include
[openoffice] 05/07: Permit using clang for FreeBSD ARM and PowerPC builds.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 2926eac7ac3a8dfadc9e4263d97f4b9a2666fd37 Author: Pedro Giffuni AuthorDate: Tue Feb 7 21:32:10 2017 + Permit using clang for FreeBSD ARM and PowerPC builds. Inspired on the linux/clang changes. git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1782082 13f79535-47bb-0310-9956-ffa450edef68 --- main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk | 2 +- main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/makefile.mk | 2 +- main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk index 39df3a4..486736d 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk @@ -35,7 +35,7 @@ NO_BSYMBOLIC=TRUE # --- Files -.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDRgcc3" +.IF "(OS)$(CPU)$(COMNAME)" == "FREEBSDRgcc3" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/makefile.mk b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/makefile.mk index 0f05903..398e80d 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/makefile.mk +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/makefile.mk @@ -33,7 +33,7 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk # --- Files -.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUXPgcc3POWERPC" +.IF "$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "FREEBSDPgcc3POWERPC" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk index 0676b13..931edd8 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk @@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCFREEBSDPgcc3POWERPC64" +.IF "$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "FREEBSDPgcc3POWERPC64" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA
[openoffice] 01/07: Add initial support for FreeBSD PPC using gcc.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit af84ad07003894d5216eb168c7b513e9521cb95c
Author: Pedro Giffuni
AuthorDate: Sun Jul 6 16:56:22 2014 +
Add initial support for FreeBSD PPC using gcc.
This is just the skeleton and required bridge support based
on linux-ppc. Currently untested.
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1608245
13f79535-47bb-0310-9956-ffa450edef68
---
.../cpp_uno/gcc3_freebsd_powerpc/cpp2uno.cxx | 791 +
.../source/cpp_uno/gcc3_freebsd_powerpc/except.cxx | 283
.../cpp_uno/gcc3_freebsd_powerpc/makefile.mk | 76 ++
.../source/cpp_uno/gcc3_freebsd_powerpc/share.hxx | 87 +++
.../cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx | 668 +
.../cpp_uno/gcc3_freebsd_powerpc64/cpp2uno.cxx | 718 +++
.../cpp_uno/gcc3_freebsd_powerpc64/except.cxx | 283
.../cpp_uno/gcc3_freebsd_powerpc64/makefile.mk | 75 ++
.../cpp_uno/gcc3_freebsd_powerpc64/share.hxx | 92 +++
.../cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx | 596
main/set_soenv.in | 40 ++
main/solenv/inc/unxfbsd.mk | 6 +
main/solenv/inc/unxfbsdppc.mk | 30 +
main/solenv/inc/unxfbsdppc64.mk| 31 +
14 files changed, 3776 insertions(+)
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/cpp2uno.cxx
b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/cpp2uno.cxx
new file mode 100644
index 000..921f280
--- /dev/null
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/cpp2uno.cxx
@@ -0,0 +1,791 @@
+/**
+ *
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * 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.
+ *
+ */
+
+
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_bridges.hxx"
+
+#include
+
+#include
+#include
+#include
+
+#include "bridges/cpp_uno/shared/bridge.hxx"
+#include "bridges/cpp_uno/shared/cppinterfaceproxy.hxx"
+#include "bridges/cpp_uno/shared/types.hxx"
+#include "bridges/cpp_uno/shared/vtablefactory.hxx"
+
+#include "share.hxx"
+// #include
+
+
+using namespace ::com::sun::star::uno;
+
+namespace
+{
+
+//==
+static typelib_TypeClass cpp2uno_call(
+ bridges::cpp_uno::shared::CppInterfaceProxy * pThis,
+ const typelib_TypeDescription * pMemberTypeDescr,
+ typelib_TypeDescriptionReference * pReturnTypeRef, // 0 indicates void
return
+ sal_Int32 nParams, typelib_MethodParameter * pParams,
+void ** gpreg, void ** fpreg, void ** ovrflw,
+ sal_Int64 * pRegisterReturn /* space for register return */ )
+{
+int ng = 0; //number of gpr registers used
+#ifndef __NO_FPRS__
+int nf = 0; //number of fpr regsiters used
+#endif
+void ** pCppStack; //temporary stack pointer
+
+// gpreg: [ret *], this, [gpr params]
+// fpreg: [fpr params]
+// ovrflw: [gpr or fpr params (properly aligned)]
+
+ // return
+ typelib_TypeDescription * pReturnTypeDescr = 0;
+ if (pReturnTypeRef)
+ TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef );
+
+ void * pUnoReturn = 0;
+ void * pCppReturn = 0; // complex return ptr: if != 0 && != pUnoReturn,
reconversion need
+
+ if (pReturnTypeDescr)
+ {
+ if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+ {
+ pUnoReturn = pRegisterReturn; // direct way for simple
types
+ }
+ else // complex return via ptr (pCppReturn)
+ {
+ pCppReturn = *(void **)gpreg;
+gpreg++;
+ng++;
+
+ pUnoReturn =
(bridges::cpp_uno::shared::relatesToInterfaceTyp
[openoffice] branch AOO418 updated (610a398 -> a41e569)
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a change to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git.
from 610a398 Fix a compilation failure caused by missing include when
debugging is enabled.
new af84ad0 Add initial support for FreeBSD PPC using gcc.
new 941ddfd Update endianness detection on FreeBSD.
new 0bd9e24 Initial support for the FreeBSD ARM platform.
new 0879711 Some more Initial support for the FreeBSD ARM platform.
new 2926eac Permit using clang for FreeBSD ARM and PowerPC builds.
new 44db7cb freebsd-arm: obvious fix.
new a41e569 freebsd-powerpc: obvious fix.
The 7 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../armhelper.S| 0
.../source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx| 546 ++
.../source/cpp_uno/gcc3_freebsd_arm/except.cxx | 337 +
.../source/cpp_uno/gcc3_freebsd_arm/makefile.mk| 80 +++
.../{gcc3_linux_arm => gcc3_freebsd_arm}/share.hxx | 0
.../source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx| 665 +
.../cpp_uno/gcc3_freebsd_powerpc/cpp2uno.cxx | 791 +
.../except.cxx | 0
.../cpp_uno/gcc3_freebsd_powerpc/makefile.mk | 76 ++
.../share.hxx | 0
.../cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx | 668 +
.../cpp_uno/gcc3_freebsd_powerpc64/cpp2uno.cxx | 718 +++
.../except.cxx | 0
.../cpp_uno/gcc3_freebsd_powerpc64/makefile.mk | 75 ++
.../share.hxx | 0
.../cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx | 596
.../desktop/source/deployment/misc/dp_platform.cxx | 7 +
main/odk/settings/platform.mk | 3 +
main/odk/settings/settings.mk | 7 +
main/sal/inc/osl/endian.h | 6 +-
main/sal/osl/unx/system.h | 8 +-
main/set_soenv.in | 51 ++
main/solenv/gbuild/platform/freebsd.mk | 10 +
main/solenv/inc/libs.mk| 3 +
main/solenv/inc/unx.mk | 4 +
main/solenv/inc/unxfbsd.mk | 12 +
main/solenv/inc/unxfbsdppc.mk | 30 +
main/solenv/inc/unxfbsdppc64.mk| 31 +
main/solenv/inc/unxfbsdr.mk| 46 ++
main/testtools/source/bridgetest/makefile.mk | 2 +-
30 files changed, 4763 insertions(+), 9 deletions(-)
copy main/bridges/source/cpp_uno/{gcc3_linux_arm =>
gcc3_freebsd_arm}/armhelper.S (100%)
create mode 100644 main/bridges/source/cpp_uno/gcc3_freebsd_arm/cpp2uno.cxx
create mode 100644 main/bridges/source/cpp_uno/gcc3_freebsd_arm/except.cxx
create mode 100644 main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk
copy main/bridges/source/cpp_uno/{gcc3_linux_arm =>
gcc3_freebsd_arm}/share.hxx (100%)
create mode 100644 main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx
create mode 100644 main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/cpp2uno.cxx
copy main/bridges/source/cpp_uno/{gcc3_linux_powerpc64 =>
gcc3_freebsd_powerpc}/except.cxx (100%)
create mode 100644 main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/makefile.mk
copy main/bridges/source/cpp_uno/{gcc3_macosx_powerpc =>
gcc3_freebsd_powerpc}/share.hxx (100%)
create mode 100644 main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx
create mode 100644
main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/cpp2uno.cxx
copy main/bridges/source/cpp_uno/{gcc3_linux_powerpc64 =>
gcc3_freebsd_powerpc64}/except.cxx (100%)
create mode 100644
main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk
copy main/bridges/source/cpp_uno/{gcc3_linux_powerpc64 =>
gcc3_freebsd_powerpc64}/share.hxx (100%)
create mode 100644
main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx
create mode 100644 main/solenv/inc/unxfbsdppc.mk
create mode 100644 main/solenv/inc/unxfbsdppc64.mk
create mode 100644 main/solenv/inc/unxfbsdr.mk
[openoffice] 02/07: Update endianness detection on FreeBSD.
This is an automated email from the ASF dual-hosted git repository.
truckman pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 941ddfd73d646765e35cc2fe66faf001ddda895c
Author: pfg
AuthorDate: Thu Dec 8 01:56:31 2016 +
Update endianness detection on FreeBSD.
This produces a working AOO on FreeBSD PowerPC64!
This is related to i126615 which was also fixed by Curtis a while ago.
Kudos for both contributions, makes me want to get a PowerPC to run
FreeBSD + AOO on it!
Author: Curtis Hamilton -- cmhamilto at gmail
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1773166
13f79535-47bb-0310-9956-ffa450edef68
---
main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk | 2 +-
main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx | 2 +-
main/desktop/source/deployment/misc/dp_platform.cxx| 6 ++
main/odk/settings/platform.mk | 3 +++
main/odk/settings/settings.mk | 7 +++
main/sal/inc/osl/endian.h | 6 ++
main/sal/osl/unx/system.h | 8
main/solenv/gbuild/platform/freebsd.mk | 10 ++
main/solenv/inc/libs.mk| 3 +++
main/solenv/inc/unx.mk | 4
main/solenv/inc/unxfbsd.mk | 3 +++
main/testtools/source/bridgetest/makefile.mk | 2 +-
12 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk
b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk
index 9093919..0676b13 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk
@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS=TRUE
# --- Files
-.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCLINUXPgcc3POWERPC64"
+.IF "$(COM)$(OS)$(CPU)$(COMNAME)$(CPUNAME)" == "GCCFREEBSDPgcc3POWERPC64"
.IF "$(cppu_no_leak)" == ""
CFLAGS += -DLEAK_STATIC_DATA
diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx
b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx
index 5002cf9..59f9e3a 100644
--- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx
+++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx
@@ -24,7 +24,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_bridges.hxx"
-#include
+#include
#include
#include
diff --git a/main/desktop/source/deployment/misc/dp_platform.cxx
b/main/desktop/source/deployment/misc/dp_platform.cxx
index f78aea9..5fee74d 100644
--- a/main/desktop/source/deployment/misc/dp_platform.cxx
+++ b/main/desktop/source/deployment/misc/dp_platform.cxx
@@ -56,6 +56,8 @@
#define PLATFORM_SOLARIS_SPARC "solaris_sparc"
#define PLATFORM_SOLARIS_SPARC64"solaris_sparc64"
#define PLATFORM_SOLARIS_X86"solaris_x86"
+#define PLATFORM_FREEBSD_POWERPC"freebsd_powerpc"
+#define PLATFORM_FREEBSD_POWERPC64 "freebsd_powerpc64"
#define PLATFORM_FREEBSD_X86"freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
@@ -134,6 +136,10 @@ namespace
ret = checkOSandCPU(OUSTR("kFreeBSD"), OUSTR("X86_64"));
else if (token.equals(OUSTR(PLATFORM_LINUX_SPARC)))
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("SPARC"));
+else if (token.equals(OUSTR(PLATFORM_FREEBSD_POWERPC)))
+ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("PowerPC"));
+else if (token.equals(OUSTR(PLATFORM_FREEBSD_POWERPC64)))
+ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("PowerPC64"));
else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC)))
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_LINUX_POWERPC64)))
diff --git a/main/odk/settings/platform.mk b/main/odk/settings/platform.mk
index 30800be..de79b52 100644
--- a/main/odk/settings/platform.mk
+++ b/main/odk/settings/platform.mk
@@ -34,6 +34,9 @@ else
ifeq "$(UNOPKG_PLATFORM)" "Linux_PowerPC"
EXTENSION_PLATFORM=linux_powerpc
else
+ ifeq "$(UNOPKG_PLATFORM)" "FreeBSD_PowerPC64"
+ EXTENSION_PLATFORM=freebsd_powerpc64
+ else
ifeq "$(UNOPKG_PLATFORM)" "Linux_x86"
EXTENSION_PLATFORM=linux_x86
else
diff --git a/main/odk/settings/settings.mk b/main/odk/settings/settings.mk
index b4bb4f5..93b1163 100644
--- a/main/odk/settings/settings.mk
+++ b/main/odk/settings/settings.mk
@@ -507,6 +507,9 @@ UNOPKG_PLATFORM=FreeBSD_x86_64
else
U
[openoffice] 07/07: freebsd-powerpc: obvious fix.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git commit a41e569492f214f161482e71021c40f3f140471f Author: Pedro Giffuni AuthorDate: Sun Oct 1 05:00:24 2017 + freebsd-powerpc: obvious fix. git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1810250 13f79535-47bb-0310-9956-ffa450edef68 --- main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx index c43b07b..eafc103 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_powerpc/uno2cpp.cxx @@ -24,7 +24,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#include +#include #include #include
[openoffice] 04/07: Some more Initial support for the FreeBSD ARM platform.
This is an automated email from the ASF dual-hosted git repository. truckman pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git commit 08797115ce0f707eb70a34fa2507134d1bb690a5 Author: pfg AuthorDate: Tue Jan 3 05:32:49 2017 + Some more Initial support for the FreeBSD ARM platform. Minor adjustments; still untested. git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1777067 13f79535-47bb-0310-9956-ffa450edef68 --- main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk | 2 +- main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx | 2 +- main/desktop/source/deployment/misc/dp_platform.cxx | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk index 1672cdf..39df3a4 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/makefile.mk @@ -35,7 +35,7 @@ NO_BSYMBOLIC=TRUE # --- Files -.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" +.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDRgcc3" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA diff --git a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx index daf14dc..d5ab980 100644 --- a/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx +++ b/main/bridges/source/cpp_uno/gcc3_freebsd_arm/uno2cpp.cxx @@ -21,7 +21,7 @@ -#include +#include #include #include diff --git a/main/desktop/source/deployment/misc/dp_platform.cxx b/main/desktop/source/deployment/misc/dp_platform.cxx index 5fee74d..2c40fbe 100644 --- a/main/desktop/source/deployment/misc/dp_platform.cxx +++ b/main/desktop/source/deployment/misc/dp_platform.cxx @@ -56,6 +56,7 @@ #define PLATFORM_SOLARIS_SPARC "solaris_sparc" #define PLATFORM_SOLARIS_SPARC64"solaris_sparc64" #define PLATFORM_SOLARIS_X86"solaris_x86" +#define PLATFORM_FREEBSD_ARM"freebsd_arm" #define PLATFORM_FREEBSD_POWERPC"freebsd_powerpc" #define PLATFORM_FREEBSD_POWERPC64 "freebsd_powerpc64" #define PLATFORM_FREEBSD_X86"freebsd_x86"
