[libreoffice] 01/01: Revert "actually _do_ enable pdfium even though it's a internal lib. close #814598"

[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 759ce0334beb31ef30d4380e1c1616ff3acab237
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Mar 5 20:37:46 2017 +0100

    Revert "actually _do_ enable pdfium even though it's a internal lib. close #814598"
    
    20:32 < _rene_> E: libreoffice-core: embedded-library usr/lib/libreoffice/program/libpdfiumlo.so: lcms2
    20:32 < _rene_> E: libreoffice-core: embedded-library usr/lib/libreoffice/program/libpdfiumlo.so: zlib
    20:32 < _rene_> E: libreoffice-core: embedded-library usr/lib/libreoffice/program/libpdfiumlo.so: libjpeg
    20:32 < _rene_> yay
    20:32 < _rene_> this means a autoreject
    20:33 < _rene_> looks I either need to add patches to use those system-libs or --disable-pdfium ;(
    20:34 < _rene_> % ls lcms2-2.6/*.patch | wc -l
    20:34 < _rene_> 17
    20:34 < _rene_> *shrugs*
    
    This reverts commit 887bf8d15b06caa576a2df670da1d62ecc932620.
---
 changelog               | 10 ++--------
 copyright               |  5 -----
 rules                   |  2 +-
 source/include-binaries |  1 -
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/changelog b/changelog
index 9eb6a8b..c234934 100644
--- a/changelog
+++ b/changelog
@@ -1,17 +1,11 @@
 libreoffice (1:5.4.0~alpha0~git20170224-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 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
+    dependency...) back to -common/-core since with the (disabled) pdfium
+    feature it may get confusing what is what.
 
  -- Rene Engelhard <rene at debian.org>  Thu, 24 Nov 2016 07:27:55 +0100
 
diff --git a/copyright b/copyright
index f3d05c3..e821d83 100644
--- a/copyright
+++ b/copyright
@@ -462,11 +462,6 @@ 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 52b2fa6..29f35d9 100755
--- a/rules
+++ b/rules
@@ -432,7 +432,7 @@ SYSTEM_STUFF += odbc
 SYSTEM_STUFF += curl
 SYSTEM_STUFF += sane
 SYSTEM_STUFF += poppler
-ENABLE_PDFIUM=y
+ENABLE_PDFIUM=n
 SYSTEM_STUFF += libpng
 SYSTEM_STUFF += nss
 ENABLE_HELP=y
diff --git a/source/include-binaries b/source/include-binaries
index abf2e8f..b942f39 100644
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,4 +5,3 @@ 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