diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-22 19:50:57 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-22 19:50:57 -0300 |
| commit | 905d4583b1cbf6ee0bca36a3c8bebf6552b4cf38 (patch) | |
| tree | 5fd8029ea3111abb99c3218600d9490213dd005b /testing/libreoffice | |
| parent | 2592adab23ef6c7a48fcc14d03a383f4e3447597 (diff) | |
| parent | af2856e0d38cdb398d6a3f0d9f48baf279525778 (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el
Diffstat (limited to 'testing/libreoffice')
| -rw-r--r-- | testing/libreoffice/PKGBUILD | 2 | ||||
| -rw-r--r-- | testing/libreoffice/buildfix_bison25.diff | 23 | ||||
| -rw-r--r-- | testing/libreoffice/buildfix_i116795.diff | 22 |
3 files changed, 46 insertions, 1 deletions
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD index 7ffa3b42e..764713443 100644 --- a/testing/libreoffice/PKGBUILD +++ b/testing/libreoffice/PKGBUILD @@ -27,7 +27,7 @@ pkgname=('libreoffice' 'libreoffice-sdk' _LOver=3.4.1.1 pkgver=3.4.1rc1 pkgrel=1 -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') diff --git a/testing/libreoffice/buildfix_bison25.diff b/testing/libreoffice/buildfix_bison25.diff new file mode 100644 index 000000000..869b6c81e --- /dev/null +++ b/testing/libreoffice/buildfix_bison25.diff @@ -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); + diff --git a/testing/libreoffice/buildfix_i116795.diff b/testing/libreoffice/buildfix_i116795.diff new file mode 100644 index 000000000..8601bc164 --- /dev/null +++ b/testing/libreoffice/buildfix_i116795.diff @@ -0,0 +1,22 @@ +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) + |