From 6edf6115c12d1b432fbca147daa3bb81131d6011 Mon Sep 17 00:00:00 2001 From: Rene Engelhard Date: Sun, 21 Feb 2016 02:20:43 +0100 Subject: [PATCH] Revert "always support packagekit if dbus is enabled" This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901. Gbp-Pq: Name no-packagekit-per-default.diff --- Repository.mk | 2 +- RepositoryExternal.mk | 6 ++++++ config_host.mk.in | 1 + configure.ac | Bin 450585 -> 451131 bytes postprocess/Rdb_services.mk | 4 +++- sfx2/source/appl/appserv.cxx | 9 +++++++++ shell/Module_shell.mk | 2 ++ sw/source/uibase/app/apphdl.cxx | 8 ++++++++ vcl/inc/unx/fontmanager.hxx | 4 ++-- vcl/unx/generic/fontmanager/fontconfig.cxx | 8 ++++---- vcl/unx/generic/fontmanager/fontmanager.cxx | 2 +- 11 files changed, 37 insertions(+), 9 deletions(-) diff --git a/Repository.mk b/Repository.mk index 89370213450..24d2e179af1 100644 --- a/Repository.mk +++ b/Repository.mk @@ -307,7 +307,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 847a5b5ceb2..dd5673901bc 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2628,6 +2628,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 7907a26f8d1..6040362941d 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -152,6 +152,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 836862d16729fad2cef9c79c9a63ae3b7342d3fe..c3d94c4365a39dbe41fbf6e3c557dfb819e30726 100644 GIT binary patch delta 320 zcmbPvKzjEP=?xbaPJXe_YV!9Le4GV|$=QkNso9y61A7&?;JlK_4s(IjQjo@#&54m?fsm)i7~zIy!qhy1RONhD_h6$fiC$b`~SAkgK1glaFhB09?*? wdg3fbmFcVdfL8dMu<%bWIKa#@-8zPqmr-xBp`I8QLTUSfP}c1SLfIm_0JV&9Z2$lO delta 72 zcmdmeM0(}{=?xbait8vOmX_q_CYEF-E2QP;l_+H96_+IDOg_KRdh+$TV$C-fwclLC b2*gZ4%)I^PB9?WV+c_dww{t|W8Fv8yx{e^8 diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index d83b30819cc..cf5053c1a72 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 1e2a2ec4984..c5feeab29ab 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -190,6 +190,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; @@ -206,8 +207,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 d1a54b9cf9e..1c24b85bd78 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 467112e5895..bad4d92c6ad 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; @@ -429,8 +430,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/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 03d033e8c7e..e03fe0a0e48 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -192,12 +192,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager static void addFontconfigDir(const OString& rDirectory); std::set m_aPreviousLangSupportRequests; -#if ENABLE_GIO +#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT) std::vector m_aCurrentRequests; #endif Timer m_aFontInstallerTimer; -#if ENABLE_GIO +#if ENABLE_GIO && defined (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 2c16e040cda..fadb86cabf2 100644 --- a/vcl/unx/generic/fontmanager/fontconfig.cxx +++ b/vcl/unx/generic/fontmanager/fontconfig.cxx @@ -40,7 +40,7 @@ using namespace psp; #include #include -#if ENABLE_GIO +#if ENABLE_GIO && defined (ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) #include #endif @@ -863,7 +863,7 @@ namespace return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8); } -#if ENABLE_GIO +#if ENABLE_GIO && defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT) guint get_xid_for_dbus() { // FIXME: Application::GetActiveTopWindow only returns something sensible if LO currently has the focus @@ -875,7 +875,7 @@ namespace #endif } -#if ENABLE_GIO +#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT) IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void) { if (!officecfg::Office::Common::PackageKit::EnableFontInstallation::get()) @@ -1107,7 +1107,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi } } OUString sStillMissing(pRemainingCodes.get(), nRemainingLen); -#if ENABLE_GIO +#if ENABLE_GIO && defined (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 c956345e6fd..68d867d5c73 100644 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx @@ -146,7 +146,7 @@ PrintFontManager::PrintFontManager() : m_nNextFontID( 1 ) , m_nNextDirAtom( 1 ) { -#if ENABLE_GIO +#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT) m_aFontInstallerTimer.SetInvokeHandler(LINK(this, PrintFontManager, autoInstallFontLangSupport)); m_aFontInstallerTimer.SetTimeout(5000); #endif -- 2.30.2