[libreoffice] 01/01: revert xpdfimport-path.diff for now; breaks pdf import tests...

[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 76ba994d7f84c2290d8e0fedcf0d394d119a98ef
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sun Dec 3 10:53:39 2017 +0100

    revert xpdfimport-path.diff for now; breaks pdf import tests...
---
 changelog                    |  4 ----
 patches/series               |  1 -
 patches/xpdfimport-path.diff | 18 ------------------
 3 files changed, 23 deletions(-)

diff --git a/changelog b/changelog
index 7c756e3..cbbd7a3 100644
--- a/changelog
+++ b/changelog
@@ -4,10 +4,6 @@ libreoffice (1:5.4.4~rc1-1) UNRELEASED; urgency=medium
 
   * debian/patches/apparmor-complain.diff: set complain mode for oosplash
     and soffice.bin profiles
-  * debian/patches/xpdfimport-path.diff: hardcode /usr/lib/libreoffice
-    (and .../share) to find xpdfimport, otherwise the call of
-    /usr/lib/libreoffice/program/../program/xpdfimport seems to
-    be rejected by apparmor (closes: #883275)
 
   * debian/libreoffice-common.{triggers,postinst}.in,
     debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
diff --git a/patches/series b/patches/series
index 00ce8c3..52dade8 100644
--- a/patches/series
+++ b/patches/series
@@ -38,4 +38,3 @@ ww8export-HAVE_MORE_FONTS.diff
 java9.diff
 icu-60.diff
 apparmor-complain.diff
-xpdfimport-path.diff
diff --git a/patches/xpdfimport-path.diff b/patches/xpdfimport-path.diff
deleted file mode 100644
index 7009bba..0000000
--- a/patches/xpdfimport-path.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx
-index a31e78cb1100..efc544d9b332 100644
---- a/sdext/source/pdfimport/wrapper/wrapper.cxx
-+++ b/sdext/source/pdfimport/wrapper/wrapper.cxx
-@@ -1046,11 +1046,11 @@ bool xpdf_ImportFromFile( const OUString&                             rURL,
-     }
- 
-     // Determine xpdfimport executable URL:
--    OUString converterURL("$BRAND_BASE_DIR/" LIBO_BIN_FOLDER "/xpdfimport");
-+    OUString converterURL("/usr/lib/libreoffice/program/xpdfimport");
-     rtl::Bootstrap::expandMacros(converterURL); //TODO: detect failure
- 
-     // Determine pathname of xpdfimport_err.pdf:
--    OUString errPathname("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/xpdfimport/xpdfimport_err.pdf");
-+    OUString errPathname("/usr/lib/libreoffice/share/xpdfimport/xpdfimport_err.pdf");
-     rtl::Bootstrap::expandMacros(errPathname); //TODO: detect failure
-     if (osl::FileBase::getSystemPathFromFileURL(errPathname, errPathname)
-         != osl::FileBase::E_None)

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