[libreoffice] 01/02: disable packagekit (losessioninstall) per default and make it conditional on --enable-packagekit
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 814300dab3c4635413cfbf50fb375b4d3ea837ad
Author: Rene Engelhard <rene@debian.org>
Date: Thu Mar 31 23:32:03 2016 +0200
disable packagekit (losessioninstall) per default and make it conditional on --enable-packagekit
---
changelog | 2 +
patches/no-packagekit-per-default.diff | 105 +++++++++++++++++++++++++++++++++
patches/series | 1 +
rules | 4 ++
4 files changed, 112 insertions(+)
diff --git a/changelog b/changelog
index fa2cffe..8c8925d 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:5.1.2~rc2-1) UNRELEASED; urgency=medium
* debian/patches/OPENCL_DLL_NAME.diff: backport from master, use .so.1,
not .so
+ * debian/patches/no-packagekit-per-default: disable losessioninstaller
+ per default and make it conditional on --enable-packagekit.
* debian/control*in: add loads of ${misc:Pre-Depends} to packages having
.maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency.
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
new file mode 100644
index 0000000..2992ba9
--- /dev/null
+++ b/patches/no-packagekit-per-default.diff
@@ -0,0 +1,105 @@
+diff --git a/Repository.mk b/Repository.mk
+index 858be89..901085e 100644
+--- a/Repository.mk
++++ b/Repository.mk
+@@ -255,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/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 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 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.Message);
++#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/patches/series b/patches/series
index 29bbc5a..11fca58 100644
--- a/patches/series
+++ b/patches/series
@@ -34,3 +34,4 @@ gcc-6.diff
GCC-6-PR69273-workaround.diff
bash-completion-dir.diff
OPENCL_DLL_NAME.diff
+no-packagekit-per-default.diff
diff --git a/rules b/rules
index 76df6da..752b649 100755
--- a/rules
+++ b/rules
@@ -239,6 +239,7 @@ ifeq "$(USE_DBUS)" "y"
else
ENABLE_BLUETOOTH=y
SYSTEM_STUFF += bluez
+ ENABLE_PACKAGEKIT=n
endif
endif
ENABLE_AVAHI=y
@@ -1438,6 +1439,9 @@ ifeq "$(USE_DBUS)" "y"
else
CONFIGURE_FLAGS += --disable-sdremote-bluetooth
endif
+ ifeq "$(ENABLE_PACKAGEKIT)" "y"
+ CONFIGURE_FLAGS += --enable-packagekit
+ endif
endif
ifeq "$(ENABLE_AVAHI)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: