[libreoffice] 01/02: fix no-packagekit-per-default.diff

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 21e9dd1f6a8a669c81f852412c5511d7833e6046
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Jul 17 21:26:05 2017 +0200

    fix no-packagekit-per-default.diff
---
 patches/no-packagekit-per-default.diff | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index e3bdb34..4e29b46 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -204,7 +204,7 @@ index 1c3114e43bbc..41e045dd9978 100644
      Timer m_aFontInstallerTimer;
  
 -#if ENABLE_GIO
-+#if ENABLE_DBUS && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
++#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
      DECL_LINK( autoInstallFontLangSupport, Timer*, void );
  #endif
      PrintFontManager();
@@ -249,10 +249,10 @@ index 68d00eb0d6bf..a163694012a4 100644
                  {
                      if (sStillMissing == rMissingCodes) //replaced nothing
 diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx b/vcl/unx/generic/fontmanager/fontmanager.cxx
-index 6726deeefb90..4cc8ab56e650 100644
+index 6726deeefb90..9e5a940a4b84 100644
 --- a/vcl/unx/generic/fontmanager/fontmanager.cxx
 +++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
-@@ -134,13 +134,13 @@ PrintFontManager::PrintFontManager()
+@@ -134,7 +134,7 @@ PrintFontManager::PrintFontManager()
      : m_nNextFontID( 1 )
      , m_nNextDirAtom( 1 )
  {
@@ -261,10 +261,3 @@ index 6726deeefb90..4cc8ab56e650 100644
      m_aFontInstallerTimer.SetInvokeHandler(LINK(this, PrintFontManager, autoInstallFontLangSupport));
      m_aFontInstallerTimer.SetTimeout(5000);
  #endif
- }
- 
--PrintFontManager::~PrintFontManager()
-+PrintFontManager::~PrintFontManage r()
- {
-     m_aFontInstallerTimer.Stop();
-     deinitFontconfig();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git