[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cairo/cairo-1.10.2.patch cairo/pixman cairo/pixman-0.24.0.patch

[Fridrich Strba]

 cairo/cairo-1.10.2.patch  |    9 +++++++
 cairo/pixman-0.24.0.patch |   58 ++++++++++++++++++++++++++++++++++++++++++++++
 cairo/pixman/makefile.mk  |    2 +
 3 files changed, 69 insertions(+)

New commits:
commit 40a9190ecd5c114974be8c3984837b365592bcda
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Dec 16 15:03:13 2011 +0100

    One more attempt to not have -lz sucked in

diff --git a/cairo/cairo-1.10.2.patch b/cairo/cairo-1.10.2.patch
index 5ef91a7..15c5c45 100644
--- a/cairo/cairo-1.10.2.patch
+++ b/cairo/cairo-1.10.2.patch
@@ -141,6 +141,15 @@
      else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_VERSION - Too old" >&5
  $as_echo "$FREETYPE_VERSION - Too old" >&6; }
  			   use_ft="no ($FREETYPE_VERSION found; version $FREETYPE_MIN_VERSION from release $FREETYPE_MIN_RELEASE required)"
+@@ -29434,7 +29434,7 @@
+     fi
+ 
+   ft_CFLAGS="$FREETYPE_CFLAGS"
+-  ft_LIBS="$FREETYPE_LIBS"
++  ft_LIBS=`echo "$FREETYPE_LIBS" | $SED -e 's/-lz//g'`
+ 
+ 			cairo_cv_ft_use=$use_ft
+ 			cairo_cv_ft_cache_vars=" BASE REQUIRES CFLAGS NONPKGCONFIG_CFLAGS LIBS NONPKGCONFIG_LIBS NONPKGCONFIG_EXTRA_LIBS"
 @@ -30121,7 +30121,7 @@
  
      # The ps backend requires zlib.
commit 8615f97870ba11c869958fa7ab0f35325e70c0b3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Fri Dec 16 15:31:34 2011 +0100

    Missing pixman file
    
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/cairo/pixman-0.24.0.patch b/cairo/pixman-0.24.0.patch
index 36cf368..0611962 100644
--- a/cairo/pixman-0.24.0.patch
+++ b/cairo/pixman-0.24.0.patch
@@ -1,3 +1,61 @@
+--- misc/pixman-0.24.0/Makefile.win32.common	2011-12-16 15:30:44.653987145 +0100
++++ misc/build/pixman-0.24.0/Makefile.win32.common	2011-12-16 15:30:37.288130250 +0100
+@@ -1 +1,54 @@
+-dummy
++LIBRARY = pixman-1
++
++CC = cl
++LD = link
++AR = lib
++PERL = perl
++
++ifeq ($(top_builddir),)
++top_builddir = $(top_srcdir)
++endif
++
++CFG_VAR = $(CFG)
++ifeq ($(CFG_VAR),)
++CFG_VAR = release
++endif
++
++ifeq ($(CFG_VAR),debug)
++CFG_CFLAGS  = -MDd -Od -Zi
++CFG_LDFLAGS = -DEBUG
++else
++CFG_CFLAGS  = -MD -O2
++CFG_LDFLAGS =
++endif
++
++# Package definitions, to be used instead of those provided in config.h
++PKG_CFLAGS  = -DPACKAGE=$(LIBRARY) -DPACKAGE_VERSION="" -DPACKAGE_BUGREPORT=""
++
++BASE_CFLAGS = -nologo -I. -I$(top_srcdir) -I$(top_srcdir)/pixman
++
++PIXMAN_CFLAGS  = $(BASE_CFLAGS) $(PKG_CFLAGS) $(CFG_CFLAGS) $(CFLAGS)
++PIXMAN_LDFLAGS = -nologo $(CFG_LDFLAGS) $(LDFLAGS)
++PIXMAN_ARFLAGS = -nologo $(LDFLAGS)
++
++
++inform:
++ifneq ($(CFG),release)
++ifneq ($(CFG),debug)
++ifneq ($(CFG),)
++	@echo "Invalid specified configuration option: "$(CFG)"."
++	@echo
++	@echo "Possible choices for configuration are 'release' and 'debug'"
++	@exit 1
++endif
++	@echo "Using default RELEASE configuration... (use CFG=release or CFG=debug)"
++endif
++endif
++
++
++$(CFG_VAR)/%.obj: %.c $(BUILT_SOURCES)
++	@mkdir -p $(CFG_VAR)
++	@$(CC) -c $(PIXMAN_CFLAGS) -Fo"$@" $<
++
++clean: inform
++	@$(RM) $(CFG_VAR)/*.{exe,ilk,lib,obj,pdb} $(BUILT_SOURCES) || exit 0
 --- misc/pixman-0.24.0/Makefile.in	2011-11-06 22:11:25.000000000 +0100
 +++ misc/build/pixman-0.24.0/Makefile.in	2011-12-16 09:06:45.317211035 +0100
 @@ -272,7 +272,7 @@
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b0595e8..fd9d960 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -48,6 +48,8 @@ PIXMANVERSION=0.24.0
 TARFILE_NAME=pixman-$(PIXMANVERSION)
 TARFILE_MD5=db5ffcd50064421176e8afb7b85fd1a7
 
+ADDITIONAL_FILES=Makefile.win32.common
+
 PATCH_FILES=..$/$(TARFILE_NAME).patch
 
 # Note: we are building static pixman library to avoid linking problems.