You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2020/08/25 03:05:22 UTC
[openoffice] branch AOO418 updated (a5526c3 -> ebd402a)
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 a5526c3 #i125696# Removed error_report.xhp from linkage creation lineup.
new 8ff3034 Comment out an unused method that breaks compilation with gcc9.
new 7c99446 Fix build with boost-1.67.
new bdb58f7 When building icu on FreeBSD with ports gcc, use the rpath to find libstdc++.
new 77af848 Include <cstdlib> to get the declaration for exit().
new 4d077a1 lingucomponent: remove unused header from hunspell.
new f27fad2 #i125431# "The Password is incorrect. The file cannot be opened."
new ebd402a Platforms that need CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT for sockets usually need it for pipes too, and even if it isn't necessary it can't hurt.
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:
main/basebmp/inc/basebmp/packedpixeliterator.hxx | 3 +++
main/basegfx/source/range/b2drangeclipper.cxx | 7 ++++++-
.../source/mozbootstrap/MNSProfileDiscover.cxx | 7 ++++++-
main/icu/makefile.mk | 5 +++++
main/l10ntools/source/inireader.cxx | 1 +
.../source/spellcheck/spell/sspellimp.cxx | 1 -
main/sal/osl/unx/pipe.c | 24 +++++++++++++---------
main/sal/osl/unx/sockimpl.h | 2 +-
main/slideshow/source/inc/listenercontainer.hxx | 7 ++++++-
9 files changed, 42 insertions(+), 15 deletions(-)
[openoffice] 05/07: lingucomponent: remove unused header from
hunspell.
Posted by tr...@apache.org.
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 4d077a1f369aa631dc674a6a0072fdade1971e17
Author: Pedro Giffuni <pf...@apache.org>
AuthorDate: Mon Jan 23 04:00:40 2017 +0000
lingucomponent: remove unused header from hunspell.
According to opengrok, we are not using DictMgr so the header is not
needed. The header has been removed in newer versions of hunspell
altogether.
Obtained from: FreeBSD
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1779875 13f79535-47bb-0310-9956-ffa450edef68
---
main/lingucomponent/source/spellcheck/spell/sspellimp.cxx | 1 -
1 file changed, 1 deletion(-)
diff --git a/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index deb5fb9..31efa2d 100644
--- a/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -36,7 +36,6 @@
#include <lingutil.hxx>
#include <hunspell.hxx>
-#include <dictmgr.hxx>
#include <sspellimp.hxx>
#include <linguistic/lngprops.hxx>
[openoffice] 06/07: #i125431# "The Password is incorrect. The file
cannot be opened."
Posted by tr...@apache.org.
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 f27fad259a88acef21ba95dc702ebd620d3a5f56
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 21 19:03:22 2016 +0000
#i125431# "The Password is incorrect. The file cannot be opened."
Fix handling of the "isRelative" option in Mozilla's profiles.ini files.
Patch by: Arrigo Marchiori <ardovm at yahoo dot it>
Review by: me
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1726068 13f79535-47bb-0310-9956-ffa450edef68
---
main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx b/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
index ee7d43f..dc9cc55 100644
--- a/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
+++ b/main/extensions/source/mozbootstrap/MNSProfileDiscover.cxx
@@ -123,9 +123,14 @@ namespace connectivity
{
isRelative = sIsRelative.toInt32();
}
+ if (isRelative)
+ {
+ // Make it absolute
+ profilePath = regDir + profilePath;
+ }
ProfileStruct* profileItem = new ProfileStruct(product,profileName,
- regDir + profilePath);
+ profilePath);
m_Product.mProfileList[profileName] = profileItem;
sal_Int32 isDefault = 0;
[openoffice] 03/07: When building icu on FreeBSD with ports gcc,
use the rpath to find libstdc++.
Posted by tr...@apache.org.
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 bdb58f77c33385d4dedb03ed021452db7dccc009
Author: Don Lewis <tr...@apache.org>
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 b37578d..20c8180 100644
--- a/main/icu/makefile.mk
+++ b/main/icu/makefile.mk
@@ -85,6 +85,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] 01/07: Comment out an unused method that breaks
compilation with gcc9.
Posted by tr...@apache.org.
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 8ff3034168a23405edaa383bb96439a76d71c5b6
Author: Don Lewis <tr...@apache.org>
AuthorDate: Tue Nov 5 22:45:27 2019 -0800
Comment out an unused method that breaks compilation with gcc9.
In case someone needs this method in the future, leave behind a note
with the likely code fix.
---
main/basebmp/inc/basebmp/packedpixeliterator.hxx | 3 +++
1 file changed, 3 insertions(+)
diff --git a/main/basebmp/inc/basebmp/packedpixeliterator.hxx b/main/basebmp/inc/basebmp/packedpixeliterator.hxx
index 58a119f..038f2c3 100644
--- a/main/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/main/basebmp/inc/basebmp/packedpixeliterator.hxx
@@ -606,14 +606,17 @@ public:
>> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
}
+/***** XXX - This appears to be unused and fails to compile with gcc9
value_type get(difference_type const & d) const
{
+// XXX - should x(d.x) be (x + d.x)?
const int remainder( x(d.x) % num_intraword_positions );
return (unsigned_cast<value_type>(*current(d.x,d.y) &
get_mask<value_type, bits_per_pixel, MsbFirst>(remainder))
>> get_shift<num_intraword_positions, bits_per_pixel, MsbFirst>(remainder));
}
+******/
void set( value_type v ) const
{
[openoffice] 07/07: Platforms that need
CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT for sockets usually need it for pipes too,
and even if it isn't necessary it can't hurt.
Posted by tr...@apache.org.
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 ebd402a9426d626dd60adb831ce481bf05e1ad31
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Feb 6 19:07:51 2016 +0000
Platforms that need CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT for sockets usually
need it for pipes too, and even if it isn't necessary it can't hurt.
In particular, on FreeBSD 11-CURRENT it seems pipes no longer wake up
from accept when closed in other threads, so let's deal with that before
FreeBSD 11 is released.
Reported by: Matthias Apitz <g u r u a t u n i x a r e a d o t d e>
Patch by: me
Tested by: Matthias Apitz <g u r u a t u n i x a r e a d o t d e>
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1728872 13f79535-47bb-0310-9956-ffa450edef68
---
main/sal/osl/unx/pipe.c | 24 ++++++++++++++----------
main/sal/osl/unx/sockimpl.h | 2 +-
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/main/sal/osl/unx/pipe.c b/main/sal/osl/unx/pipe.c
index 4c10a8a..3ea54e0 100644
--- a/main/sal/osl/unx/pipe.c
+++ b/main/sal/osl/unx/pipe.c
@@ -115,7 +115,7 @@ oslPipe __osl_createPipeImpl()
pPipeImpl = (oslPipe)calloc(1, sizeof(struct oslPipeImpl));
pPipeImpl->m_nRefCount =1;
pPipeImpl->m_bClosed = sal_False;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipeImpl->m_bIsInShutdown = sal_False;
pPipeImpl->m_bIsAccepting = sal_False;
#endif
@@ -321,7 +321,7 @@ void SAL_CALL osl_releasePipe( oslPipe pPipe )
void SAL_CALL osl_closePipe( oslPipe pPipe )
{
int nRet;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
size_t len;
struct sockaddr_un addr;
int fd;
@@ -341,10 +341,10 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
ConnFD = pPipe->m_Socket;
/*
- Thread does not return from accept on linux, so
+ Thread does not return from accept on some operating systems, so
connect to the accepting pipe
*/
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsAccepting )
{
pPipe->m_bIsInShutdown = sal_True;
@@ -356,7 +356,11 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, pPipe->m_Name, sizeof(addr.sun_path));
- len = sizeof(addr);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
+ len = sizeof(addr);
+#endif
nRet = connect( fd, (struct sockaddr *)&addr, len);
#if OSL_DEBUG_LEVEL > 1
@@ -367,7 +371,7 @@ void SAL_CALL osl_closePipe( oslPipe pPipe )
#endif /* OSL_DEBUG_LEVEL */
close(fd);
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
nRet = shutdown(ConnFD, 2);
@@ -408,13 +412,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
OSL_ASSERT(strlen(pPipe->m_Name) > 0);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_True;
#endif
s = accept(pPipe->m_Socket, NULL, NULL);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_False;
#endif
@@ -424,13 +428,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe pPipe)
return NULL;
}
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsInShutdown )
{
close(s);
return NULL;
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
else
{
/* alloc memory */
diff --git a/main/sal/osl/unx/sockimpl.h b/main/sal/osl/unx/sockimpl.h
index 2cec813..0cc0e10 100644
--- a/main/sal/osl/unx/sockimpl.h
+++ b/main/sal/osl/unx/sockimpl.h
@@ -63,7 +63,7 @@ struct oslPipeImpl {
sal_Char m_Name[PATH_MAX + 1];
oslInterlockedCount m_nRefCount;
sal_Bool m_bClosed;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
sal_Bool m_bIsAccepting;
sal_Bool m_bIsInShutdown;
#endif
[openoffice] 04/07: Include to get the declaration for
exit().
Posted by tr...@apache.org.
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 77af848c795fa3a93d16b6bc7c55d360c9de151d
Author: Don Lewis <tr...@apache.org>
AuthorDate: Tue Nov 5 10:24:04 2019 -0800
Include <cstdlib> to get the declaration for exit().
---
main/l10ntools/source/inireader.cxx | 1 +
1 file changed, 1 insertion(+)
diff --git a/main/l10ntools/source/inireader.cxx b/main/l10ntools/source/inireader.cxx
index f6a4241..612c51b 100644
--- a/main/l10ntools/source/inireader.cxx
+++ b/main/l10ntools/source/inireader.cxx
@@ -21,6 +21,7 @@
#include <unicode/regex.h>
#include <unicode/unistr.h>
+#include <cstdlib>
#include <string>
#include <fstream>
#include <iostream>
[openoffice] 02/07: Fix build with boost-1.67.
Posted by tr...@apache.org.
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 7c994460094ca689db33640a0396df9921d346a3
Author: Pedro Giffuni <pf...@apache.org>
AuthorDate: Thu Apr 19 03:43:05 2018 +0000
Fix build with boost-1.67.
The release notes say:
____
Utility:
Breaking change: <boost/utility.hpp> header no longer includes boost::next
and boost::prior as they have been moved to the iterator module. Instead
include <boost/next_prior.hpp>. Other uses of <boost/utility.hpp> are
discouraged, it's better to use the header for the specific functionality
instead.
____
Obtained from: Jan Beich
FreeBSD PR: 227553
git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1829494 13f79535-47bb-0310-9956-ffa450edef68
---
main/basegfx/source/range/b2drangeclipper.cxx | 7 ++++++-
main/slideshow/source/inc/listenercontainer.hxx | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/main/basegfx/source/range/b2drangeclipper.cxx b/main/basegfx/source/range/b2drangeclipper.cxx
index 0b64352..cdab9ee 100644
--- a/main/basegfx/source/range/b2drangeclipper.cxx
+++ b/main/basegfx/source/range/b2drangeclipper.cxx
@@ -35,7 +35,12 @@
#include <o3tl/vector_pool.hxx>
#include <boost/bind.hpp>
-#include <boost/utility.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106700
+# include <boost/utility.hpp>
+#else
+# include <boost/next_prior.hpp>
+#endif
#include <algorithm>
#include <deque>
diff --git a/main/slideshow/source/inc/listenercontainer.hxx b/main/slideshow/source/inc/listenercontainer.hxx
index 7dba512..0d6057b 100644
--- a/main/slideshow/source/inc/listenercontainer.hxx
+++ b/main/slideshow/source/inc/listenercontainer.hxx
@@ -24,7 +24,12 @@
#define INCLUDED_SLIDESHOW_LISTENERCONTAINER_HXX
#include <osl/mutex.hxx>
-#include <boost/utility.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION < 106700
+# include <boost/utility.hpp>
+#else
+# include <boost/next_prior.hpp>
+#endif
#include <algorithm>
#include <vector>