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

Miklos Vajna vmiklos at collabora.co.uk
Tue May 2 07:26:39 UTC 2017


Hi,

On Sat, Apr 29, 2017 at 07:04:58PM +0000, Caolán McNamara <caolanm at redhat.com> wrote:
>  xmlsecurity/Module_xmlsecurity.mk |    2 ++
>  1 file changed, 2 insertions(+)
> 
> New commits:
> commit 8d747b8cf849b7d705048544ac20eceba7eb5a45
> Author: Caol??n McNamara <caolanm at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <https://lists.freedesktop.org/archives/libreoffice/attachments/20170502/6398cc9d/attachment.sig>


More information about the LibreOffice mailing list