[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 60e0a71013be3aac80a0c8a4dc9a0a42360d3fdf
Merge: 4a7dee8 bd98dc7
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 1 08:13:09 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
patches/no-packagekit-per-default.diff
patches/series
changelog | 4 ++
patches/no-packagekit-per-default.diff | 105 +++++++++++++++++++++++++++++++++
rules | 8 +++
3 files changed, 117 insertions(+)
diff --cc patches/no-packagekit-per-default.diff
index 8e9669c,2992ba9..7b6e4b5
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@@ -1,161 -1,105 +1,266 @@@
+From 1c2296a3809ff9ef36564eff3abdf4c191a1d1c6 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene@debian.org>
+Date: Sun, 21 Feb 2016 02:20:43 +0100
+Subject: [PATCH] Revert "always support packagekit if dbus is enabled"
+
+This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.
+---
+ RepositoryExternal.mk | 6 ++++++
+ config_host.mk.in | 1 +
+ configure.ac | 22 +++++++++++++++++++++-
+ vcl/inc/unx/fontmanager.hxx | 4 ++--
+ vcl/unx/generic/fontmanager/fontconfig.cxx | 8 ++++----
+ vcl/unx/generic/fontmanager/fontmanager.cxx | 2 +-
+ 6 files changed, 35 insertions(+), 8 deletions(-)
+
+diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
+index d0ee166..fd20bfd 100644
+--- a/RepositoryExternal.mk
++++ b/RepositoryExternal.mk
+@@ -2537,6 +2537,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 6170227..2721820 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
+@@ -157,6 +157,7 @@ export ENABLE_EXTENSION_UPDATE=@ENABLE_EXTENSION_UPDATE@
+ export ENABLE_OOENV=@ENABLE_OOENV@
+ export ENABLE_OPENGL=@ENABLE_OPENGL@
+ export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
++export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
+ export ENABLE_PCH=@ENABLE_PCH@
+ export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
+ export ENABLE_RANDR=@ENABLE_RANDR@
+diff --git a/configure.ac b/configure.ac
+index b6f6f37..c6a9b7d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1216,9 +1216,15 @@ AC_ARG_ENABLE(cairo-canvas,
+ AC_ARG_ENABLE(dbus,
+ AS_HELP_STRING([--disable-dbus],
+ [Determines whether to enable features that depend on dbus.
+- e.g. Presentation mode screensaver control, bluetooth presentation control, automatic font install]),
++ e.g. Presentation mode screensaver control, bluetooth presentation control]),
+ ,enable_dbus=yes)
+
++AC_ARG_ENABLE(packagekit,
++ AS_HELP_STRING([--enable-packagekit],
++ [Determines whether to enable features using packagekit.
++ Right now that is auto font install]),
++,)
++
+ AC_ARG_ENABLE(sdremote,
+ AS_HELP_STRING([--disable-sdremote],
+ [Determines whether to enable Impress remote control (i.e. the server component).]),
+@@ -10046,6 +10052,20 @@ AC_SUBST(ENABLE_DBUS)
+ AC_SUBST(DBUS_CFLAGS)
+ AC_SUBST(DBUS_LIBS)
+
++AC_MSG_CHECKING([whether to enable font install via packagekit])
++if test "$ENABLE_DBUS" = "TRUE"; then
++ if test -n "$enable_packagekit" -a "$enable_packagekit" != "no"; then
++ ENABLE_PACKAGEKIT=TRUE
++ AC_MSG_RESULT([yes])
++ else
++ ENABLE_PACKAGEKIT=
++ AC_MSG_RESULT([no])
++ fi
++else
++ AC_MSG_RESULT([no, dbus disabled.])
++fi
++AC_SUBST(ENABLE_PACKAGEKIT)
++
+ AC_MSG_CHECKING([whether to enable Impress remote control])
+ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
+ AC_MSG_RESULT([yes])
+diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
+index 1ffe504..d365800 100644
+--- a/vcl/inc/unx/fontmanager.hxx
++++ b/vcl/inc/unx/fontmanager.hxx
+@@ -317,12 +317,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
+ static bool addFontconfigDir(const OString& rDirectory);
+
+ std::set<OString> m_aPreviousLangSupportRequests;
+-#if ENABLE_DBUS
++#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+ std::vector<OString> m_aCurrentRequests;
+ #endif
+ Timer m_aFontInstallerTimer;
+
+-#if ENABLE_DBUS
++#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+ DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void );
+ #endif
+ PrintFontManager();
+diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
+index aff2848..8def362 100644
+--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
++++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
+@@ -37,7 +37,7 @@ using namespace psp;
+ #include <ft2build.h>
+ #include <fontconfig/fcfreetype.h>
+
+-#if ENABLE_DBUS
++#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+ #include <dbus/dbus-glib.h>
+ #endif
+
+@@ -877,7 +877,7 @@ namespace
+ return LanguageTag(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();
+@@ -887,7 +887,7 @@ namespace
+ #endif
+ }
+
+-#if ENABLE_DBUS
++#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+ IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
+ {
+ guint xid = get_xid_for_dbus();
+@@ -1098,7 +1098,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 8089eae..b2525ac 100644
+--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
++++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
+@@ -674,7 +674,7 @@ PrintFontManager::PrintFontManager()
+ }
+ }
+
+-#if ENABLE_DBUS
++#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
+ m_aFontInstallerTimer.SetTimeoutHdl(LINK(this, PrintFontManager, autoInstallFontLangSupport));
+ m_aFontInstallerTimer.SetTimeout(5000);
+ #endif
+--
+2.1.4
+
+ diff --git a/Repository.mk b/Repository.mk
+ index 858be89..901085e 100644
+ --- a/Repository.mk
+ +++ b/Repository.mk
+ @@ -255,7 +278,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/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
+ index f467783..b48e763 100644
+ --- a/sfx2/source/appl/appserv.cxx
+ +++ b/sfx2/source/appl/appserv.cxx
+ @@ -159,6 +159,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;
+ @@ -176,8 +177,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 17661e9..99becfd 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 896b365..5be6a92 100644
+ --- a/sw/source/uibase/app/apphdl.cxx
+ +++ b/sw/source/uibase/app/apphdl.cxx
+ @@ -349,6 +349,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
+ {
+ if(!lcl_hasAllComponentsAvailable())
+ {
+ +#if defined (ENABLE_PACKAGEKIT)
+ try
+ {
+ using namespace org::freedesktop::PackageKit;
+ @@ -365,8 +366,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/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
+ index c411fc1..d540983 100644
+ --- a/postprocess/Rdb_services.mk
+ +++ b/postprocess/Rdb_services.mk
+ @@ -194,9 +194,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 --cc rules
index 13a7078,8ee5996..94223c5
--- a/rules
+++ b/rules
@@@ -2562,18 -2580,22 +2566,22 @@@ endi
ifeq "$(BUILD_GTK3)" "y"
rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
+ mkdir -p -m755 debian/liblibreofficekitgtk/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so $(PKGDIR)-gtk3/$(OODIR)/program/
- mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so $(PKGDIR)-gtk3/$(OODIR)/program/
+ mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so debian/liblibreofficekitgtk/$(OODIR)/program/
endif
- mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
- mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-open-url $(PKGDIR)-gnome/$(OODIR)/program
+ mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk2/$(OODIR)/program/
ifeq "$(BUILD_GTK)" "y"
- mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
- mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
+ mkdir -p -m755 $(PKGDIR)-gtk2/$(OODIR)/share
+ mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk2/$(OODIR)/share
ifeq "$(ENABLE_GIO)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
+ mv $(PKGDIR)-gtk2/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
endif
+ ifeq "$(ENABLE_PACKAGEKIT)" "y"
+ mv $(PKGDIR)-gtk/$(OODIR)/program/liblosessioninstalllo.so \
+ $(PKGDIR)-gnome/$(OODIR)/program/
+ endif
endif
ifeq "$(ENABLE_EVO2)" "y"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: