[libreoffice] 02/02: fix build with hunspell 1.4
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 99924ff4697e3e45f22d5c56aad54cb40db00c51
Author: Rene Engelhard <rene@debian.org>
Date: Tue Apr 19 20:05:43 2016 +0200
fix build with hunspell 1.4
---
changelog | 3 +++
patches/remove-obsolete-dictmgr-include.diff | 25 +++++++++++++++++++++++++
patches/series | 1 +
3 files changed, 29 insertions(+)
diff --git a/changelog b/changelog
index dad0b48..4a80494 100644
--- a/changelog
+++ b/changelog
@@ -1,5 +1,8 @@
libreoffice (1:5.1.2-5) UNRELEASED; urgency=medium
+ * debian/patches/remove-obsolete-dictmgr-include.diff: as name says;
+ from libreoffice-5-1 branch. Fix build with hunspell 1.4
+
* debian/rules:
- (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure
we build against 3.20
diff --git a/patches/remove-obsolete-dictmgr-include.diff b/patches/remove-obsolete-dictmgr-include.diff
new file mode 100644
index 0000000..d0f7b73
--- /dev/null
+++ b/patches/remove-obsolete-dictmgr-include.diff
@@ -0,0 +1,25 @@
+From f71ba9fb64ae116236305bcf1b3f7054f365fd3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Mon, 18 Apr 2016 14:50:22 +0100
+Subject: unused header file which is no longer in hunspell 4-0
+
+Change-Id: Ia1deaca48d653518cf6f440a833752268c47aaf3
+Reviewed-on: https://gerrit.libreoffice.org/24218
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: David Tardon <dtardon@redhat.com>
+
+diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+index 928b191..21d811b 100644
+--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
++++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+@@ -29,7 +29,6 @@
+
+ #include <lingutil.hxx>
+ #include <hunspell.hxx>
+-#include <dictmgr.hxx>
+ #include <sspellimp.hxx>
+
+ #include <linguistic/lngprops.hxx>
+--
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index ef31e88..3db9610 100644
--- a/patches/series
+++ b/patches/series
@@ -40,3 +40,4 @@ sdkname-lo.diff
liborcus-0.11.diff
don-t-install-qstart.desktop-if-it-s-disabled.diff
fix-list-and-comboboxes-with-gtk3-3-20-2.diff
+remove-obsolete-dictmgr-include.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: