[libreoffice] 01/02: git update; update split-evoab.diff; revert packagekit enabling per default...
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 dd85557b52fbc2051a64707114fac189316b8dcf
Author: Rene Engelhard <rene@debian.org>
Date: Sat Feb 20 17:47:19 2016 +0100
git update; update split-evoab.diff; revert packagekit enabling per default...
---
changelog | 2 +-
patches/no-packagekit-per-default.diff | 161 +++++++++++++++++++++++++++++++++
patches/series | 1 +
patches/split-evoab.diff | 4 +-
4 files changed, 165 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 65c4156..f51bef2 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.2.0~alpha1~git20160212-1) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1~git20160220-1) UNRELEASED; urgency=medium
* New upstream snapshot
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
new file mode 100644
index 0000000..8e9669c
--- /dev/null
+++ b/patches/no-packagekit-per-default.diff
@@ -0,0 +1,161 @@
+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/patches/series b/patches/series
index 3225d9f..e43f183 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
GCC-6-PR69273-workaround.diff
+no-packagekit-per-default.diff
diff --git a/patches/split-evoab.diff b/patches/split-evoab.diff
index 7a85501..5d5a9c4 100644
--- a/patches/split-evoab.diff
+++ b/patches/split-evoab.diff
@@ -21,7 +21,7 @@ index 08d9efe..492e274 100644
--- a/scp2/source/gnome/module_gnome.scp
+++ b/scp2/source/gnome/module_gnome.scp
@@ -30,6 +30,9 @@ Module gid_Module_Optional_Gnome
- #if defined ENABLE_GIO
+ #if ENABLE_GIO
gid_File_Share_Registry_Gnome_Xcd,
#endif
+#ifdef ENABLE_EVOAB2
@@ -51,8 +51,8 @@ index 686f6c1..d633c90 100644
--- a/scp2/InstallModule_gnome.mk
+++ b/scp2/InstallModule_gnome.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/gnome,gnome))
+
$(eval $(call gb_InstallModule_define_if_set,scp2/gnome,\
- ENABLE_GIO \
+ ENABLE_EVOAB2 \
ENABLE_GTK \
))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: