From db7e3ede9d11270a822e361d0493ac79c5c01fc9 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 1 Sep 2018 18:29:04 +0200
Subject: [PATCH] fix build with mdds 1.4

---
 ...s-1.4.1-is-now-a-minimum-requirement.patch | 29 +++++++++++++++++++
 libreoffice.spec                              |  7 +++++
 2 files changed, 36 insertions(+)
 create mode 100644 0001-mdds-1.4.1-is-now-a-minimum-requirement.patch

diff --git a/0001-mdds-1.4.1-is-now-a-minimum-requirement.patch b/0001-mdds-1.4.1-is-now-a-minimum-requirement.patch
new file mode 100644
index 0000000..2e09b94
--- /dev/null
+++ b/0001-mdds-1.4.1-is-now-a-minimum-requirement.patch
@@ -0,0 +1,29 @@
+From 4d1f735fcf064b18ef2848cc1f5a2a0616b0b33d Mon Sep 17 00:00:00 2001
+From: Kohei Yoshida <kohei.yoshida@gmail.com>
+Date: Sun, 26 Aug 2018 14:19:57 -0400
+Subject: [PATCH] mdds 1.4.1 is now a minimum requirement.
+
+Change-Id: I647bcfbdd8e0417990ed93b25c1bca00f60df709
+Reviewed-on: https://gerrit.libreoffice.org/59614
+Tested-by: Jenkins
+Reviewed-by: Kohei Yoshida <libreoffice@kohei.us>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index efce45dbd370..46758b51037d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -8849,7 +8849,7 @@ AC_SUBST(SYSTEM_BOOST)
+ dnl ===================================================================
+ dnl Check for system mdds
+ dnl ===================================================================
+-libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.2 >= 1.2.3], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
++libo_CHECK_SYSTEM_MODULE([mdds], [MDDS], [mdds-1.4 >= 1.4.0], ["-I${WORKDIR}/UnpackedTarball/mdds/include"])
+ 
+ dnl ===================================================================
+ dnl Check for system glm
+-- 
+2.17.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index c02ed51..b1af5a1 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -237,7 +237,11 @@ BuildRequires: pkgconfig(libeot)
 BuildRequires: pkgconfig(libepubgen-0.1)
 BuildRequires: pkgconfig(liborcus-0.13)
 BuildRequires: pkgconfig(libqxp-0.0)
+%if 0%{?rhel}
 BuildRequires: pkgconfig(mdds-1.2)
+%else
+BuildRequires: pkgconfig(mdds-1.4)
+%endif
 BuildRequires: libnumbertext-devel
 %endif
 
@@ -270,6 +274,9 @@ Patch0: 0001-don-t-suppress-crashes.patch
 Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch
 # not upstreamed
 Patch2: 0001-gtk3-only-for-3.20.patch
+%if !0%{?rhel}
+Patch3: 0001-mdds-1.4.1-is-now-a-minimum-requirement.patch
+%endif
 
 %if 0%{?rhel}
 # not upstreamed