[libreoffice] 01/01: backport libebook-1.2.so.19 addition to EApi.cxx from master

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 57270f73f91956e0f0a25f0528495020b0b88208
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Thu Jul 27 00:00:07 2017 +0200

    backport libebook-1.2.so.19 addition to EApi.cxx from master
---
 changelog                       |  2 ++
 patches/libebook-1.2.so.19.diff | 25 +++++++++++++++++++++++++
 patches/series                  |  1 +
 3 files changed, 28 insertions(+)

diff --git a/changelog b/changelog
index f3bc6c9..4282074 100644
--- a/changelog
+++ b/changelog
@@ -6,6 +6,8 @@ libreoffice (1:5.4.0-1) unstable; urgency=medium
 
   * debian/patches/examples-fix-SDK_AUTO_DEPLOYMENT-check.diff: don't try
     to do "auto deployment" when SDK_AUTO_DEPLOYMENT = NO...
+  * debian/patches/libebook-1.2.so.19.diff: backport from master; adds
+    libebook-1.2.so.19 (e-d-s 3.24+) to EApi.cxx
 
   * debian/rules:
     - strip librhino-java from java:Depends, we use the internal one still..
diff --git a/patches/libebook-1.2.so.19.diff b/patches/libebook-1.2.so.19.diff
new file mode 100644
index 0000000..3471977
--- /dev/null
+++ b/patches/libebook-1.2.so.19.diff
@@ -0,0 +1,25 @@
+From 5844d813411be8c4c7c394be07a49eaf92885758 Mon Sep 17 00:00:00 2001
+From: Rico Tzschichholz <ricotz at ubuntu.com>
+Date: Mon, 24 Jul 2017 11:24:48 +0200
+Subject: add libebook-1.2.so.19 in EApi.cxx
+
+Change-Id: I900a190948087360bb4c3cd9235c9848333ad66f
+Reviewed-on: https://gerrit.libreoffice.org/40358
+Tested-by: Jenkins <ci at libreoffice.org>
+Reviewed-by: Michael Stahl <mstahl at redhat.com>
+
+diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
+index fc81a19..81db0b0 100644
+--- a/connectivity/source/drivers/evoab2/EApi.cxx
++++ b/connectivity/source/drivers/evoab2/EApi.cxx
+@@ -21,6 +21,7 @@
+ #define  DECLARE_FN_POINTERS 1
+ #include "EApi.h"
+ static const char *eBookLibNames[] = {
++    "libebook-1.2.so.19", // evolution-data-server 3.24+
+     "libebook-1.2.so.16",
+     "libebook-1.2.so.15",
+     "libebook-1.2.so.14", // bumped again (evolution-3.6)
+-- 
+cgit v0.10.2
+
diff --git a/patches/series b/patches/series
index 538a3fb..3471358 100644
--- a/patches/series
+++ b/patches/series
@@ -32,3 +32,4 @@ cppunit-optional.diff
 disable-unused-test-programs.diff
 gb_SUPPRESS_TESTS.diff
 examples-fix-SDK_AUTO_DEPLOYMENT-check.diff
+libebook-1.2.so.19.diff

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