[libreoffice] 04/04: update patches/no-packagekit-per-default.diff
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 13 22:16:26 UTC 2017
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 857855918ff3ae111bb632a1942c3be189403821
Author: Rene Engelhard <rene at debian.org>
Date: Fri Jul 14 00:16:17 2017 +0200
update patches/no-packagekit-per-default.diff
---
patches/no-packagekit-per-default.diff | 154 +++++++++++++++++----------------
1 file changed, 79 insertions(+), 75 deletions(-)
diff --git a/patches/no-packagekit-per-default.diff b/patches/no-packagekit-per-default.diff
index a16c1a4..dc02d76 100644
--- a/patches/no-packagekit-per-default.diff
+++ b/patches/no-packagekit-per-default.diff
@@ -84,81 +84,6 @@ index b6f6f37..c6a9b7d 100644
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 void 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( 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 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(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()
- : m_nNextFontID( 1 )
- , m_nNextDirAtom( 1 )
- {
--#if ENABLE_DBUS
-+#if ENABLE_DBUS && defined(ENABLE_PACKAGEKIT)
- m_aFontInstallerTimer.SetInvokeHandler(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
@@ -264,3 +189,82 @@ index c411fc1..d540983 100644
$(if $(ENABLE_GSTREAMER_1_0), \
avmedia/source/gstreamer/avmediagstreamer \
) \
+diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx
+index 1c3114e43bbc..41e045dd9978 100644
+--- a/vcl/inc/unx/fontmanager.hxx
++++ b/vcl/inc/unx/fontmanager.hxx
+@@ -202,12 +202,12 @@ class VCL_PLUGIN_PUBLIC PrintFontManager
+ static void 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( autoInstallFontLangSupport, Timer*, void );
+ #endif
+ PrintFontManager();
+diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx b/vcl/unx/generic/fontmanager/fontconfig.cxx
+index 68d00eb0d6bf..a163694012a4 100644
+--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
++++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
+@@ -40,7 +40,7 @@ using namespace psp;
+ #include <ft2build.h>
+ #include <fontconfig/fcfreetype.h>
+
+-#if ENABLE_GIO
++#if ENABLE_GIO && defined(ENABLE_PACKAGEKIT)
+ #include <gio/gio.h>
+ #endif
+
+@@ -862,7 +862,7 @@ namespace
+ return OStringToOUString(aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8);
+ }
+
+-#if ENABLE_GIO
++#if ENABLE_GIO && defined(ENABLE_DBUS) && defined(ENABLE_PACKAGEKIT)
+ guint get_xid_for_dbus()
+ {
+ // FIXME: Application::GetActiveTopWindow only returns something sensible if LO currently has the focus
+@@ -874,7 +874,7 @@ namespace
+ #endif
+ }
+
+-#if ENABLE_GIO
++#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
+ IMPL_LINK_NOARG(PrintFontManager, autoInstallFontLangSupport, Timer *, void)
+ {
+ if (!officecfg::Office::Common::PackageKit::EnableFontInstallation::get())
+@@ -1106,7 +1106,7 @@ void PrintFontManager::Substitute( FontSelectPattern &rPattern, OUString& rMissi
+ }
+ }
+ OUString sStillMissing(pRemainingCodes.get(), nRemainingLen);
+-#if ENABLE_GIO
++#if ENABLE_GIO && defined (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 6726deeefb90..4cc8ab56e650 100644
+--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
++++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
+@@ -134,13 +134,13 @@ PrintFontManager::PrintFontManager()
+ : m_nNextFontID( 1 )
+ , m_nNextDirAtom( 1 )
+ {
+-#if ENABLE_GIO
++#if ENABLE_GIO && defined (ENABLE_DBUS) && defined (ENABLE_PACKAGEKIT)
+ 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
More information about the Pkg-openoffice-commits
mailing list