[Libreoffice-commits] core.git: config_host.mk.in configure.ac RepositoryExternal.mk vcl/inc vcl/unx

[Caolán McNamara]

 RepositoryExternal.mk                       |    6 ------
 config_host.mk.in                           |    1 -
 configure.ac                                |   22 +---------------------
 vcl/inc/unx/fontmanager.hxx                 |    4 ++--
 vcl/unx/generic/fontmanager/fontconfig.cxx  |    8 ++++----
 vcl/unx/generic/fontmanager/fontmanager.cxx |    2 +-
 6 files changed, 8 insertions(+), 35 deletions(-)

New commits:
commit f2984e95740cfbb9c74574f2a1225af3411d4901
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 19 11:59:32 2016 +0000

    always support packagekit if dbus is enabled
    
    Change-Id: I8eb169d33fcb0217989b180aa0c4c0110875be32
    Reviewed-on: https://gerrit.libreoffice.org/22503
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index fd20bfd..d0ee166 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2537,12 +2537,6 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$(DBUS_CFLAGS) \
 )
 
-ifeq ($(ENABLE_PACKAGEKIT),TRUE)
-$(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 2721820..6170227 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,7 +157,6 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL=@ENABLE_OPENGL@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
-export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_RANDR=@ENABLE_RANDR@
diff --git a/configure.ac b/configure.ac
index c6a9b7d..b6f6f37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1216,15 +1216,9 @@ AC_ARG_ENABLE(cairo-canvas,
 AC_ARG_ENABLE(dbus,
     AS_HELP_STRING([--disable-dbus],
         [Determines whether to enable features that depend on dbus.
-         e.g. Presentation mode screensaver control, bluetooth presentation control]),
+         e.g. Presentation mode screensaver control, bluetooth presentation control, automatic font install]),
 ,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(sdremote,
     AS_HELP_STRING([--disable-sdremote],
         [Determines whether to enable Impress remote control (i.e. the server component).]),
@@ -10052,20 +10046,6 @@ 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" -a "$enable_packagekit" != "no"; then
-        ENABLE_PACKAGEKIT=TRUE
-        AC_MSG_RESULT([yes])
-    else
-        ENABLE_PACKAGEKIT=
-        AC_MSG_RESULT([no])
-    fi
-else
-    AC_MSG_RESULT([no, dbus disabled.])
-fi
-AC_SUBST(ENABLE_PACKAGEKIT)
-
 AC_MSG_CHECKING([whether to enable Impress remote control])
 if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
     AC_MSG_RESULT([yes])
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index d365800..1ffe504 100644
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -317,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     static bool addFontconfigDir(const OString& rDirectory);
 
     std::set<OString> m_aPreviousLangSupportRequests;
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
     std::vector<OString> m_aCurrentRequests;
 #endif
     Timer m_aFontInstallerTimer;
 
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
     DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void );
 #endif
     PrintFontManager();
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 8def362..aff2848 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -37,7 +37,7 @@ using namespace psp;
 #include <ft2build.h>
 #include <fontconfig/fcfreetype.h>
 
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
 #include <dbus/dbus-glib.h>
 #endif
 
@@ -877,7 +877,7 @@ namespace
         return LanguageTag(OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8));
     }
 
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
     guint get_xid_for_dbus()
     {
         const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow();
@@ -887,7 +887,7 @@ namespace
 #endif
 }
 
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
 IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
 {
     guint xid = get_xid_for_dbus();
@@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
                     }
                 }
                 OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
                 if (get_xid_for_dbus())
                 {
                     if (sStillMissing == rMissingCodes) //replaced nothing
diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
index b2525ac..8089eae 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager()
         }
     }
 
-#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+#if ENABLE_DBUS
     m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport));
     m_aFontInstallerTimer.SetTimeout(5000);
 #endif