From: Rene Engelhard <rene@debian.org>
Date: Sun, 21 Feb 2016 01:20:43 +0000 (+0100)
Subject: Revert "always support packagekit if dbus is enabled"
X-Git-Tag: archive/raspbian/1%6.3.0-2+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=eb2b066fd84ab57e2124e02d487c4defc61db3df;p=libreoffice.git

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 d400255295b..13ef71ff51c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -317,7 +317,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 dcc9aedb883..a92d6f39155 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2663,6 +2663,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 fd121e1bbb3..bdc394b824d 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -165,6 +165,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 f01323f4e49..c61ff1c8c98 100644
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 24125bf454f..766575f849d 100644
--- 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 6d54c815970..9b0b39a932e 100644
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 d8975449173..b7a48b40d5f 100644
--- 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 1535f0c4a2d..ee476b93a79 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -202,6 +202,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,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 c0c42cc5bea..02a4d2977cd 100644
--- 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 57d1d2f89ca..1df899727e3 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -144,8 +144,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 98a53fa710f..435b2991a7f 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -407,6 +407,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -422,19 +423,28 @@ 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)
             auto xRestartManager
                 = css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext());
             if (!xRestartManager->isRestartRequested(false))
             {
+#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 )
     {