From 648e4106cc002ff5b8184a8c104f93cb06e4b540 Mon Sep 17 00:00:00 2001
From: Michael Warner <michael.warner.ut+libreoffice@gmail.com>
Date: Tue, 11 May 2021 09:22:27 -0400
Subject: tdf#141709: Use poppler_data

Bundle the files from poppler_data and provide the path to them to
poppler when the bundled poppler library is used.

Change-Id: I13a2ef861303a0be17aa0a861ef8ac96ed8a93be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117523
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
---
 readlicense_oo/license/license.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

(limited to 'readlicense_oo/license')

diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index bb64fedc05de..02a91d7c1daf 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1641,6 +1641,39 @@
         <p>The following software may be included in this product: poppler. Use of any of this software is governed by
         the terms of the license below:</p>
         <p><a href="#a__GPL_version_2">Jump to GPL Version 2</a></p>
+        <p>The cidToUnicode, nameToUnicode and unicodeMap data files
+        installed by the poppler-data package are Copyright Glyph &amp; Cog, LLC
+        and are licensed under the GNU General Public License (GPL), <a href="#a__GPL_version_2">version 2</a>
+        or <a href="#a__GPL_version_3">version 3</a>.</p>
+        <p>The cMap data files installed by the poppler-data package are governed by the terms of the license below:</p>
+        <p>Copyright 1990-2019 Adobe.</p>
+        <p>All rights reserved.</p>
+        <p>Redistribution and use in source and binary forms, with or
+        without modification, are permitted provided that the
+        following conditions are met:</p>
+        <p>Redistributions of source code must retain the above
+        copyright notice, this list of conditions and the following
+        disclaimer.</p>
+        <p>Redistributions in binary form must reproduce the above
+        copyright notice, this list of conditions and the following
+        disclaimer in the documentation and/or other materials
+        provided with the distribution.</p>
+        <p>Neither the name of Adobe nor the names of its contributors
+        may be used to endorse or promote products derived from
+        this software without specific prior written permission.</p>
+        <p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+        CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+        INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+        MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+        CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+        SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+        NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+        LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+        HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+        CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+        OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+        SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
     </div>
     <div class="POSTGRES">
         <h2>PostgreSQL</h2>
-- 
cgit v1.2.3