[arch-commits] Commit in libreoffice/trunk (PKGBUILD buildfix_bison25.diff)

[andyrtr at archlinux.org]

    Date: Sunday, May 22, 2011 @ 16:15:05
  Author: andyrtr
Revision: 124532

prepare 3.4 add buildfix for bison2.5

Added:
  libreoffice/trunk/buildfix_bison25.diff
Modified:
  libreoffice/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   18 ++++++++++--------
 buildfix_bison25.diff |   23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-22 19:17:25 UTC (rev 124531)
+++ PKGBUILD	2011-05-22 20:15:05 UTC (rev 124532)
@@ -17,7 +17,7 @@
 	'libreoffice-extension-presenter-screen'
 	'libreoffice-extension-presentation-minimizer'
 	'libreoffice-extension-report-builder'
-	'libreoffice-extension-scripting-beanshell'
+#	'libreoffice-extension-scripting-beanshell'
 	'libreoffice-extension-scripting-javascript'
 	'libreoffice-extension-scripting-python'
 	'libreoffice-extension-typo'
@@ -29,7 +29,7 @@
 pkgrel=1
 arch=('i686' 'x86_64')
 #_LO_tree="3.4"
-_OFFICEUPD="300"
+_OFFICEUPD="340"
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
@@ -93,7 +93,8 @@
 	buildfix_i116795.diff
 	buildfix_boost.diff
 	buildfix_ct2n.diff
-	vbahelper.visibility.patch)
+	vbahelper.visibility.patch
+	buildfix_bison25.diff)
 noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2
 	7a0dcb3fe1e8c7229ab4fb868b7325e6-mdds_0.5.2.tar.bz2
@@ -193,7 +194,9 @@
          '0520d63c946e272ed3bdfc863fbdc42e'
          'bc228237108cab7745897a9f466b6d39'
          'eee273f501ff45dc5f1365e78c6d57c0'
-         '43b145db28e6c0d73578ae6fd35e510d')
+         '43b145db28e6c0d73578ae6fd35e510d'
+         '4fa96e04b41a6e86774e74a972024b3e')
+
 build() {
 
 	unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
@@ -220,6 +223,7 @@
 	patch -Np1 -i ${srcdir}/buildfix_boost.diff
 	patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
 	patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
+	patch -Np0 -i ${srcdir}/buildfix_bison25.diff
 	
 	# unset C(XX)FLAGS
 	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -233,9 +237,6 @@
 		esac
         ARCH_FLAGS="$ARCH_FLAGS $i"
 	done
-
-	# workaround for bison2.5
-#	export ARCH_FLAGS="$ARCH_FLAGS -fpermissive"
 	
 	# python2 fix
 	export PYTHON=python2
@@ -291,7 +292,7 @@
 		--enable-ext-presenter-console \
 		--enable-ext-presenter-minimizer \
 		--enable-ext-report-builder \
-		--enable-ext-scripting-beanshell \
+		--disable-ext-scripting-beanshell \
 		--enable-ext-scripting-javascript \
 		--enable-ext-scripting-python \
 		--enable-ext-typo \
@@ -408,6 +409,7 @@
 	done
 	# remove version in menu entry and make it visible
 	sed -i -e "s/3.4//g" ${pkgdir}/usr/share/applications/*.desktop
+	sed -i -e "s/Icon=libreoffice34-/Icon=/g" ${pkgdir}/usr/share/applications/*.desktop
 	sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
 	echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
 	# remove unneeded .desktop files

Added: buildfix_bison25.diff
===================================================================
--- buildfix_bison25.diff	                        (rev 0)
+++ buildfix_bison25.diff	2011-05-22 20:15:05 UTC (rev 124532)
@@ -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);
+