RepositoryExternal.mk | 6 +++
config_host.mk.in | 3 +
configure.in | 64 ++++++++++++++++++++++++---------
vcl/generic/fontmanager/fontconfig.cxx | 8 ++--
4 files changed, 61 insertions(+), 20 deletions(-)
New commits:
commit 2b021c047c03645a47aacf405cc8f2992ae57186
Author: Rene Engelhard <r...@debian.org>
Date: Tue Sep 11 13:41:44 2012 +0200
add AC_ARG_ENABLE for packagekit; remove "auto font install" from dbus
Change-Id: I973bc94569559a65484d359fe153bc6a53bbd848
diff --git a/configure.in b/configure.in
index 7eb2e67..b30327c 100644
--- a/configure.in
+++ b/configure.in
@@ -849,9 +849,15 @@ AC_ARG_ENABLE(opengl,
AC_ARG_ENABLE(dbus,
AS_HELP_STRING([--disable-dbus],
[Determines whether to enable features that depend on dbus.
- e.g. Presentation mode screensaver control, auto font install,
bluetooth presentation control])
+ e.g. Presentation mode screensaver control, bluetooth presentation
control])
,enable_dbus=yes)
+AC_ARG_ENABLE(packagekit,
+ AS_HELP_STRING([--enable-packagekit],
+ [Determines whether to enable features using packagekit.
+ Right now that is auto font install)]
+,)
+
AC_ARG_ENABLE(gconf,
AS_HELP_STRING([--disable-gconf],
[Determines whether to use the GConf support.]),
commit a26bbbac9159dd7ca84bcca0a0fc19dab85715a5
Author: Rene Engelhard <r...@debian.org>
Date: Tue Sep 11 13:39:03 2012 +0200
fix li--with-system-liblangtag description
Change-Id: I7904d041d1512e988aa121d4cb438aa4ccb04011
diff --git a/configure.in b/configure.in
index 18286b6..7eb2e67 100644
--- a/configure.in
+++ b/configure.in
@@ -1644,7 +1644,7 @@ AC_ARG_WITH(system-orcus,
AC_ARG_WITH(system-liblangtag,
AS_HELP_STRING([--with-system-liblangtag],
- [Use orcus library already on system.]),,
+ [Use liblangtag library already on system.]),,
[with_system_liblangtag="$with_system_libs"])
AC_ARG_WITH(system-mozilla,
commit bea6149df2a611a6958ab1d9fa989dd30d525cd7
Author: Rene Engelhard <r...@debian.org>
Date: Tue Sep 11 02:30:09 2012 +0200
default to off for packagekit usage; add --enable-packagekit
Change-Id: Ib644cc3768ced8a1959fb9ea9f7f24e29fce87ad
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4389a54..e7690cf 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1232,6 +1232,12 @@ $(call gb_LinkTarget_add_defs,$(1),\
-DENABLE_DBUS \
)
+ifeq ($(ENABLE_PACKAGEKIT),YES)
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DENABLE_PACKAGEKIT \
+)
+endif # ENABLE_PACKAGEKIT
+
$(call gb_LinkTarget_add_libs,$(1),\
$(DBUS_LIBS) \
)
diff --git a/config_host.mk.in b/config_host.mk.in
index d72f79f..3edba3b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -114,6 +114,7 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
export ENABLE_CUPS=@ENABLE_CUPS@
export ENABLE_DBUS=@ENABLE_DBUS@
+export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
export ENABLE_DEBUG_FOR=@ENABLE_DEBUG_FOR@
export ENABLE_DIRECTX=@ENABLE_DIRECTX@
export ENABLE_EVOAB2=@ENABLE_EVOAB2@
diff --git a/configure.in b/configure.in
index 9804862..18286b6 100644
--- a/configure.in
+++ b/configure.in
@@ -9262,6 +9262,20 @@ AC_SUBST(ENABLE_DBUS)
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+AC_MSG_CHECKING([whether to enable font install via packagekit])
+if test "$ENABLE_DBUS" = "TRUE"; then
+ if test -n "$enable_packagekit"; then
+ ENABLE_PACKAGEKIT=YES
+ AC_MSG_RESULT([yes])
+ else
+ ENABLE_PACKAGEKIT=NO
+ AC_MSG_RESULT([no])
+ fi
+else
+ AC_MSG_RESULT([no, dbus disabled.])
+fi
+AC_SUBST(ENABLE_PACKAGEKIT)
+
dnl ===================================================================
dnl Check whether the gtk 2.0 libraries are available.
dnl ===================================================================
diff --git a/vcl/generic/fontmanager/fontconfig.cxx
b/vcl/generic/fontmanager/fontconfig.cxx
index b164adc..7b779e4 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -82,7 +82,7 @@ using namespace psp;
#define FC_FONTFORMAT "fontformat"
#endif
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
#include <dbus/dbus-glib.h>
#endif
@@ -834,7 +834,7 @@ namespace
return OString();
}
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
LanguageTag getExemplerLangTagForCodePoint(sal_uInt32 currentChar)
{
int32_t script = u_getIntPropertyValue(currentChar, UCHAR_SCRIPT);
@@ -857,7 +857,7 @@ namespace
IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport)
{
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
guint xid = get_xid_for_dbus();
if (!xid)
@@ -1056,7 +1056,7 @@ bool PrintFontManager::Substitute( FontSelectPattern
&rPattern, rtl::OUString& r
}
}
OUString sStillMissing(pRemainingCodes, nRemainingLen);
-#ifdef ENABLE_DBUS
+#if defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
if (get_xid_for_dbus())
{
if (sStillMissing == rMissingCodes) //replaced nothing
commit b6640bdef03e89b720974d72ca42fb88937a70c8
Author: Rene Engelhard <r...@debian.org>
Date: Tue Sep 11 02:29:09 2012 +0200
implement --with-system-liblangtag
Change-Id: I182f95c294ec41cf74cd495fd6141a7d1c33b3ff
diff --git a/config_host.mk.in b/config_host.mk.in
index 1d493e2..d72f79f 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -291,6 +291,8 @@ export LIBFONTS_JAR=@LIBFONTS_JAR@
export LIBFORMULA_JAR=@LIBFORMULA_JAR@
export LIBJSON=@LIBJSON@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
+export LIBLANGTAG_CFLAGS=@LIBLANGTAG_CFLAGS@
+export LIBLANGTAG_LIBS=@LIBLANGTAG_LIBS@
export LIBLOADER_JAR=@LIBLOADER_JAR@
export LIBMGR_X64_BINARY=@LIBMGR_X64_BINARY@
export LIBMYSQL_PATH=@LIBMYSQL_PATH@
diff --git a/configure.in b/configure.in
index a3ad417..9804862 100644
--- a/configure.in
+++ b/configure.in
@@ -1642,6 +1642,11 @@ AC_ARG_WITH(system-orcus,
[Use orcus library already on system.]),,
[with_system_orcus="$with_system_libs"])
+AC_ARG_WITH(system-liblangtag,
+ AS_HELP_STRING([--with-system-liblangtag],
+ [Use orcus library already on system.]),,
+ [with_system_liblangtag="$with_system_libs"])
+
AC_ARG_WITH(system-mozilla,
AS_HELP_STRING([--with-system-mozilla],
[Use Mozilla already on system. Note that some components cannot be
built
@@ -11247,34 +11252,41 @@ else
fi
AC_SUBST(SYSTEM_GLIB)
+if test "$SYSTEM_GLIB" = "YES"; then
+ PKG_CHECK_MODULES( GLIB, glib-2.0 )
+else
+ BUILD_TYPE="$BUILD_TYPE GLIB"
+fi
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
dnl ===================================================================
dnl Test whether to use liblangtag
dnl ===================================================================
ENABLE_LIBLANGTAG=
SYSTEM_LIBLANGTAG=
-GLIB_CFLAGS=''
-GLIB_LIBS=''
+AC_MSG_CHECKING([whether to use liblangtag])
if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a
"$CROSS_COMPILING" != "YES" \); then
ENABLE_LIBLANGTAG=YES
- dnl Get system's glib flags and libs.
- dnl The i18npool LanguageTag wrapper uses it for liblangtag.
-
- if test "$SYSTEM_GLIB" = YES; then
- PKG_CHECK_MODULES( GLIB, glib-2.0 )
+ AC_MSG_RESULT([yes])
+ AC_MSG_CHECKING([whether to use system liblangtag])
+ if test -n "$with_system_liblangtag"; then
+ SYSTEM_LIBLANGTAG=YES
+ AC_MSG_RESULT([yes])
+ PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3)
else
- BUILD_TYPE="$BUILD_TYPE GLIB"
+ SYSTEM_LIBLANGTAG=NO
+ AC_MSG_RESULT([no])
+ BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
fi
-
- dnl So far AFAIK no system has liblangtag, set this unconditionally for
now.
- dnl TODO Allow system liblangtag
- BUILD_TYPE="$BUILD_TYPE LIBLANGTAG"
+else
+ ENABLE_LIBLANGTAG=NO
+ AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_LIBLANGTAG)
AC_SUBST(SYSTEM_LIBLANGTAG)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
+AC_SUBST(LIBLANGTAG_CFLAGS)
+AC_SUBST(LIBLANGTAG_LIBS)
dnl ===================================================================
dnl Test whether to build gettext runtime (libintl) or rely on the
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
