From bad62aac59cbecb22b0bda8da3aeebe5c7eb412f 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 466880 -> 467426 bytes .../data/org/openoffice/Office/Common.xcu | 4 ++-- .../schema/org/openoffice/Office/Common.xcs | Bin 261790 -> 261792 bytes postprocess/Rdb_services.mk | 4 +++- sfx2/source/appl/appserv.cxx | 9 +++++++++ shell/Module_shell.mk | 2 ++ svtools/source/misc/langhelp.cxx | 3 +-- sw/source/uibase/app/apphdl.cxx | 10 ++++++++++ 11 files changed, 35 insertions(+), 6 deletions(-) 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 6efaade1965..484fed98e73 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -166,6 +166,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 829e3d2c687dd3ac464f0f18bca4a2ceb7c2e106..ad8c847ed138af111ec9d123de06ec80b76967a6 100644 GIT binary patch delta 352 zcmX@GU*^$anGF`}CLg>YGC5_PnuMcsykn4iysMw1laH%LL1J=tVtQ(JX31p5yAqS8 zv2!7bY?!7r`M_EM^U~tXymSSGgdUdy32Ub0cJIrw49fR+;`QnoVl@wiB%UjC#}g i!0qYtrek3Phf8Vdld@_!xx delta 85 zcmaEKSmwZfnGF`}By)RdHGXgOa5HkZY%XWwLtjmNa&s;CoUVDUfd+ian)K~!fS0i%( 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 @@ - true + false - true + false diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 6d54c8159706a6294a444d8f35cf063e753ff3d1..9b0b39a932e65889dbd0806e951caca2f6c01f99 100644 GIT binary patch delta 43 zcmbRDmw&-u{)QID7N#xC89yfr*cnZq`IGq^kfAVng0I|kU4BOX?VEowzh(vioCXoj delta 43 zcmZ4Rmw(=0{)QID7N#xC89yf%95I|e>nHO$AVYrg1Yf!7y8Mj%+qeE=e$5O3!)6nk 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::SequenceisRestartRequested(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 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 ) { -- 2.30.2