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 3acad9d80830ce3c570e5bb3cb93d5d34d0f6c4b..70deb04795435d826f09a90789785f9c5d11fc89 100644 (file)
--- a/Repository.mk
+++ b/Repository.mk
@@ -312,7 +312,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
        $(if $(ENABLE_EVOAB2),evoab) \
        $(if $(ENABLE_GTK),vclplug_gtk) \
        $(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 f010e5ab0837f6fb030f04e71d56d3ac7b3c0c39..ca2d0da99484b6ae7ba4081f317a566d04a33743 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2691,6 +2691,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 e51089cf57ebab706f6815718a084733eb744f4b..2355a722bc30881a13beddc6c1845de1ee984cb9 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -157,6 +157,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 c7aaca00540ece0377f5e483111ed7f252705292..465c97a158f753e0d0e577baae42cc2dd3718ade 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 ca444c35223ad3b67571d90f27c778ebb1ec9cc1..3f42ee022c9df9b02c649b90a6a60cc4757cbd78 100644 (file)
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -533,10 +533,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 3d73cc94deb2bbaf73896b1a176344e81ccd1798..0d1cce3bdd0a91e1c9e7de1080f9684c17b514c4 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 20cfc6cedebf6ceef2a9d48cc2440e89b4b887bf..6ad48a1baf93fb425b4f6c20581f94e52d84482e 100644 (file)
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -200,9 +200,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 1c19d40fecd9bfa89247fef6b9c504d9ee350d09..fadfc0ec57d117ecfd29add26a2565057e4d54cf 100644 (file)
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -199,6 +199,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;
@@ -215,8 +216,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 6d54617f0268e6938e1e8b66e267f10a57483ba8..b8f6772d82404263cf309c6b94d20cbff1a07d3f 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 75ce24b589a362f95d7d67d20538ac6867ad73ef..6637dbdba72abf1c39efc9a6a0d1bcca287d8371 100644 (file)
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -139,8 +139,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 804e358418ef416a0ce993a9be23007af11a93f5..b3e01f5c6d3a1c80a2ba7a011b3a93d2601e724a 100644 (file)
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -412,6 +412,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -427,8 +428,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 )
     {