[libreoffice] 02/02: another no-packagekit-per-default.diff update

[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 923450bd2c1b3ba3f5ec3005965722007dc21829
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Jul 15 20:24:07 2017 +0200

    another no-packagekit-per-default.diff update
---
 changelog                              |  2 +-
 patches/no-packagekit-per-default.diff | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index f9d9dd1..6d3186b 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.0~alpha0~git20170713-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.0~alpha0~git20170715-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index dc02d76..e3bdb34 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -197,14 +197,14 @@ index 1c3114e43bbc..41e045dd9978 100644
      static void addFontconfigDir(const OString& rDirectory);
  
      std::set<OString> m_aPreviousLangSupportRequests;
--#if ENABLE_DBUS
-+#if ENABLE_DBUS && defined (ENABLE_PACKAGEKIT)
+-#if ENABLE_GIO
++#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
      std::vector<OString> m_aCurrentRequests;
  #endif
      Timer m_aFontInstallerTimer;
  
--#if ENABLE_DBUS
-+#if ENABLE_DBUS && defined (ENABLE_PACKAGEKIT)
+-#if ENABLE_GIO
++#if ENABLE_DBUS && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
      DECL_LINK( autoInstallFontLangSupport, Timer*, void );
  #endif
      PrintFontManager();
@@ -217,7 +217,7 @@ index 68d00eb0d6bf..a163694012a4 100644
  #include <fontconfig/fcfreetype.h>
  
 -#if ENABLE_GIO
-+#if ENABLE_GIO && defined(ENABLE_PACKAGEKIT)
++#if ENABLE_GIO && defined (ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
  #include <gio/gio.h>
  #endif
  

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