applied_patches/0229-cancas-cairo-linkflags.diff

   1 --- canvas/source/cairo/makefile.mk.old 2009-09-10 19:49:19.000000000 +0200
   2 +++ canvas/source/cairo/makefile.mk     2009-10-05 21:13:42.000000000 +0200
   3 @@ -91,7 +91,7 @@ SHL1STDLIBS= $(CPPULIB) $(TKLIB) $(SALLI
   4  .IF "$(SYSTEM_CAIRO)" == "YES"
   5  SHL1STDLIBS+= $(CAIRO_LIBS)
   6  .ELSE
   7 -SHL1STDLIBS+= -lcairo
   8 +SHL1STDLIBS+= -lcairo -lpixman-1
   9  .ENDIF
  10
  11  .IF "$(GUIBASE)"=="aqua"
  12 @@ -103,7 +103,7 @@ CFLAGSCXX+=$(OBJCXXFLAGS)
  13
  14  # Xlib
  15  SLOFILES+= $(SLO)$/cairo_xlib_cairo.obj
  16 -SHL1STDLIBS+= -lfontconfig -lX11 -lXrender -lpixman-1 $(FREETYPE_LIBS)
  17 +SHL1STDLIBS+= -lfontconfig -lX11 -lXrender $(FREETYPE_LIBS)
  18  CFLAGS+=$(FREETYPE_CFLAGS)
  19
  20  .ENDIF   # "$(GUIBASE)"=="aqua"