[libreoffice] 03/03: git update; update no-packagekit-per-default.diff to apply again
Rene Engelhard
rene at moszumanska.debian.org
Sun Oct 9 20:20:13 UTC 2016
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.
commit b3c75fa5a039204836135a77b33c80d99eece758
Author: Rene Engelhard <rene at debian.org>
Date: Sun Oct 9 22:20:05 2016 +0200
git update; update no-packagekit-per-default.diff to apply again
---
changelog | 2 +-
patches/no-packagekit-per-default.diff | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/changelog b/changelog
index 5edc2bf..df8e6b6 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:5.3.0~alpha0~git20160920-1) UNRELEASED; urgency=medium
+libreoffice (1:5.3.0~alpha0~git20161009-1) UNRELEASED; urgency=medium
* New upstream snapshot
- fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index 5b4501b..2c0d5a6 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -100,7 +100,7 @@ index 1ffe504..d365800 100644
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
- DECL_LINK_TYPED( autoInstallFontLangSupport, Timer*, void );
+ DECL_LINK( autoInstallFontLangSupport, Timer*, void );
#endif
PrintFontManager();
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -131,7 +131,7 @@ index aff2848..8def362 100644
-#if ENABLE_DBUS
+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
- IMPL_LINK_NOARG_TYPED(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
+ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
{
guint xid = get_xid_for_dbus();
@@ -1098,7 +1098,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list