Hello community,
here is the log from the commit of package libreoffice-libs-core for
openSUSE:Factory
checked in at Mon Jul 11 15:38:00 CEST 2011.
--------
--- libreoffice-libs-core/libreoffice-libs-core.changes 2011-06-08
17:55:49.000000000 +0200
+++
/mounts/work_src_done/STABLE/libreoffice-libs-core/libreoffice-libs-core.changes
2011-07-08 11:19:37.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Jul 8 09:00:46 UTC 2011 - [email protected]
+
+- Apply libreoffice-libs-core-bison-2.5.patch on openSUSE >= 12.1
+ Fixes build with bison 2.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
libreoffice-libs-core-bison-2.5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libreoffice-libs-core.spec ++++++
--- /var/tmp/diff_new_pack.SwGRyX/_old 2011-07-11 15:37:02.000000000 +0200
+++ /var/tmp/diff_new_pack.SwGRyX/_new 2011-07-11 15:37:02.000000000 +0200
@@ -20,7 +20,7 @@
Name: libreoffice-libs-core
Version: 3.3.3.1
-Release: 1
+Release: 2
%define piece libs-core
%define ooo_build_version 3.3.3.1
%define ooo_piece_version 3.3.3.1
@@ -111,6 +111,8 @@
Source0: libreoffice-%piece-%ooo_piece_version.tar.bz2
# default to MS Office 97/2000/XP file formats on MeeGo; asked by HP
Patch900: officecfg-defaul-export-ms-file-formats.diff
+# Fix const-ness problem with bison 2.5
+Patch901: libreoffice-libs-core-bison-2.5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64 ppc
@@ -256,6 +258,10 @@
mkdir -p ooo-build/hotfixes
cp %{P:900} ooo-build/hotfixes
%endif
+%if 0%{?suse_version} >= 1210
+# Fix build with bison 2.5
+%patch901
+%endif
%build
# setup env.
++++++ libreoffice-libs-core-bison-2.5.patch ++++++
--- 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);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
