From: Rene Engelhard 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%5.4.0-1+rpi1~2^2~10 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ea10b691afdd9bc1073d8bb56c9bda4d6fbf5433;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 0ab7edca475..f7591ab4029 100644 --- a/Repository.mk +++ b/Repository.mk @@ -308,7 +308,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/RepositoryExternal.mk b/RepositoryExternal.mk index f3edf136455..3bbcace7f5c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2564,6 +2564,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 dc93811bff8..a5b76255adf 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -156,6 +156,7 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@ export ENABLE_OOENV=@ENABLE_OOENV@ export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@ export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@ +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 2934e1fef33..c347a5532c9 100644 Binary files a/configure.ac and b/configure.ac differ diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index ce8649ed7f7..cf94960358f 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -196,9 +196,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 d6424c2d06e..17f1296bffa 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -198,6 +198,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; @@ -215,8 +216,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 cfe7aa061ce..0371f399db3 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 23b9b5bdec2..a2305095b7b 100644 --- a/sw/source/uibase/app/apphdl.cxx +++ b/sw/source/uibase/app/apphdl.cxx @@ -414,6 +414,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs { if(!lcl_hasAllComponentsAvailable()) { +#if defined (ENABLE_PACKAGEKIT) try { using namespace org::freedesktop::PackageKit; @@ -430,8 +431,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/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 2e89c5f655b..3e37f6bede3 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -211,12 +211,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager static void addFontconfigDir(const OString& rDirectory); std::set m_aPreviousLangSupportRequests; -#if ENABLE_DBUS +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) std::vector m_aCurrentRequests; #endif Timer m_aFontInstallerTimer; -#if ENABLE_DBUS +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) DECL_LINK( autoInstallFontLangSupport, Timer*, void ); #endif PrintFontManager(); diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx index 07614f60e39..330adc66045 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -38,7 +38,7 @@ using namespace psp; #include #include -#if ENABLE_DBUS +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) #include #endif @@ -862,7 +862,7 @@ namespace return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8); } -#if ENABLE_DBUS +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) guint get_xid_for_dbus() { const vcl::Window *pTopWindow = Application::IsHeadlessModeEnabled() ? nullptr : Application::GetActiveTopWindow(); @@ -872,7 +872,7 @@ namespace #endif } -#if ENABLE_DBUS +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { guint xid = get_xid_for_dbus(); @@ -1083,7 +1083,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi } } OUString sStillMissing(pRemainingCodes.get(), nRemainingLen); -#if ENABLE_DBUS +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) if (get_xid_for_dbus()) { if (sStillMissing == rMissingCodes) //replaced nothing diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx index 2b961e58fa0..1bc7ade2f2b 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -134,7 +134,7 @@ PrintFontManager::PrintFontManager() : m_nNextFontID( 1 ) , m_nNextDirAtom( 1 ) { -#if ENABLE_DBUS +#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT) m_aFontInstallerTimer.SetInvokeHandler(LINK(this, PrintFontManager, autoInstallFontLangSupport)); m_aFontInstallerTimer.SetTimeout(5000); #endif