[libreoffice] 02/06: enable pdfium again. only internal lib still is lcms2

[Rene Engelhard]

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

rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.

commit ed553dd1e5907ca4749bae33fd3f9a372a07db11
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Apr 15 17:54:29 2017 +0200

    enable pdfium again. only internal lib still is lcms2
    
    This reverts commit 759ce0334beb31ef30d4380e1c1616ff3acab237.
---
 changelog               | 10 ++++++++--
 copyright               |  5 +++++
 rules                   |  2 +-
 source/include-binaries |  1 +
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index e39efd0..778d249 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,17 @@
 libreoffice (1:5.4.0~alpha0~git20170415-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
+    - is now able to do "insert->image, choose pdf". Not insert->docunent
+      but close enough, so this closes: #814598
+      (unfortunately only using internal pdfium. sigh.)
 
   * debian/scripts/gid2pkgdirs.sh, debian/control{,.transitionals}.in:
     remove extra libreoffice-pdfimport, merge (even though the poppler
-    dependency...) back to -common/-core since with the (disabled) pdfium
-    feature it may get confusing what is what.
+    dependency...) back to -common/-core since it has the above new feature and
+    otherwise it may get confusing what is what.
+
+  * tarballs/cfcb6b4f3b5b6097edc5df7903ef00ea-pdfium-3021.tar.bz2,
+    debian/copyright, debian/source/include-binaries: include pdfium
 
  -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 
diff --git a/copyright b/copyright
index e821d83..f3d05c3 100644
--- a/copyright
+++ b/copyright
@@ -462,6 +462,11 @@ Files: tarballs/*swingEx*
 Copyright: Copyright 2008 by Sun Microsystems, Inc.
 License: LGPL-3
 
+Files: tarballs/*pdfium*
+Copyright: // Copyright 2014-2016 PDFium Authors.
+           // Original code copyright 2014 Foxit Software Inc.
+License: BSD
+
 Files: debian/missing-sources/jquery-3.1.1.js
 Copyright: Copyright jQuery Foundation and other contributors 
 License: MIT
diff --git a/rules b/rules
index c9c6276..d70b493 100755
--- a/rules
+++ b/rules
@@ -432,7 +432,7 @@ SYSTEM_STUFF += odbc
 SYSTEM_STUFF += curl
 SYSTEM_STUFF += sane
 SYSTEM_STUFF += poppler
-ENABLE_PDFIUM=n
+ENABLE_PDFIUM=y
 SYSTEM_STUFF += libpng
 SYSTEM_STUFF += nss
 ENABLE_HELP=y
diff --git a/source/include-binaries b/source/include-binaries
index b942f39..abf2e8f 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,3 +5,4 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+tarballs/cfcb6b4f3b5b6097edc5df7903ef00ea-pdfium-3021.tar.bz2

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