You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2024/01/03 15:36:50 UTC

(openoffice) branch AOO42X updated: cairo should depend on libpng, as it sometimes breaks the build by trying to compile before libpng is delivered.

This is an automated email from the ASF dual-hosted git repository.

damjan pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/AOO42X by this push:
     new c9c32730cd cairo should depend on libpng, as it sometimes breaks the build by trying to compile before libpng is delivered.
c9c32730cd is described below

commit c9c32730cd140d9f09f80e3a8c0fc2550d53e3d3
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Wed Jan 3 17:24:28 2024 +0200

    cairo should depend on libpng, as it sometimes breaks the build by
    trying to compile before libpng is delivered.
    
    Fixes: #117726 - cairo fails to build, lacking dependency on libpng
    Patch by: me
    
    (cherry picked from commit ffe480edf9795ab6c9560d4de9cc8f7274b56bc1)
---
 main/cairo/prj/build.lst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/cairo/prj/build.lst b/main/cairo/prj/build.lst
index c59a5c4bbd..b34bcb0fb2 100644
--- a/main/cairo/prj/build.lst
+++ b/main/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo	cairo	: ZLIB:zlib soltools stlport NULL
+lcairo	cairo	: LIBPNG:libpng ZLIB:zlib soltools stlport NULL
 lcairo	cairo			    usr1	-	all	lcairo_mkout NULL
 lcairo	cairo\pixman		    nmake	-	all	lcairo_pixman NULL
 lcairo	cairo\cairo		    nmake	-	all	lcairo_cairo lcairo_pixman NULL