Package: libreoffice / 1:6.1.5-3

no-packagekit-per-default.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
From 1c2296a3809ff9ef36564eff3abdf4c191a1d1c6 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 21 Feb 2016 02:20:43 +0100
Subject: [PATCH] Revert "always support packagekit if dbus is enabled"

This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.
---
 RepositoryExternal.mk                       |  6 ++++++
 config_host.mk.in                           |  1 +
 configure.ac                                | 22 +++++++++++++++++++++-
 vcl/inc/unx/fontmanager.hxx                 |  4 ++--
 vcl/unx/generic/fontmanager/fontconfig.cxx  |  8 ++++----
 vcl/unx/generic/fontmanager/fontmanager.cxx |  2 +-
 6 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d0ee166..fd20bfd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2537,6 +2537,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 6170227..2721820 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -153,6 +153,7 @@
 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 b6f6f37..c6a9b7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1216,9 +1216,15 @@ AC_ARG_ENABLE(cairo-canvas,
 libo_FUZZ_ARG_ENABLE(dbus,
     AS_HELP_STRING([--disable-dbus],
         [Determines whether to enable features that depend on dbus.
-         e.g. Presentation mode screensaver control, bluetooth presentation control, automatic font install]),
+         e.g. Presentation mode screensaver control, bluetooth presentation control]),
 ,test "${enable_dbus+set}" = set || enable_dbus=yes)
 
+AC_ARG_ENABLE(packagekit,
+    AS_HELP_STRING([--enable-packagekit],
+        [Determines whether to enable features using packagekit.
+         Right now that is auto font install]),
+,)
+
 libo_FUZZ_ARG_ENABLE(sdremote,
     AS_HELP_STRING([--disable-sdremote],
         [Determines whether to enable Impress remote control (i.e. the server component).]),
@@ -10046,6 +10052,20 @@ AC_SUBST(ENABLE_DBUS)
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 
+AC_MSG_CHECKING([whether to enable font install via packagekit])
+if test "$ENABLE_DBUS" = "TRUE"; then
+    if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then
+        ENABLE_PACKAGEKIT=TRUE
+        AC_MSG_RESULT([yes])
+    else
+        ENABLE_PACKAGEKIT=
+        AC_MSG_RESULT([no])
+    fi
+else
+    AC_MSG_RESULT([no, dbus disabled.])
+fi
+AC_SUBST(ENABLE_PACKAGEKIT)
+
 AC_MSG_CHECKING([whether to enable Impress remote control])
 if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
     AC_MSG_RESULT([yes])
diff --git a/Repository.mk b/Repository.mk
index 858be89..901085e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -289,7 +289,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/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index f467783..b48e763 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -159,6 +159,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;
@@ -176,8 +177,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 17661e9..99becfd 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/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 896b365..5be6a92 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -349,6 +349,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -365,8 +366,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 )
     {
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index c411fc1..d540983 100644
--- 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/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 26d1ba053a1e..831e0ff7630f 100644
--- 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 2884179d0800..0b8feaa84c99 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6380,13 +6380,13 @@
         <info>
            <desc>Specifies if missing font installation should be triggered.</desc>
         </info>
-        <value>true</value>
+        <value>false</value>
       </prop>
       <prop oor:name="EnableLangpackInstallation" oor:type="xs:boolean" oor:nillable="false">
         <info>
            <desc>Specifies if missing langpack installation should be triggered.</desc>
         </info>
-        <value>true</value>
+        <value>false</value>
       </prop>
     </group>
     <group oor:name="Classification">
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index 47cb87e36963..8dc00e09bd3b 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -137,8 +137,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);