packages: libreoffice/libreoffice.spec, libreoffice/libreoffice-3.3.2-bison...

[arekm]

Author: arekm                        Date: Wed Jun 15 07:42:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix build with bison 2.5

---- Files affected:
packages/libreoffice:
   libreoffice.spec (1.894 -> 1.895) , libreoffice-3.3.2-bison25.diff (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libreoffice/libreoffice.spec
diff -u packages/libreoffice/libreoffice.spec:1.894 packages/libreoffice/libreoffice.spec:1.895
--- packages/libreoffice/libreoffice.spec:1.894	Sun Mar 27 21:59:18 2011
+++ packages/libreoffice/libreoffice.spec	Wed Jun 15 09:42:03 2011
@@ -156,6 +156,7 @@
 Patch100:	%{name}-hotfix-with-lang-all.patch
 Patch101:	%{name}-hotfix-kde4.patch
 Patch102:	%{name}-impress-dont-exit-after-pps-autoplay.patch
+Patch103:	%{name}-3.3.2-bison25.diff
 URL:		http://www.documentfoundation.org/
 BuildRequires:	/usr/bin/getopt
 BuildRequires:	GConf2-devel
@@ -375,8 +376,8 @@
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:	cups-lib
 Requires:	fonts-TTF-OpenSymbol
-%{?with_system_hsqldb:Requires:	java-hsqldb}
 %{?with_system_beanshell:Requires:	java-beanshell}
+%{?with_system_hsqldb:Requires:	java-hsqldb}
 Requires:	libstdc++ >= 5:3.2.1
 Requires:	mktemp
 Requires:	saxon
@@ -417,8 +418,8 @@
 Obsoletes:	openoffice.org-i18n-fo
 Obsoletes:	openoffice.org-i18n-fo-gtk
 Obsoletes:	openoffice.org-i18n-fo-kde
-Obsoletes:	openoffice.org-i18n-gu_IN
 Obsoletes:	openoffice.org-i18n-gd
+Obsoletes:	openoffice.org-i18n-gu_IN
 Obsoletes:	openoffice.org-i18n-ia
 Obsoletes:	openoffice.org-i18n-ia-gtk
 Obsoletes:	openoffice.org-i18n-ia-kde
@@ -442,8 +443,8 @@
 Obsoletes:	openoffice.org-i18n-ro-gtk
 Obsoletes:	openoffice.org-i18n-ro-kde
 Obsoletes:	openoffice.org-i18n-sc
-Obsoletes:	openoffice.org-i18n-sx
 Obsoletes:	openoffice.org-i18n-sw
+Obsoletes:	openoffice.org-i18n-sx
 Obsoletes:	openoffice.org-i18n-ti
 Obsoletes:	openoffice.org-i18n-ur
 Obsoletes:	openoffice.org-libs < 1:2.1.0-0.m6.0.11
@@ -460,8 +461,8 @@
 Group:		Libraries
 Requires:	%{name}-core = %{version}-%{release}
 Requires:	python
-Obsoletes:	openoffice.org-pyuno
 Provides:	pyuno
+Obsoletes:	openoffice.org-pyuno
 
 %description pyuno
 Cool Python bindings for the LibreOffice UNO component model. Allows
@@ -2490,6 +2491,7 @@
 ln -s %{PATCH100} patches/hotfixes/%{basename:%{PATCH100}}.diff
 ln -s %{PATCH101} patches/hotfixes/%{basename:%{PATCH101}}.diff
 ln -s %{PATCH102} patches/hotfixes/%{basename:%{PATCH102}}.diff
+ln -s %{PATCH103} patches/hotfixes/%{basename:%{PATCH103}}.diff
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
@@ -4238,6 +4240,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.895  2011/06/15 07:42:03  arekm
+- fix build with bison 2.5
+
 Revision 1.894  2011/03/27 19:59:18  megabajt
 - enable parallelbuild by default
 

================================================================
Index: packages/libreoffice/libreoffice-3.3.2-bison25.diff
diff -u /dev/null packages/libreoffice/libreoffice-3.3.2-bison25.diff:1.1
--- /dev/null	Wed Jun 15 09:42:09 2011
+++ packages/libreoffice/libreoffice-3.3.2-bison25.diff	Wed Jun 15 09:42:03 2011
@@ -0,0 +1,23 @@
+--- connectivity/source/parse/sqlbison.y	2011-05-20 13:21:02.000000000 -0600
++++ connectivity/source/parse/sqlbison.y	2011-05-20 13:22:11.000000000 -0600
+@@ -4338,7 +4338,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------
+-void OSQLParser::error(sal_Char *fmt)
++void OSQLParser::error(const sal_Char *fmt)
+ {
+ 	if(!m_sErrorMessage.getLength())
+ 	{
+--- connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:58.000000000 -0600
++++ connectivity/inc/connectivity/sqlparse.hxx	2011-05-20 13:23:46.000000000 -0600
+@@ -233,7 +233,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);
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libreoffice/libreoffice.spec?r1=1.894&r2=1.895&f=u