[Libreoffice-commits] .: 5 commits - android/qa fontconfig/fontconfig-2.8.0.patch

[Tor Lillqvist]

 android/qa/sc/Makefile            |   16 +++++++++++-----
 android/qa/sc/fonts.conf          |    8 ++++++--
 fontconfig/fontconfig-2.8.0.patch |    2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

New commits:
commit 81301aae9699472bd4e491755c8ee76920711b01
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 13 01:27:37 2012 +0200

    More workarounds for weird problem with vnd.sun.star.expand

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 738d101..1b9ac87 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -133,20 +133,23 @@ copy-stuff:
 	mkdir -p assets/bin assets/lib assets/xml/ure
 	cp $(OUTDIR)/bin/udkapi.rdb assets/bin
 	cp $(OUTDIR)/bin/types.rdb assets/bin
-	cp $(OUTDIR)/xml/ure/services.rdb assets/xml/ure
 # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it expands to empty!?
 # So just hardcode the known APP_DATA_PATH for now...
+# Ditto for URE_INTERNAL_LIB_DIR
+	for F in xml/ure/services; do \
+		sed -e 's!uri="vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/$$F.rdb >assets/$$F.rdb; \
+	done
 	for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx unoxml/source/service/unoxml configmgr/source/configmgr; do \
 		mkdir -p assets/ComponentTarget/`dirname $$F`; \
-	        sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!' <$(WORKDIR)/ComponentTarget/$$F.component >assets/ComponentTarget/$$F.component; \
+	        sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(WORKDIR)/ComponentTarget/$$F.component >assets/ComponentTarget/$$F.component; \
 	done
 	for F in ucb1 ucpfile1; do \
-		sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!' <$(OUTDIR)/xml/$$F.component > assets/xml/$$F.component; \
+		sed -e 's!uri="vnd.sun.star.expand:$$LO_LIB_DIR/!uri="$(APP_DATA_PATH)/lib/!g' <$(OUTDIR)/xml/$$F.component >assets/xml/$$F.component; \
 	done
-	cp -R $(OUTDIR)/xml/registry assets/xml
 	for F in uno_services uno_types; do \
 		sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$$F.rdb >assets/lib/$$F.rdb; \
 	done
+	cp -R $(OUTDIR)/xml/registry assets/xml
 # Then assets that are unpacked at run-time into the app's data directory.
 	mkdir -p assets/unpack/bin
 	for F in $(OUTDIR)/bin/*.res; do \
commit f7392b334aa95e0896c9dd88bd74c92bc7e8b183
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 13 00:41:12 2012 +0200

    Fontconfig must have a cachedir, so hardcode one for now

diff --git a/android/qa/sc/fonts.conf b/android/qa/sc/fonts.conf
index 73e8a35..0eb05a2 100644
--- a/android/qa/sc/fonts.conf
+++ b/android/qa/sc/fonts.conf
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/fonts.conf file to configure system font access -->
 <fontconfig>
@@ -50,7 +50,11 @@
 
 <!-- Font cache directory list -->
 
-        <!-- NO THANKS -->
+	<!-- Yeah this hardcoding is wrong of course, will have to fix
+	     later to patch in proper code in fontonfig on Android to
+	     find out a good place.
+	-->
+	<cachedir>/data/data/org.libreoffice.android.qa.sc/fontconfig</cachedir>
 
 	<config>
 <!--
commit 6e3457da7c95b8a36c4a9fb904bfc12129c98c80
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 13 00:40:44 2012 +0200

    Just tell to run it with "make run"

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index da85f08..738d101 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -167,7 +167,7 @@ build-ant: copy-stuff
 install: copy-stuff
 	unset JAVA_HOME && ant debug install
 	@echo
-	@echo 'Run it with something like what "make run" does (see Makefile)'
+	@echo 'Run it with "make run"'
 	@echo
 
 uninstall:
commit fe8cd7dba06786923ced29f46e9ee04e7de8240b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Jan 13 00:39:49 2012 +0200

    We now proceed further and need some more libraries

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 3a9faad..da85f08 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -85,6 +85,8 @@ copy-stuff:
 		  jvmfwk \
 		  lnglo \
 		  localedata_en \
+		  localedata_es \
+		  localedata_euro \
 		  localedata_others \
 		  msfilterlo \
 		  reg \
@@ -92,6 +94,7 @@ copy-stuff:
 		  sblo \
 		  sfxlo \
 		  sotlo \
+		  stocservices.uno \
 		  store \
 		  svllo \
 		  svtlo \
commit 201ade87705c36ce436da8661fb37afd5e064dac
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 12 22:20:38 2012 +0200

    Must use the "ascii" version of our expat build with fontconfig
    
    Sigh, spent one day, more or less, tracking down a weird fontconfig
    problem, where all the diagnostic it offered was "unknown encoding"
    when reading the fonts.conf file.
    
    It turned out that I was being screwed by our fun two versions of the
    expat_xmlparse library: One where XML_Char is char and one where it is
    short. The intuitively "more normally" named libexpat_xmlparse is the
    latter, but fontconfig works only with the former as it implicitly
    expects XML_Char to be char.

diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch
index 2185d2e..79d7c3e 100644
--- a/fontconfig/fontconfig-2.8.0.patch
+++ b/fontconfig/fontconfig-2.8.0.patch
@@ -34,7 +34,7 @@
  			;;
  		*)
 -			EXPAT_LIBS="-L$expat_lib -lexpat"
-+			EXPAT_LIBS="-L$expat_lib -lexpat_xmlparse -lexpat_xmltok"
++			EXPAT_LIBS="-L$expat_lib -lascii_expat_xmlparse -lexpat_xmltok"
  			;;
  		esac