From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egRub-0008BW-KK for guix-patches@gnu.org; Tue, 30 Jan 2018 04:09:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egRuY-00071r-CD for guix-patches@gnu.org; Tue, 30 Jan 2018 04:09:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:40641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1egRuY-00071l-8O for guix-patches@gnu.org; Tue, 30 Jan 2018 04:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1egRuY-0001Is-2O for guix-patches@gnu.org; Tue, 30 Jan 2018 04:09:02 -0500 Subject: [bug#30292] [PATCH] gnu: libreoffice: Fix build with Poppler >= 0.62.0. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:43054) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1egRu8-000871-1N for guix-patches@gnu.org; Tue, 30 Jan 2018 04:08:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1egRu2-0006qo-3n for guix-patches@gnu.org; Tue, 30 Jan 2018 04:08:35 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:35485) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1egRu1-0006qZ-QN for guix-patches@gnu.org; Tue, 30 Jan 2018 04:08:30 -0500 Received: from jasmine.lan (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id 086E3244E7 for ; Tue, 30 Jan 2018 04:08:29 -0500 (EST) From: Leo Famulari Date: Tue, 30 Jan 2018 04:08:24 -0500 Message-Id: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30292@debbugs.gnu.org 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