From b68c2a52f34b1189b55d2487695257ca7517526b 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 460695 -> 461241 bytes .../data/org/openoffice/Office/Common.xcu | 4 ++-- .../schema/org/openoffice/Office/Common.xcs | Bin 258005 -> 258007 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 dbca1985ad0..64f95e3c1ce 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2692,6 +2692,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 687af25e24f..7104e271769 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -157,6 +157,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 fb4050e0fda82609c52f24582639ca13ecd83abc..2e424356286e34bb5ad7009d10e8f4121a9715e4 100644 GIT binary patch delta 333 zcmbQ*7l8nR>h0J1w#L|*{g|z&<5`{_2Rhk)B zwll6|1Y#y2X5P-Yl7;uS99T9puec;JCr6izp$iR8r7Q zR8Ue$%}Y$mNsUK{Pd8Ly5}970!Nf9s{ajXdt^h}8Z%21mZ_kkF8zR}1r*#4)?0J}Y zr_U{CV&_K4+D`wd%B(W|!UQHM0Ud>uq|#!Al+0p~;VF9488@(sb0Q2<& - 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 6b5729412f6e8bac3fc7848d0010e9f1882f42f3..97658dc03d998c18901501cd75b6ba7559d884f5 100644 GIT binary patch delta 38 ucmcb5pa1%O{)QID7N#xC^IuICurr!|;T7{aAVXpD1Yf!Bw_h{=Vg>+Rz7drG delta 40 ycmV+@0N4N5-w)N_4}gRLgaWh!pX!%DGXpV~(dq-vm!LfXACr(x9=F}=1NsAgq!LyD 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