Re: [Libreoffice-commits] core.git: xmlsecurity/Module_xmlsecurity.mk

Miklos Vajna <vmiklos -AT- collabora.co.uk>

Tue, 2 May 2017 09:26:39 +0200

Hi, On Sat, Apr 29, 2017 at 07:04:58PM +0000, Caolán McNamara <caolanm@redhat.com> wrote:

 xmlsecurity/Module_xmlsecurity.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8d747b8cf849b7d705048544ac20eceba7eb5a45
Author: Caol??n McNamara <caolanm@redhat.com>
Date:   Sat Apr 29 20:01:40 2017 +0100

    tweak for pdfiumless build
    
    Change-Id: Ic83f0e0491bede43dba7f22c5bd6c31b95e65df1

diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index d3fafeb7e4ec..79675290fcd3 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -46,12 +46,14 @@ $(eval $(call gb_Module_add_screenshot_targets,xmlsecurity,\
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+ifneq (,$(filter PDFIUM,$(BUILD_TYPE)))

Is this necessary after 6f53cf281eb3c13fc516ff79decb70b2a87a96d0 from Markus? I suspect it's a mid-air collision that didn't result in a merge conflict by accident. Thanks, Miklos

Attachment: signature.asc
Description: Digital signature

Context

Re: [Libreoffice-commits] core.git: xmlsecurity/Module_xmlsecurity.mk · Miklos Vajna

Re: [Libreoffice-commits] core.git: xmlsecurity/Module_xmlsecurity.mk · Caolán McNamara

Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.