From 35bd5bccbc54b69a95165b5ae8ab6719e8ee9cc2 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 459411 -> 459957 bytes .../data/org/openoffice/Office/Common.xcu | 4 ++-- .../schema/org/openoffice/Office/Common.xcs | Bin 258026 -> 258028 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 | 8 ++++++++ 11 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Repository.mk b/Repository.mk index 3acad9d8083..70deb047954 100644 --- a/Repository.mk +++ b/Repository.mk @@ -312,7 +312,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 e498e8569f0..b16c591c727 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2687,6 +2687,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 9ed8f0a7ce5..c1ba96497ed 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -156,6 +156,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 fc70758a2ad2039b9564499518e558d790b21d74..c357ee18a24d5069f2cd5b8b48d433beef731db5 100644 GIT binary patch delta 347 zcmbQ-DzmjyW`oFz$&IT-COfQ96LWNqcMNimclC30@^RHDNKDR7Oi#_8+;~lD@_|Nn zE|@@O$>evdlqR2D!S0Zjnpjd=lv=D%TAZ1eu7FUX$E5%RL7C|pB?@`@HmiC6&~?#H5_mc$j;pf2d^>o9>{-#3BgsTzr6| zv$vzWtG8#!^uP>8*=g$;xu)}TG4W2%EoEZoM#$PuKd8*CGJQcGlhpLsR#tvSz3Csd en8dgcDyAFmVwIo1;4U+JJ6ApHcCLE1&Sn58n|aOv delta 81 zcmdnmDKoiMW`oEI2_1#R(vtk##FETpg|z&<5{1mX;*!LioXL$RMJ8*kP@BxLM0E21 jl^o3~E8A68G6FFZ5HoLAS;^9VtzD;)b-PX@TW2!>B7-0c diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index ca444c35223..3f42ee022c9 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -533,10 +533,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 3d73cc94deb2bbaf73896b1a176344e81ccd1798..0d1cce3bdd0a91e1c9e7de1080f9684c17b514c4 100644 GIT binary patch delta 43 zcmaELpa0E${)QID7N#xCTV72Turr#T@4>`2{q-y66F{EA2OcvF;O8 delta 60 zcmaEJpa0c;{)QID7N#xCTV73npu;FUeS!tE-1K}8CbsEsUNN5li%s6JUTZoVKO_J2 PPs~iR+vVOcpJN698`>Br diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 20cfc6cedeb..6ad48a1baf9 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -200,9 +200,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 1c19d40fecd..fadfc0ec57d 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -199,6 +199,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; @@ -215,8 +216,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 6d54617f026..b8f6772d824 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 75ce24b589a..6637dbdba72 100644 --- a/svtools/source/misc/langhelp.cxx +++ b/svtools/source/misc/langhelp.cxx @@ -139,8 +139,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence