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 ad1577ac95c65c3e72d85cba2af33390c12e355c..efc3d2a86c9bdcb3ffc6731619b655d940ea2b53 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -281,7 +281,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 af48ed5db7996df972117132d2d418c784ec070a..9049dc3e82b8b1c992de24b4f2947fd658c2d37b 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2569,6 +2569,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 66c0eba184c400310011e9b1d1ae949c9ab7777e..556870bba49e79286bae91dd27d0dcf1c56bcc2e 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -161,6 +161,7 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
 export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 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 f0c039dfcb7f651e2881bb4a82437202edbb4b06..da2d6ae40267fe1b069ae1aab65e7802483e7dc6 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 cd952135cc96b1dced130cc6bbd1a1b2ff76722a..4b5a632b3f2684d3fb1308cbd91bfb262ec925fa 100644 (file)
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -196,9 +196,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 de9b8af352f0b6a7c41e7979b5c7b3ec207a51a4..3957fdb012aa0a04421ce674a53989474ea63793 100644 (file)
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -197,6 +197,7 @@ namespace
         // make sure we actually can instanciate services from base first
         if(!lcl_isBaseAvailable())
         {
+#if defined (ENABLE_PACKAGEKIT)
             try
             {
                 using namespace org::freedesktop::PackageKit;
@@ -214,8 +215,16 @@ namespace
                 SAL_INFO(
                     "sfx.appl",
                     "trying to install LibreOffice Base, caught " << e.Message);
+#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 17661e9aa210a74f8a5c39c41720f59006bc809e..99becfd0bbddce755bbb9a55aed9c3487f55c0ed 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 5abd1de7c9fa6af703f4ccc52a51619cf8bdaed1..5c9cb6f5a05b65ca6da63a90b65d02e7842a2f44 100644 (file)
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -423,6 +423,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -439,8 +440,15 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
             SAL_INFO(
                 "sw.core",
                 "trying to install LibreOffice Base, caught " << e.Message);
+#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 7f0e057addf7afa5bea41da607078735d0f3fddd..559a14fd729ad540e701d1ba906f271a94e29d38 100644 (file)
--- a/vcl/inc/unx/fontmanager.hxx
+++ b/vcl/inc/unx/fontmanager.hxx
@@ -316,12 +316,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
     static bool addFontconfigDir(const OString& rDirectory);
 
     std::set<OString> m_aPreviousLangSupportRequests;
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
     std::vector<OString> m_aCurrentRequests;
 #endif
     Timer m_aFontInstallerTimer;
 
-#if ENABLE_DBUS
+#if 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 dd9d17b7ad2819179b0a319fd3df068ebba609a7..a666e14b3c410a42c550077ea7ac14d5599ef0b8 100644 (file)
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -38,7 +38,7 @@ using namespace psp;
 #include <ft2build.h>
 #include <fontconfig/fcfreetype.h>
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
 #include <dbus/dbus-glib.h>
 #endif
 
@@ -888,7 +888,7 @@ namespace
         return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
     }
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
     guint get_xid_for_dbus()
     {
         const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow();
@@ -898,7 +898,7 @@ namespace
 #endif
 }
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
 IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
 {
     guint xid = get_xid_for_dbus();
@@ -1109,7 +1109,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
                     }
                 }
                 OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
-#if ENABLE_DBUS
+#if 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 488e675e9b8248b2a163fa644aabd64f8e732049..8b57d446445b468c962af82a8cd8f13bbe0cc0ba 100644 (file)
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager()
         }
     }
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
     m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport));
     m_aFontInstallerTimer.SetTimeout(5000);
 #endif