Revert "always support packagekit if dbus is enabled"

This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.

Gbp-Pq: Name no-packagekit-per-default.diff

diff --git a/Repository.mk b/Repository.mk
index 89370213450e158aeb7b08285eaab06f45e9a7f6..24d2e179af1df3717cdc6c96472e1575297542d0 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -307,7 +307,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
        $(if $(ENABLE_GTK),vclplug_gtk) \
        $(if $(ENABLE_GTK3),vclplug_gtk3) \
        $(if $(ENABLE_SYSTRAY_GTK),qstart_gtk) \
-       $(if $(ENABLE_GIO),losessioninstall) \
+       $(if $(ENABLE_PACKAGEKIT),losessioninstall) \
        $(if $(ENABLE_GIO),ucpgio1) \
 ))
 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 847a5b5ceb216ddf79c15e66463ab1968fc58e8f..dd5673901bcedbfa9bfcb2b0a99e44ef84d3ff26 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2628,6 +2628,12 @@ $(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 eb3a70566b47e8a82177d04d25e325a344a0d860..77736cef7b4d9e0427264cf7c67616a816e4be5a 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -152,6 +152,7 @@ export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
 export ENABLE_OPTIMIZED=@ENABLE_OPTIMIZED@
+export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_PDFIUM=@ENABLE_PDFIUM@

diff --git a/configure.ac b/configure.ac
index 838db2ea7765431b9231dc7cc00c67e2b336c601..b7ae086ec96ecaed26af847223db7481ba15e5cb 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index d83b30819ccd0e9ce8abc880ec70127b403165b7..cf5053c1a726bfb5fdc3b2c717d4d9fda829a6c0 100644 (file)
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -198,9 +198,11 @@ $(eval $(call gb_Rdb_add_components,services,\
         canvas/source/opengl/oglcanvas \
        ) \
        $(if $(ENABLE_GIO), \
-               shell/source/sessioninstall/losessioninstall \
                ucb/source/ucp/gio/ucpgio \
        ) \
+       $(if $(ENABLE_PACKAGEKIT), \
+               shell/source/sessioninstall/losessioninstall \
+       ) \
        $(if $(ENABLE_GSTREAMER_1_0), \
                avmedia/source/gstreamer/avmediagstreamer \
        ) \

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 7ed64646e37f153f0a3cdf276a00f71edd19650c..10be294fcc96622ad1e960cfcb4cefb5a0009d25 100644 (file)
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -190,6 +190,7 @@ namespace
         // make sure we actually can instantiate services from base first
         if(!lcl_isBaseAvailable())
         {
+#if defined (ENABLE_PACKAGEKIT)
             try
             {
                 using namespace org::freedesktop::PackageKit;
@@ -206,8 +207,16 @@ namespace
                 SAL_INFO(
                     "sfx.appl",
                     "trying to install LibreOffice Base, caught " << e);
+#else
+                SAL_INFO(
+                    "sfx.appl",
+                    "missing LibreOffice Base");
+
+#endif
+#if defined (ENABLE_PACKAGEKIT)
             }
             return;
+#endif
         }
 
         try // fdo#48775

diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index d1a54b9cf9eabd38ab3d4575757733f06afe0777..1c24b85bd7884e7992ba4600989b0ddd7e4921fe 100644 (file)
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -16,11 +16,13 @@ $(eval $(call gb_Module_add_targets,shell,\
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 ifeq ($(ENABLE_GIO),TRUE)
+ifeq ($(ENABLE_PACKAGEKIT),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
        Library_losessioninstall \
 ))
 endif
 endif
+endif
 
 ifeq ($(OS),SOLARIS)
 ifeq ($(ENABLE_GIO),TRUE)

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 467112e5895649291e2b7865b974780424b4ce22..bad4d92c6addfe40f367fe2eec9e4ac860de5db8 100644 (file)
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -414,6 +414,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -429,8 +430,15 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
             SAL_INFO(
                 "sw.core",
                 "trying to install LibreOffice Base, caught " << e);
+#else
+            SAL_INFO(
+                "sw.core",
+                "missing LibreOffice Base");
+#endif
+#if defined (ENABLE_PACKAGEKIT)
         }
         return;
+#endif
     }
     if ( m_pView )
     {

diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
index 03d033e8c7e0bc123eb732ddc50e28531096e64b..e03fe0a0e4883f3f11c093834c29f97474f42930 100644 (file)
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -192,12 +192,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     static void addFontconfigDir(const OString& rDirectory);
 
     std::set<OString> m_aPreviousLangSupportRequests;
-#if ENABLE_GIO
+#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
     std::vector<OString> m_aCurrentRequests;
 #endif
     Timer m_aFontInstallerTimer;
 
-#if ENABLE_GIO
+#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
     DECL_LINK( autoInstallFontLangSupport, Timer*, void );
 #endif
     PrintFontManager();

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 2c16e040cdabb7e45d7361dedfe6bbc2a0a06b1f..fadb86cabf2f09bac45f8d77cca2bbe0f792275a 100644 (file)
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -40,7 +40,7 @@ using namespace psp;
 #include <ft2build.h>
 #include <fontconfig/fcfreetype.h>
 
-#if ENABLE_GIO
+#if ENABLE_GIO && defined (ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
 #include <gio/gio.h>
 #endif
 
@@ -863,7 +863,7 @@ namespace
         return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
     }
 
-#if ENABLE_GIO
+#if ENABLE_GIO && defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
     guint get_xid_for_dbus()
     {
         // FIXME: Application::GetActiveTopWindow only returns something sensible if LO currently has the focus
@@ -875,7 +875,7 @@ namespace
 #endif
 }
 
-#if ENABLE_GIO
+#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
 IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
 {
     if (!officecfg::Office::Common::PackageKit::EnableFontInstallation::get())
@@ -1107,7 +1107,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
                     }
                 }
                 OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
-#if ENABLE_GIO
+#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
                 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 c956345e6fd181bc863146b2b95d62ea3491f008..68d867d5c736b692ee4faac51c906361b1d77c00 100644 (file)
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -146,7 +146,7 @@ PrintFontManager::PrintFontManager()
     : m_nNextFontID( 1 )
     , m_nNextDirAtom( 1 )
 {
-#if ENABLE_GIO
+#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
     m_aFontInstallerTimer.SetInvokeHandler(LINK(this, PrintFontManager, autoInstallFontLangSupport));
     m_aFontInstallerTimer.SetTimeout(5000);
 #endif