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 b6c97e006329d84bd2b11c5433b073aab274453c..eab807880035b87183999b9f2b545659280e2111 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -278,7 +278,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 7705272520198f2adf9fb4fe846604e80e28a3e9..1932edae1b1564752bcca9191d7b8ffa6a0ee14f 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2527,6 +2527,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 5ffb1fd0d397d28edb850fe240e4db340723e726..8071d88cb7b36d1c3bb3b60220eba4669ee66f8a 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -163,6 +163,7 @@ 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 37b4a7acae2d14ec04c067716a01e2af3ce538a8..7ddccc40c93b3872d89134d2a6ea11d10caa56b6 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 c411fc193e50025676140f2eb361a547e34232ce..d540983e464c583faa2250fd02e7ed3512cfed6b 100644 (file)
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -194,9 +194,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 bd265622f501d22f09da566fae157132b834c61d..7c383a7b4e8cee342dfda5fd45955d4b0a5840d7 100644 (file)
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -159,6 +159,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;
@@ -176,8 +177,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 53db05357eee22bb52c0056530256c336ade73b5..862530f13b879f360a9da41dd236307aed9a3158 100644 (file)
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -352,6 +352,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -368,8 +369,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 99aae21e189eafba185d3fd9f494335bea645bcd..7ed0a1eb91f87acaa257a5d48f3cdefe2f86f9bc 100644 (file)
--- 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
+#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_TYPED( autoInstallFontLangSupport, Timer*, void );
 #endif
     PrintFontManager();

diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 79971d5d18ed76f7f61733a80af883f4e664b607..1b7c28624c836e2d7073062552b876e1c8b00db9 100644 (file)
--- 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
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
 #include <dbus/dbus-glib.h>
 #endif
 
@@ -877,7 +877,7 @@ namespace
         return LanguageTag(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();
@@ -887,7 +887,7 @@ namespace
 #endif
 }
 
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
 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
+#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 68b21b40f90e41964dce4e2eabe7c31846577f46..1020f5949786e449c8cd7d0131593c006ee1cbd1 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