svn commit: r1716484 - /openoffice/trunk/main/cppu/source/uno/data.cxx
Author: pfg Date: Wed Nov 25 16:55:51 2015 New Revision: 1716484 URL: http://svn.apache.org/viewvc?rev=1716484=rev Log: i125711 - Illumos port: generalize MAX_ALIGNMENT for Solaris GCC in Ilumos appears to behave exactly like the Solaris SUNPRO compiler so generalize the case for Solaris. Modified: openoffice/trunk/main/cppu/source/uno/data.cxx Modified: openoffice/trunk/main/cppu/source/uno/data.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/cppu/source/uno/data.cxx?rev=1716484=1716483=1716484=diff == --- openoffice/trunk/main/cppu/source/uno/data.cxx (original) +++ openoffice/trunk/main/cppu/source/uno/data.cxx Wed Nov 25 16:55:51 2015 @@ -356,8 +356,8 @@ sal_Bool SAL_CALL uno_type_isAssignableF #endif #if defined(INTEL) \ -&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2)) || defined(MACOSX) \ -|| defined(__SUNPRO_CC) && defined(SOLARIS)) +&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) \ +|| defined(OS2)) || defined(MACOSX) || defined(SOLARIS)) #define MAX_ALIGNMENT_4 #endif
svn commit: r1716498 - /openoffice/trunk/main/basebmp/source/makefile.mk
Author: pfg Date: Wed Nov 25 17:29:09 2015 New Revision: 1716498 URL: http://svn.apache.org/viewvc?rev=1716498=rev Log: i125362 - Illumos port: consider GCC for some Sun Studio specifics Patch by: Alexander Pyhalov Modified: openoffice/trunk/main/basebmp/source/makefile.mk Modified: openoffice/trunk/main/basebmp/source/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/trunk/main/basebmp/source/makefile.mk?rev=1716498=1716497=1716498=diff == --- openoffice/trunk/main/basebmp/source/makefile.mk (original) +++ openoffice/trunk/main/basebmp/source/makefile.mk Wed Nov 25 17:29:09 2015 @@ -51,7 +51,7 @@ CDEFS+= -DBASEBMP_NO_NESTED_TEMPLATE_PAR # SunStudio 12 (-m64 and -m32 modes): three test cases of the unit tests fail # if compiled with default -xalias_level (and optimization level -xO3) -.IF "$(OS)"=="SOLARIS" +.IF "$(OS)"=="SOLARIS" && "$(COM)"!="GCC" # For Sun Studio 8 this switch does not work: compilation fails on bitmapdevice.cxx .IF "$(CCNUMVER)"!="00050005" CDEFS+=-xalias_level=compatible
svn commit: r1716482 - in /openoffice/trunk/main: comphelper/inc/comphelper/locale.hxx connectivity/source/drivers/odbcbase/ODriver.cxx
Author: pfg
Date: Wed Nov 25 16:47:34 2015
New Revision: 1716482
URL: http://svn.apache.org/viewvc?rev=1716482=rev
Log:
i125369 - Illumos port: avoid some redefinitions
In the case of the Illumos/Solaris-i386 port there are some
conflicts caused by internal C definitions. Try to work them
out with some help of Illumos' opengrok.
On the case of the odbcbase driver rename the affected typedef
to avoid conflicts.
Modified:
openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx
openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx
Modified: openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx?rev=1716482=1716481=1716482=diff
==
--- openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx (original)
+++ openoffice/trunk/main/comphelper/inc/comphelper/locale.hxx Wed Nov 25
16:47:34 2015
@@ -31,6 +31,14 @@
#include
#include "comphelper/comphelperdllapi.h"
+// These are specified by i386 ABI suppl. but
+// only affect Solaris i386/illumos so far.
+
+#if !defined(_XPG4_2) || defined(__EXTENSIONS__)
+#undef CS
+#undef ES
+#endif
+
//___
// namespace
Modified: openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx?rev=1716482=1716481=1716482=diff
==
--- openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx
(original)
+++ openoffice/trunk/main/connectivity/source/drivers/odbcbase/ODriver.cxx Wed
Nov 25 16:47:34 2015
@@ -69,11 +69,11 @@ rtl::OUString ODBCDriver::getImplementat
// Please take care when changing it.
}
-typedef Sequence< ::rtl::OUString > SS;
+typedef Sequence< ::rtl::OUString > SSEQ;
//--
-SS ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
+SSEQ ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{
- SS aSNS( 1 );
+ SSEQ aSNS( 1 );
aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver");
return aSNS;
}
@@ -87,7 +87,7 @@ SS ODBCDriver::getSupportedServiceNames_
//--
sal_Bool SAL_CALL ODBCDriver::supportsService( const ::rtl::OUString&
_rServiceName ) throw(RuntimeException)
{
- SS aSupported(getSupportedServiceNames());
+ SSEQ aSupported(getSupportedServiceNames());
const ::rtl::OUString* pSupported = aSupported.getConstArray();
const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
for (;pSupported != pEnd && !pSupported->equals(_rServiceName);
++pSupported)
@@ -97,7 +97,7 @@ sal_Bool SAL_CALL ODBCDriver::supportsSe
}
//--
-SS SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException)
+SSEQ SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException)
{
return getSupportedServiceNames_Static();
}
svn commit: r1716505 - /openoffice/trunk/main/configure.ac
Author: pfg
Date: Wed Nov 25 18:17:03 2015
New Revision: 1716505
URL: http://svn.apache.org/viewvc?rev=1716505=rev
Log:
i123682 - configure should use $GREP, $EGREP to work well on Solaris
Since we already spend some time detecting GREP and EGREP it seems
good to use it always. Tested on FreeBSD.
Modified:
openoffice/trunk/main/configure.ac
Modified: openoffice/trunk/main/configure.ac
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1716505=1716504=1716505=diff
==
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Wed Nov 25 18:17:03 2015
@@ -1011,9 +1011,9 @@ AC_SUBST(_solenv)
if test -e $_solenv/inc/minor.mk; then
# Get UPD number from ./solenv/inc/minor.mk
- UPD="`grep RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
+ UPD="`$GREP RSCVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`"
AC_SUBST(UPD)
- SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{
print $2 }'`"
+ SOURCEVERSION="`$GREP SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{
print $2 }'`"
AC_SUBST(SOURCEVERSION)
else
AC_MSG_ERROR([$_solenv/inc/minor.mk missing but needed for architecture/os
detecion and proper environment script generation...])
@@ -1051,7 +1051,7 @@ if test "$build" != "$host" -o "$build"
echo "cross-compiling by any means is not supported (yet)!" >> warn
fi
-if echo "$build_os" | grep cygwin; then
+if echo "$build_os" | $GREP cygwin; then
AC_MSG_CHECKING([Cygwin version])
CygwinVer=`uname -r`
AC_MSG_RESULT([$CygwinVer])
@@ -1690,7 +1690,7 @@ fi
if test "$_os" = "FreeBSD"; then
FBSD_GCC_RPATH=
-if $CC --version 2>&1 | grep clang > /dev/null ; then
+if $CC --version 2>&1 | $GREP clang > /dev/null ; then
COM_IS=CLANG
else
COM_IS=GCC
@@ -1740,7 +1740,7 @@ if test \( "$_os" != "WINNT" -o "$WITH_M
fi
if test "$_os" = "SunOS"; then
AC_MSG_CHECKING([gcc linker])
- if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then
+ if $CC -Wl,--version 2>&1 |head -n 1| $GREP -v GNU > /dev/null;then
AC_MSG_ERROR([failed (not GNU ld). Use GNU ld instead of Sun ld on
Solaris])
fi
AC_MSG_RESULT([ok (GNU ld)])
@@ -1794,7 +1794,7 @@ dnl Search all the common names for GNU
dnl ===
AC_MSG_CHECKING([for GNU make])
for a in "$MAKE" $GNUMAKE make gmake gnumake; do
- $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null
+ $a --version 2> /dev/null | $GREP GNU 2>&1 > /dev/null
if test $? -eq 0; then
GNUMAKE=$a
break
@@ -1806,7 +1806,7 @@ if test -z "$GNUMAKE"; then
fi
AC_MSG_CHECKING([the GNU make version])
-_make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@
.*@@' -e 's@,.*@@'`;
+_make_version=`$GNUMAKE --version | $GREP GNU | $SED -e 's@^[[^0-9]]*@@' -e
's@ .*@@' -e 's@,.*@@'`;
_make_longver=`echo $_make_version | $AWK -F. '{ print \$1*1+\$2*100+\$3
}'`
if test "$_make_longver" -ge "038100" ; then
AC_MSG_RESULT([$GNUMAKE $_make_version])
@@ -1860,7 +1860,7 @@ else
# different
# This test _should_ work because the one accepts -V (ours) and one
# (the other) not...
-$DMAKE -V 2>/dev/null | grep -E 'dmake(.exe)? .* Version .*' >/dev/null
+$DMAKE -V 2>/dev/null | $GREP -E 'dmake(.exe)? .* Version .*' >/dev/null
if test $? -eq 0; then
BUILD_DMAKE=NO
AC_MSG_RESULT([yes])
@@ -1893,7 +1893,7 @@ dnl Search all the common names for GNU
dnl ===
AC_MSG_CHECKING([for GNU or compatible BSD tar])
for a in $GNUTAR gtar gnutar bsdtar tar; do
- $a --version 2> /dev/null | egrep "GNU|libarchive" 2>&1 > /dev/null
+ $a --version 2> /dev/null | $EGREP "GNU|libarchive" 2>&1 > /dev/null
if test $? -eq 0; then
GNUTAR=$a
break
@@ -1915,7 +1915,7 @@ if test "$_os" = "SunOS"; then
COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"`
AC_MSG_CHECKING([the SunStudio C/C++ compiler version])
dnl cc -V outputs to standard error
- _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'`
+ _sunstudio_string=`$CC -V 2>&1 | $GREP '^cc' | sed -e 's/.* C //'`
_sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'`
_sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'`
if test "$_sunstudio_major" != "5"; then
@@ -2126,7 +2126,7 @@ dnl The following find microsoft, m
AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32";
then
AC_MSG_RESULT([found.])
- if $CC -dumpspecs | grep -q "mno-cygwin"; then
+ if
svn commit: r1716508 - /openoffice/trunk/main/fpicker/source/office/OfficeFilePicker.cxx
Author: damjan
Date: Wed Nov 25 18:49:36 2015
New Revision: 1716508
URL: http://svn.apache.org/viewvc?rev=1716508=rev
Log:
#i96720# FilePicker: setDefaultName, setDefaultDirectory "broken"
Display the proposed filename even when the URL
specified for the file picker directory is invalid.
As the Win32 file picker sadly allows both paths and URLs
for directories, users try paths on other more
restrictive platforms, and since the file picker there
shows neither the directory nor the file, they wrongly
conclude both are broken.
Patch by: me
Modified:
openoffice/trunk/main/fpicker/source/office/OfficeFilePicker.cxx
Modified: openoffice/trunk/main/fpicker/source/office/OfficeFilePicker.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/office/OfficeFilePicker.cxx?rev=1716508=1716507=1716508=diff
==
--- openoffice/trunk/main/fpicker/source/office/OfficeFilePicker.cxx (original)
+++ openoffice/trunk/main/fpicker/source/office/OfficeFilePicker.cxx Wed Nov 25
18:49:36 2015
@@ -171,19 +171,29 @@ void SvtFilePicker::prepareExecute()
// --**-- doesn't match the spec yet
if ( m_aDisplayDirectory.getLength() > 0 || m_aDefaultName.getLength()
> 0 )
{
+ sal_Bool isFileSet = sal_False;
if ( m_aDisplayDirectory.getLength() > 0 )
{
- INetURLObject aPath( m_aDisplayDirectory );
+ INetURLObject aPath;
+ INetURLObject givenPath( m_aDisplayDirectory );
+ if (!givenPath.HasError())
+ aPath = givenPath;
+ else
+ {
+ INetURLObject aStdDirObj(
SvtPathOptions().GetWorkPath() );
+ aPath = aStdDirObj;
+ }
if ( m_aDefaultName.getLength() > 0 )
{
aPath.insertName( m_aDefaultName );
getDialog()->SetHasFilename( true );
}
String sPath = aPath.GetMainURL(
INetURLObject::NO_DECODE );
- getDialog()->SetPath( aPath.GetMainURL(
INetURLObject::NO_DECODE ) );
+ getDialog()->SetPath( sPath );
+ isFileSet = sal_True;
}
- else if ( m_aDefaultName.getLength() > 0 )
+ if ( !isFileSet && m_aDefaultName.getLength() > 0 )
{
getDialog()->SetPath( m_aDefaultName );
getDialog()->SetHasFilename( true );
svn commit: r1716553 - /openoffice/trunk/main/sal/osl/unx/backtrace.c
Author: pfg
Date: Wed Nov 25 22:08:04 2015
New Revision: 1716553
URL: http://svn.apache.org/viewvc?rev=1716553=rev
Log:
i66807 - Fix GCC warning in backtrace.c
The Bugzilla issue has another fix for sparc but I have no way ot test it.
Modified:
openoffice/trunk/main/sal/osl/unx/backtrace.c
Modified: openoffice/trunk/main/sal/osl/unx/backtrace.c
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/unx/backtrace.c?rev=1716553=1716552=1716553=diff
==
--- openoffice/trunk/main/sal/osl/unx/backtrace.c (original)
+++ openoffice/trunk/main/sal/osl/unx/backtrace.c Wed Nov 25 22:08:04 2015
@@ -184,15 +184,23 @@ void backtrace_symbols_fd( void **buffer
if ( dli.dli_fname && dli.dli_fbase )
{
offset = (ptrdiff_t)*pFramePtr -
(ptrdiff_t)dli.dli_fbase;
+#if defined X86_64
+ fprintf( fp, "%s+0x%lx", dli.dli_fname,
offset );
+#else
fprintf( fp, "%s+0x%x", dli.dli_fname,
offset );
+#endif
}
if ( dli.dli_sname && dli.dli_saddr )
{
offset = (ptrdiff_t)*pFramePtr -
(ptrdiff_t)dli.dli_saddr;
+#if defined X86_64
+ fprintf( fp, "(%s+0x%lx)",
dli.dli_sname, offset );
+#else
fprintf( fp, "(%s+0x%x)",
dli.dli_sname, offset );
+#endif
}
}
- fprintf( fp, "[0x%x]\n", *pFramePtr );
+ fprintf( fp, "[0x%p]\n", *pFramePtr );
}
fflush( fp );
fclose( fp );
buildbot success in ASF Buildbot on openoffice-linux64-rat-aoo410
The Buildbot has detected a passing build on builder openoffice-linux64-rat-aoo410 while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat-aoo410/builds/137 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat-aoo410' triggered this build Build Source Stamp: [branch openoffice/branches/AOO410] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
svn commit: r1716551 - in /openoffice/trunk/main: bridges/prj/build.lst desktop/source/deployment/misc/dp_platform.cxx
Author: pfg
Date: Wed Nov 25 21:52:49 2015
New Revision: 1716551
URL: http://svn.apache.org/viewvc?rev=1716551=rev
Log:
i126615 - Allow build of Open Office on FreeBSD Mac PowerPCG5
These appear to have been missed from r1608245.
Brave attempt by: Curtis Hamilton
Modified:
openoffice/trunk/main/bridges/prj/build.lst
openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx
Modified: openoffice/trunk/main/bridges/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/bridges/prj/build.lst?rev=1716551=1716550=1716551=diff
==
--- openoffice/trunk/main/bridges/prj/build.lst (original)
+++ openoffice/trunk/main/bridges/prj/build.lst Wed Nov 25 21:52:49 2015
@@ -9,6 +9,8 @@ br bridges\source\cpp_uno\gcc3_os2_intel
br bridges\source\cpp_uno\gcc3_freebsd_intel nmake - u
br_gcc3fi br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_x86-64nmake - u
br_gcc3lx br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_freebsd_x86-64 nmake - u
br_gcc3fx br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc nmake - u
br_gcc3fp br_cppuno_shared br_unotypes br_inc NULL
+br bridges\source\cpp_uno\gcc3_freebsd_powerpc64 nmake - u
br_gcc3fp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc nmake - u
br_gcc3lp br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_powerpc64 nmake - u
br_gcc3lp_64 br_cppuno_shared br_unotypes br_inc NULL
br bridges\source\cpp_uno\gcc3_linux_mips nmake - u
br_gcc3lmips br_cppuno_shared br_unotypes br_inc NULL
Modified: openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx?rev=1716551=1716550=1716551=diff
==
--- openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx
(original)
+++ openoffice/trunk/main/desktop/source/deployment/misc/dp_platform.cxx Wed
Nov 25 21:52:49 2015
@@ -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_POWERPC"freebsd_powerpc"
#define PLATFORM_FREEBSD_X86"freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
#define PLATFORM_MACOSX_X86 "macosx_x86"
@@ -164,6 +165,8 @@ namespace
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC64"));
else if (token.equals(OUSTR(PLATFORM_SOLARIS_X86)))
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("x86"));
+else if (token.equals(OUSTR(PLATFORM_FREEBSD_POWERPC)))
+ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("PowerPC"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86)))
ret = checkOSandCPU(OUSTR("FreeBSD"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86_64)))
buildbot success in ASF Buildbot on openoffice-fbsd-nightly
The Buildbot has detected a passing build on builder openoffice-fbsd-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-fbsd-nightly/builds/143 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-fbsd2_64bit Build Reason: The Nightly scheduler named 'openoffice-fbsd-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-nightly
The Buildbot has detected a passing build on builder openoffice-linux64-nightly while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-nightly/builds/152 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-nightly' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
buildbot success in ASF Buildbot on openoffice-linux64-rat
The Buildbot has detected a passing build on builder openoffice-linux64-rat while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/openoffice-linux64-rat/builds/141 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: tethys_ubuntu Build Reason: The Nightly scheduler named 'openoffice-linux64-rat' triggered this build Build Source Stamp: [branch openoffice/trunk] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
