On Sun, Feb 11, 2018 at 02:29:02PM +0000, Marius Bakke wrote: > I gave this a go, and there were (of course) a lot more changes > necessary to make this newer libreoffice build. In particular, it now > works with an external xmlsec (albeit NSS only), and it wants to build > PDFium(!) in the same fashion as xmlsec was previously. > > However PDFium fails to build due to requiring newer C++ features, and > my attempts at patching "external/pdfium/Library_pdfium.mk" to add > CXXFLAGS were unsuccessful. So in the end I disabled PDFium support. > > It also required libjpeg-turbo instead of libjpeg, although this is > supposedly fixed in 6.0.1: > . > > Then there were some other problems related to not finding GPGME > headers, as well as an upstream regression when GTK2 support is > disabled. > > Without further ado, here is the patch. I'm still building it, but plan > to push shortly if there are no further issues. Wow, thank you! > From a28e82e1e3d480d5edf374cea062536d4c8d6d82 Mon Sep 17 00:00:00 2001 > From: Marius Bakke > Date: Sun, 11 Feb 2018 11:46:27 +0100 > Subject: [PATCH] gnu: libreoffice: Update to 5.4.5.1 [CVE-2018-6871]. > > * gnu/packages/check.scm (cppunit-1.14): New public variable. > * gnu/packages/libreoffice.scm (xmlsec-src-libreoffice): Remove variable. > (libreoffice): Update to 5.4.5.1. > [native-inputs]: Change CPPUNIT to CPPUNIT-1.14. > [inputs]: Add GPGME and XMLSEC-NSS. Remove XMLSEC-SRC-LIBREOFFICE. Replace > LIBJPEG with LIBJPEG-TURBO. > [arguments]: Remove xmlsec code from PREPARE-SRC-PHASE. Make sure GPGME++ > headers are found. Add workaround for . Add > "--disable-pdfium" to #:configure-flags. > * gnu/packages/xml.scm (xmlsec-nss): New public variable. The only change I suggest is to remove the obsolete comment at the beginning of libreoffice's native-inputs about the xmlsec tarball.