[Libreoffice-commits] .: 4 commits - android/qa configure.in fontconfig/fontconfig-2.8.0.patch freetype/freetype-2.4.8.patch vcl/Library_vcl.mk vcl/null

[Tor Lillqvist]

 android/qa/sc/Makefile            |    1 +
 configure.in                      |   16 ++++++++++++----
 fontconfig/fontconfig-2.8.0.patch |    9 +++++++++
 freetype/freetype-2.4.8.patch     |    9 +++++++++
 vcl/Library_vcl.mk                |    8 ++++++++
 vcl/null/printerinfomanager.cxx   |   19 +++++++++++++++++++
 6 files changed, 58 insertions(+), 4 deletions(-)

New commits:
commit c5b502664156db0b252c26054eb1047aec469175
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 5 17:51:09 2012 +0200

    Add some more stuff to the Android libvcl

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f18c18f..4b153f0 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -437,9 +437,17 @@ $(eval $(call gb_Library_add_defs,vcl,\
     -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
 ))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
+    vcl/generic/fontmanager/fontcache \
+    vcl/generic/fontmanager/fontconfig \
+    vcl/generic/fontmanager/fontmanager \
     vcl/unx/generic/plugadapt/salplug \
+    vcl/unx/generic/printer/ppdparser \
     vcl/null/printerinfomanager \
 ))
+$(eval $(call gb_Library_use_externals,vcl,\
+	fontconfig \
+	freetype \
+))
 endif
 
 ifeq ($(GUIBASE),cocoatouch)
diff --git a/vcl/null/printerinfomanager.cxx b/vcl/null/printerinfomanager.cxx
index 964a19d..934f277 100644
--- a/vcl/null/printerinfomanager.cxx
+++ b/vcl/null/printerinfomanager.cxx
@@ -39,6 +39,14 @@ using ::rtl::OString;
 using ::rtl::OStringToOUString;
 using ::rtl::OUStringHash;
 
+PrinterInfoManager& PrinterInfoManager::get()
+{
+    SalData* pSalData = GetSalData();
+    if( ! pSalData->m_pPIManager )
+        pSalData->m_pPIManager = new PrinterInfoManager();
+    return *pSalData->m_pPIManager;
+}
+
 void PrinterInfoManager::release()
 {
     SalData* pSalData = GetSalData();
@@ -46,4 +54,15 @@ void PrinterInfoManager::release()
     pSalData->m_pPIManager = NULL;
 }
 
+PrinterInfoManager::PrinterInfoManager( Type eType ) :
+    m_pQueueInfo( NULL ),
+    m_eType( eType ),
+    m_bUseIncludeFeature( false ),
+    m_bUseJobPatch( true ),
+    m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ),
+    m_bDisableCUPS( false )
+{
+    initSystemDefaultPaper();
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 01d7c6a24b7a8244a3ae5816e39d3358242a35ea
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 5 17:36:21 2012 +0200

    Set FONTCONFIG_LIBS and FREETYPE_LIBS for the internal case (for Android)

diff --git a/configure.in b/configure.in
index b7b255a..2683a32 100644
--- a/configure.in
+++ b/configure.in
@@ -3115,13 +3115,15 @@ if test "$test_cups" = "yes"; then
 fi
 
 
-# check for fontconfig support
-AC_MSG_CHECKING([whether we need fontconfig])
+# fontconfig checks
 if test "z$test_fontconfig" = "zyes"; then
-    AC_MSG_RESULT([yes])
     PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
 else
-    AC_MSG_RESULT([no])
+    case "$BUILD_TYPE" in
+    *FONTCONFIG*)
+        FONTCONFIG_LIBS="-lfontconfig"
+        ;;
+    esac
 fi
 AC_SUBST(FONTCONFIG_CFLAGS)
 AC_SUBST(FONTCONFIG_LIBS)
@@ -5451,6 +5453,12 @@ dnl ===================================================================
 if test  "$test_freetype" = "yes"; then
     AC_MSG_CHECKING([whether freetype is available])
     PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 )
+else
+    case "$BUILD_TYPE" in
+    *FREETYPE*)
+        FREETYPE_LIBS="-lfreetype"
+        ;;
+    esac
 fi
 AC_SUBST(FREETYPE_CFLAGS)
 AC_SUBST(FREETYPE_LIBS)
commit c8bab278bb2ee9b27b5e8181100cb23dcf5a975c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 5 13:08:42 2012 +0200

    Don't use soname, Android doesn't support that

diff --git a/fontconfig/fontconfig-2.8.0.patch b/fontconfig/fontconfig-2.8.0.patch
index 5b5cdce..2185d2e 100644
--- a/fontconfig/fontconfig-2.8.0.patch
+++ b/fontconfig/fontconfig-2.8.0.patch
@@ -20,6 +20,15 @@
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 --- misc/build/fontconfig-2.8.0/configure
 +++ misc/build/fontconfig-2.8.0/configure
+@@ -8718,7 +8718,7 @@
+ 	*Sun\ F*)			# Sun Fortran 8.3
+ 	  tmp_sharedflag='-G' ;;
+ 	esac
+-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
+ 
+         if test "x$supports_anon_versioning" = xyes; then
+           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 @@ -14073,7 +14073,7 @@
  		no)
  			;;
diff --git a/freetype/freetype-2.4.8.patch b/freetype/freetype-2.4.8.patch
index 0318919..9ae69a3 100644
--- a/freetype/freetype-2.4.8.patch
+++ b/freetype/freetype-2.4.8.patch
@@ -9,3 +9,12 @@
  else
    case "$host" in
    *-dec-osf*)
+@@ -10039,7 +10039,7 @@
+ 	*Sun\ F*)			# Sun Fortran 8.3
+ 	  tmp_sharedflag='-G' ;;
+ 	esac
+-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags -o $lib'
+ 
+         if test "x$supports_anon_versioning" = xyes; then
+           archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
commit d49cdfddf8514eb1d63b589af70b456524eb0e0b
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 5 11:47:32 2012 +0200

    Need the basebmp library

diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile
index 582784d..450b7ed 100644
--- a/android/qa/sc/Makefile
+++ b/android/qa/sc/Makefile
@@ -56,6 +56,7 @@ copy-stuff:
 #
 	for F in $(strip \
 		  avmedialo \
+		  basebmplo \
 		  basegfxlo \
 		  bootstrap.uno \
 		  canvastoolslo \