[PATCH] 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 e447757bcb8f844735b539ff7ed0783bd241c69b..b49c498261b6a0d3732f28205f2ba61386bad1f7 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -307,7 +307,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
        $(if $(ENABLE_EVOAB2),evoab) \
        $(if $(ENABLE_GTK3),vclplug_gtk3) \
-       $(if $(ENABLE_GIO),losessioninstall) \
+       $(if $(ENABLE_PACKAGEKIT),losessioninstall) \
        $(if $(ENABLE_GIO),ucpgio1) \
 ))
 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0029ae7bc698619b625479964acb2e65eafd04a9..312752552398e233c6e9e8b8ffe87bcb389aef4a 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2635,6 +2635,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 81d09e48da7da1ce88ace8583bbc3871591d869d..52ac6e33192f8f580fc6cda5bb415520c3616133 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -167,6 +167,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 573109028edcefbf53226b8a784ac942a453b0fe..db288e9b424d4ae7f9bd65baecf37ca4b3316f52 100644 (file)
Binary files a/configure.ac and b/configure.ac differ

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 24125bf454f9857277a26bad1febcd53c9ef3836..766575f849d2647d62ee6d3624d75945430bbd6c 100644 (file)
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -551,10 +551,10 @@
   </node>
   <node oor:name="PackageKit">
       <prop oor:name="EnableFontInstallation" oor:type="xs:boolean">
-        <value install:module="unx">true</value>
+        <value install:module="unx">false</value>
       </prop>
       <prop oor:name="EnableLangpackInstallation" oor:type="xs:boolean">
-        <value install:module="unx">true</value>
+        <value install:module="unx">false</value>
       </prop>
   </node>
   <node oor:name="Classification">

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index cebb7d7ec0efa3b8c2a27bc6b7bcd5099ff3cf9f..b1c42ba5fe52ac2f515d6d0edbb776314b08e1c6 100644 (file)
Binary files a/officecfg/registry/schema/org/openoffice/Office/Common.xcs and b/officecfg/registry/schema/org/openoffice/Office/Common.xcs differ

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index f8c5047de79f94dfee370daf94e699717cfad705..1a78bdc96293b5074f34eb4d11f4bf523fbbfc63 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 c73d8d9d39c975c5ec0be32be75e8030d567de31..0cfb99f769bbca08626fef9f59b7e7cfcc340a7e 100644 (file)
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -204,6 +204,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;
@@ -218,8 +219,13 @@ namespace
             catch (const Exception &)
             {
                 TOOLS_INFO_EXCEPTION("sfx.appl", "trying to install LibreOffice Base");
+#else
+               TOOLS_INFO_EXCEPTION("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 a223aae617e0ad96e3cecccfc6f3072b35dbe820..e50b4633be7dcf0bff70317c773941e113f14301 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/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index bedd8d1205c5dc4c85299096c5a6d463cfcefc92..11cc93d6f2c58b802792436728d5de239508e29b 100644 (file)
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -138,8 +138,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString
                     else
                         aPackages.emplace_back("libreoffice-langpack-" + install);
                 }
-                //Debian would be: "The Document Foundation/Debian"
-                else if (sVendor == "The Document Foundation, Debian and Ubuntu")
+                else if (sVendor == "The Document Foundation/Debian" || sVendor == "The Document Foundation, Debian and Ubuntu")
                 {
                     // l10n is the typical Debian/Ubuntu naming convention
                     aPackages.emplace_back("libreoffice-l10n-" + install);

diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index a2a2ff35b45511a56597163fa2eba8aba36c8f51..78a9c728b2a9e9a1bc048039de31ca933acebfc5 100644 (file)
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -415,6 +415,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -434,15 +435,22 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
                 = css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext());
             if (!xRestartManager->isRestartRequested(false))
             {
+#else
+            TOOLS_INFO_EXCEPTION(
+                "sw.core",
+                "missing LibreOffice Base, caught");
+#endif
                 // Base is absent, and could not initiate its install - ask user to do that manually
                 // Only show the dialog if restart is not initiated yet
                 std::unique_ptr<weld::MessageDialog> xWarnBox(Application::CreateMessageDialog(
                     nullptr, VclMessageType::Info, VclButtonsType::Ok,
                     SwResId(STR_NO_BASE_FOR_MERGE)));
                 xWarnBox->run();
+#if defined (ENABLE_PACKAGEKIT)
             }
         }
         return;
+#endif
     }
     if ( m_pView )
     {