OO 3.3.0 fails to build "connectivity" module on amd64 9-STABLE

[Maho NAKATA]

Hi

Looks good. Please commit following patch! thank you!

Best,
 Nakata Maho

From: Don Lewis <truckman at FreeBSD.org>
Subject: Re: OO 3.3.0 fails to build "connectivity" module on amd64 9-STABLE
Date: Mon, 13 Feb 2012 22:32:42 -0800 (PST)

> On 10 Feb, Maho NAKATA wrote:
>> Hi
>> 
>> I also reproduced, and pointy hat, either.
>> It looks like ooo port is broken again...
>> 
>> Thanks
>>  Nakata Maho
>> 
>> From: Lawrence Stewart <lstewart at freebsd.org>
>> Subject: OO 3.3.0 fails to build "connectivity" module on amd64 9-STABLE
>> Date: Thu, 09 Feb 2012 16:42:30 +1100
>> 
>>> Hi,
>>> 
>>> The OO 3.3.0 build fails in the "connectivity" module with the
>>> following error:
>>> 
>>>> Compiling: connectivity/source/parse/wrap_sqlbison.cxx
>>>> c++ -fmessage-length=0 -c -O2 -fno-strict-aliasing -DENABLE_LAYOUT=0
>>>> -DENABLE_LAYOUT_EXPERIMENTAL=0 -fvisibility=hidden
>>>> -I. -I../../unxfbsdx.pro/misc -I../../unxfbsdx.pro/inc/sql -I../inc
>>>> -I../../inc/pch -I../../inc -I../../unx/inc -I../../unxfbsdx.pro/inc
>>>> -I. -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solver/330/unxfbsdx.pro/inc/stl
>>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solver/330/unxfbsdx.pro/inc/external
>>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solver/330/unxfbsdx.pro/inc
>>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solenv/unxfbsdx/inc
>>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solenv/inc
>>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/res
>>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solver/330/unxfbsdx.pro/inc/stl
>>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solenv/inc/Xp31
>>>> -I/usr/local/diablo-jdk1.6.0/include
>>>> -I/usr/local/diablo-jdk1.6.0/include/freebsd
>>>> -I/usr/local/diablo-jdk1.6.0/i
>>> nclude/bs
>>> d -I/usr/local/diablo-jdk1.6.0/include/linux
>>> -I/usr/local/diablo-jdk1.6.0/include/native_threads/include
>>> -I/usr/local/include
>>> -I/usr/ports/editors/openoffice.org-3/work/OOO330_m20/solver/330/unxfbsdx.pro/inc/offuh
>>> -I. -I../../res -I. -pipe -fvisibility-inlines-hidden -g1 -Wall
>>> -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy
>>> -Wno-non-virtual-dtor -fpic -DFREEBSD -DUNX -DVCL -DGCC -DC341
>>> -DX86_64 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1
>>> -DSTLPORT_VERSION=400 -DHAVE_GCC_VISIBILITY_FEATURE -DX86_64 -D__DMAKE
>>> -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/c++/4.2
>>> -DSUPD=330 -DPRODUCT -DNDEBUG -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DCUI
>>> -DSOLAR_JAVA -DOOO_DLLIMPLEMENTATION_DBTOOLS -DSHAREDLIB -D_DLL_
>>> -fexceptions -fno-enforce-eh-specs -DEXCEPTIONS_ON -o
>>> ../../unxfbsdx.pro/slo/wrap_sqlbison.o
>>> /usr/ports/editors/openoffice.org-3/work/OOO330_m20/connectivity/source/parse/wrap_sqlbison.cxx
>>>> In file included from
>>>> /usr/ports/editors/openoffice.org-3/work/OOO330_m20/connectivity/source/parse/wrap_sqlbison.cxx:31:
>>>> ../../unxfbsdx.pro/misc/sqlbison.cxx: In function 'int SQLyyparse()':
>>>> ../../unxfbsdx.pro/misc/sqlbison.cxx:7813: error: invalid conversion
>>>> from 'const char*' to 'sal_Char*'
>>>> ../../unxfbsdx.pro/misc/sqlbison.cxx:7813: error: initializing
>>>> argument 1 of 'void connectivity::OSQLParser::error(sal_Char*)'
>>>> dmake: Error code 1, while making
>>>> '../../unxfbsdx.pro/slo/wrap_sqlbison.obj'
>>> 
> 
>>> Any thoughts on how to fix?
> 
> 
> This patch worked for me.  Put it under editors/openoffice.org-3/files.
> 
> --- connectivity/source/parse/sqlbison.y.orig	2011-01-18 05:32:30.000000000 -0800
> +++ connectivity/source/parse/sqlbison.y	2012-02-13 14:03:12.000000000 -0800
> @@ -4334,7 +4334,7 @@
>  }
>  
>  // -------------------------------------------------------------------------
> -void OSQLParser::error(sal_Char *fmt)
> +void OSQLParser::error(const sal_Char *fmt)
>  {
>  	if(!m_sErrorMessage.getLength())
>  	{
> --- connectivity/inc/connectivity/sqlparse.hxx.orig	2011-01-18 05:32:29.000000000 -0800
> +++ connectivity/inc/connectivity/sqlparse.hxx	2012-02-13 17:06:06.000000000 -0800
> @@ -232,7 +232,7 @@
>          // returns the type for a parameter in a given function name
>          static sal_Int32 getFunctionParameterType(sal_uInt32 _nTokenId,sal_uInt32 _nPos);
>  
> -		void error(sal_Char *fmt);
> +		void error(const sal_Char *fmt);
>  		int SQLlex();
>  #ifdef YYBISON
>  		void setParseTree(OSQLParseNode * pNewParseTree);
>