[libreoffice] 02/02: hardcode xpdfimport paths for apparmor

[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 623c57cbfc8a56c4ea64fce420084272e0a9c621
Author: Rene Engelhard <rene at rene-engelhard.de>
Date:   Sat Dec 2 12:06:19 2017 +0100

    hardcode xpdfimport paths for apparmor
---
 changelog                    |  6 ++++--
 patches/series               |  1 +
 patches/xpdfimport-path.diff | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/changelog b/changelog
index 1285335..f9cc569 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,9 @@ 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 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
   * debian/libreoffice-common.triggers.in: switch to interest-noawait triggers
@@ -13,7 +15,7 @@ libreoffice (1:5.4.4~rc1-1) UNRELEASED; urgency=medium
     - stop installing disabled symlinks for apparmor
   * debian/libreoffice-common.bug-script.in: run aa-status
 
- -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 00:50:38 +0100
+ -- Rene Engelhard <rene at debian.org>  Sat, 02 Dec 2017 12:05:38 +0100
 
 libreoffice (1:5.4.3-3) unstable; urgency=medium
 
diff --git a/patches/series b/patches/series
index 52dade8..00ce8c3 100644
--- a/patches/series
+++ b/patches/series
@@ -38,3 +38,4 @@ 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
new file mode 100644
index 0000000..7009bba
--- /dev/null
+++ b/patches/xpdfimport-path.diff
@@ -0,0 +1,18 @@
+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