[bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[Leo Famulari]

I'll push this if and when the build finishes and I confirm that
LibreOffice is still working.

* gnu/packages/libreoffice.scm (libreoffice)[arguments]: Patch header and
function names in 'prepare-src' phase.
---
 gnu/packages/libreoffice.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
index 799b06243..3c04ba8c4 100644
--- a/gnu/packages/libreoffice.scm
+++ b/gnu/packages/libreoffice.scm
@@ -945,6 +945,12 @@ and to return information on pronunciations, meanings and synonyms.")
            (add-before 'configure 'prepare-src
              (lambda* (#:key inputs #:allow-other-keys)
                (let ((xmlsec (assoc-ref inputs "xmlsec-src")))
+                 (substitute*
+                   "sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx"
+                   ;; This header was renamed in Poppler 0.62.0.
+                   (("UTF8.h") "UnicodeMapFuncs.h")
+                   ;; And mapUCS2() was renamed to mapUTF16().
+                   (("UCS2") "UTF16"))
                  (substitute*
                    (list "sysui/CustomTarget_share.mk"
                          "solenv/gbuild/gbuild.mk"
-- 
2.16.1

[bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 552 bytes --]

On Tue, Jan 30, 2018 at 04:08:24AM -0500, Leo Famulari wrote:
> I'll push this if and when the build finishes and I confirm that
> LibreOffice is still working.
> 
> * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Patch header and
> function names in 'prepare-src' phase.

This does allow the build to finish but I can't start the resulting
libreoffice.

During start it shows a dialogue that says "Fatal Error: The application
cannot be started. User installation could not be completed.".

I attached an strace of the startup.

[-- Attachment #1.2: log.xz --]
[-- Type: application/octet-stream, Size: 53852 bytes --]

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 879 bytes --]

On Tue, Jan 30, 2018 at 03:38:08PM -0500, Leo Famulari wrote:
> On Tue, Jan 30, 2018 at 04:08:24AM -0500, Leo Famulari wrote:
> > I'll push this if and when the build finishes and I confirm that
> > LibreOffice is still working.
> > 
> > * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Patch header and
> > function names in 'prepare-src' phase.
> 
> This does allow the build to finish but I can't start the resulting
> libreoffice.
> 
> During start it shows a dialogue that says "Fatal Error: The application
> cannot be started. User installation could not be completed.".
> 
> I attached an strace of the startup.

That strace was performed when I had only updated libreoffice in my
profile. There are some spurious issues like missing locales in that
log.

I've attached another one recorded after updating my entire profile to
core-updates.

[-- Attachment #1.2: log.xz --]
[-- Type: application/octet-stream, Size: 54680 bytes --]

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 347 bytes --]

On Tue, Jan 30, 2018 at 04:14:32PM -0500, Leo Famulari wrote:
> I've attached another one recorded after updating my entire profile to
> core-updates.

In the failing libreoffice startup trace, I see this line:

299 [pid 13010] open("/lib/x86_64-linux-gnu/libc.so.6", O_RDONLY|O_CLOEXEC) = 3

Libreoffice from the master branch does not try that.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#30292: [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 942 bytes --]

On Tue, Jan 30, 2018 at 03:38:08PM -0500, Leo Famulari wrote:
> On Tue, Jan 30, 2018 at 04:08:24AM -0500, Leo Famulari wrote:
> > I'll push this if and when the build finishes and I confirm that
> > LibreOffice is still working.
> > 
> > * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Patch header and
> > function names in 'prepare-src' phase.
> 
> This does allow the build to finish but I can't start the resulting
> libreoffice.
> 
> During start it shows a dialogue that says "Fatal Error: The application
> cannot be started. User installation could not be completed.".

The issue is related to how NSS is configured on my Debian system, and
glibc 2.26 retiring libnss_compat.so. If nscd is running, then
libreoffice has no problem figuring out where to install it's per-user
files. That general issue was discussed in <https://bugs.gnu.org/30298>.

So, pushed as eb096cdebab56680375b26069ec524ddec60267e.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0.

[Ludovic Courtès]

Leo Famulari <leo@famulari.name> skribis:

> I'll push this if and when the build finishes and I confirm that
> LibreOffice is still working.
>
> * gnu/packages/libreoffice.scm (libreoffice)[arguments]: Patch header and
> function names in 'prepare-src' phase.

Sounds good!

> +                 (substitute*
> +                   "sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx"
> +                   ;; This header was renamed in Poppler 0.62.0.
> +                   (("UTF8.h") "UnicodeMapFuncs.h")

I had briefly looked at the issue but couldn’t find where UTF8.h was
supposed to come from…

Thanks,
Ludo’.