Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2462

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/2462/1

Resolves: fdo#61571 cairo not linking against internal libpng

the flag is called SYSTEM_LIBPNG not SYSTEM_PNG

Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
(cherry picked from commit c0f85e6879e527ff0673c82e84e8ee0afcc6a5ec)
---
M cairo/ExternalProject_cairo.mk
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 54a220b..de3994f 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -40,7 +40,7 @@
                pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \
                COMPRESS=$(if $(filter YES,$(SYSTEM_ZLIB)),compress,z_compress) \
                ZLIB3RDLIB=-lz \
-               $(if $(filter NO,$(SYSTEM_PNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" 
png_LIBS="-L$(OUTDIR)/lib -lpng") \
+               $(if $(filter NO,$(SYSTEM_LIBPNG)),png_CFLAGS="-I$(OUTDIR)/inc/external/libpng" 
png_LIBS="-L$(OUTDIR)/lib -lpng") \
                $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \
                $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \
                $(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \

-- 
To view, visit https://gerrit.libreoffice.org/2462
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I703a669f544e539f7fcfa64c0121a73f0608aecc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Caolán McNamara <caolanm@redhat.com>


Context


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.