diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-07-01 04:58:03 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-07-01 04:58:03 +0000 |
| commit | 76400556d9e8a5dedc692487c13b76a541813a23 (patch) | |
| tree | fb8b06b7dea0e79577a77e3748ed551d9ac1b34b /extra/libreoffice | |
| parent | 64e72407414ce0badfb541782125cd8e3a25c12e (diff) | |
Fri Jul 1 04:58:02 UTC 2011
Diffstat (limited to 'extra/libreoffice')
| -rw-r--r-- | extra/libreoffice/buildfix_bison25.diff | 23 | ||||
| -rw-r--r-- | extra/libreoffice/buildfix_i116795.diff | 22 |
2 files changed, 0 insertions, 45 deletions
diff --git a/extra/libreoffice/buildfix_bison25.diff b/extra/libreoffice/buildfix_bison25.diff deleted file mode 100644 index 869b6c81e..000000000 --- a/extra/libreoffice/buildfix_bison25.diff +++ /dev/null @@ -1,23 +0,0 @@ ---- 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); - diff --git a/extra/libreoffice/buildfix_i116795.diff b/extra/libreoffice/buildfix_i116795.diff deleted file mode 100644 index 8601bc164..000000000 --- a/extra/libreoffice/buildfix_i116795.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -r 4ab9e11cb892 connectivity/qa/makefile.mk ---- a/connectivity/qa/makefile.mk Thu Mar 03 15:22:23 2011 +0100 -+++ b/connectivity/qa/makefile.mk Fri Mar 04 09:51:48 2011 +0100 -@@ -35,9 +35,16 @@ - - #----- compile .java files ----------------------------------------- - --JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar hsqldb.jar - JAVAFILES := $(shell @$(FIND) complex -name "*.java") - -+JARFILES = ridl.jar unoil.jar jurt.jar juh.jar java_uno.jar OOoRunner.jar -+ -+.IF "$(SYSTEM_HSQLDB)" == "YES" -+EXTRAJARFILES = $(HSQLDB_JAR) -+.ELSE -+JARFILES += hsqldb.jar -+.ENDIF -+ - #----- make a jar from compiled files ------------------------------ - - JARCLASSDIRS = $(PACKAGE) - |