[Libreoffice-commits] .: Branch 'feature/gnumake4' - 2 commits - cairo/cairo-1.8.0.patch cairo/prj

[Bjoern Michaelsen]

 cairo/cairo-1.8.0.patch |    4 ++--
 cairo/prj/build.lst     |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 1464d3f520a3a3502ffa4bbae11cd453c839c3e5
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Apr 6 13:06:33 2011 +0200

    masterfix DEV300: #i10000# missing stlport dep [hg:5d377dd89e6b]

diff --git a/cairo/prj/build.lst b/cairo/prj/build.lst
index c531e6c..c59a5c4 100644
--- a/cairo/prj/build.lst
+++ b/cairo/prj/build.lst
@@ -1,4 +1,4 @@
-lcairo	cairo	: ZLIB:zlib soltools NULL
+lcairo	cairo	: 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
commit a9a17544b085bf2536677927b8751f96e0f3a044
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Tue Apr 5 13:29:57 2011 +0200

    masterfix DEV300: #i10000# SRC_ROOT -> SOLARSRC [hg:5851574127d1]

diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index 424c604..dc2b6e4 100644
--- a/cairo/cairo-1.8.0.patch
+++ b/cairo/cairo-1.8.0.patch
@@ -7,8 +7,8 @@ diff -ur misc/build/cairo-1.8.0.org/build/Makefile.win32.common misc/build/cairo
  
 -PIXMAN_CFLAGS := -I$(top_srcdir)/../pixman/pixman
 -PIXMAN_LIBS := $(top_builddir)/../pixman/pixman/$(CFG)/pixman-1.lib
-+PIXMAN_CFLAGS := -I$(SRC_ROOT)/cairo/$(INPATH)/inc
-+PIXMAN_LIBS := $(SRC_ROOT)/cairo/$(INPATH)/lib/pixman-1.lib
++PIXMAN_CFLAGS := -I$(SOLARSRC)/cairo/$(INPATH)/inc
++PIXMAN_LIBS := $(SOLARSRC)/cairo/$(INPATH)/lib/pixman-1.lib
  
  CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
  ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)