[ooo-build-commit] Branch 'ooo/master' - 2 commits - cairo/cairo cairo/cairo-1.8.0.patch cairo/pixman libxslt/libxslt-1.1.24_win_manifest.patch libxslt/makefile.mk

Jan Holesovsky kendy at kemper.freedesktop.org
Thu May 28 18:09:36 PDT 2009 

 cairo/cairo-1.8.0.patch                   |    4 ++--
 cairo/cairo/makefile.mk                   |    4 ++++
 cairo/pixman/makefile.mk                  |   17 ++++++++++++++++-
 libxslt/libxslt-1.1.24_win_manifest.patch |   11 +++++++++++
 libxslt/makefile.mk                       |    4 ++--
 5 files changed, 35 insertions(+), 5 deletions(-)

New commits:
commit 747787410a988cf6dfa8a80c766a62e138af9e7e
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu May 28 16:03:55 2009 +0000

    CWS-TOOLING: integrate CWS ause101
    2009-05-11 14:39:16 +0200 hjs  r271770 : #i101204# more selective copy
    2009-05-07 19:16:08 +0200 hjs  r271693 : #i101651# embed windows manifest
    2009-05-07 18:43:17 +0200 hjs  r271692 : #i101650# fix CHECKZIPRESULT for bash
    2009-05-07 18:25:43 +0200 hjs  r271690 : #i101649# workaround warnings in generated code

diff --git a/libxslt/libxslt-1.1.24_win_manifest.patch b/libxslt/libxslt-1.1.24_win_manifest.patch
new file mode 100644
index 0000000..40f0732
--- /dev/null
+++ b/libxslt/libxslt-1.1.24_win_manifest.patch
@@ -0,0 +1,11 @@
+--- misc/libxslt-1.1.24/win32/configure.js	2007-08-03 15:41:02.000000000 +0200
++++ misc/build/libxslt-1.1.24/win32/configure.js	2009-05-07 13:09:42.294993200 +0200
+@@ -51,7 +51,7 @@
+ var dirSep = "\\";
+ var compiler = "msvc";
+ var cruntime = "/MD";
+-var vcmanifest = false;
++var vcmanifest = true;
+ var buildDebug = 0;
+ var buildStatic = 0;
+ var buildPrefix = ".";
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index 291a161..76cbcd3 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -51,7 +51,7 @@ all:
 LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
 
 TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
-PATCH_FILES=$(TARFILE_NAME).patch
+PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch
 
 # This is only for UNX environment now
 
@@ -126,7 +126,7 @@ OUT2BIN+=xslt-config
 .ELSE
 OUT2LIB+=win32$/bin.msvc$/*.lib
 OUT2BIN+=win32$/bin.msvc$/*.dll
-OUT2BIN+=win32$/bin.msvc$/*.exe*
+OUT2BIN+=win32$/bin.msvc$/*.exe
 .ENDIF
 .ELSE
 OUT2LIB+=libxslt$/.libs$/libxslt.so*
commit 238ac40111884ba91964e25eeefa1adafe2bcd84
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date:   Mon May 18 12:01:49 2009 +0000

    CWS-TOOLING: integrate CWS cairocanvastext01
    2009-05-12 07:10:00 +0200 mox  r271795 : Rename ::GetLayoutData() to ::GetSysTextLayoutData() to avoid build
    breakage in sc module.
    2009-05-11 23:40:57 +0200 mox  r271794 : merge fixes (again). These files should have been removed by the rebase.
    2009-05-11 20:17:44 +0200 mox  r271791 : fix build breakage on UNX
    2009-05-11 16:53:15 +0200 mox  r271779 : Documentation fix
    2009-05-11 16:49:16 +0200 mox  r271778 : merge fixes
    2009-05-11 14:10:36 +0200 mox  r271769 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 271427 (milestone: DEV300:m47)
    2009-05-11 10:55:11 +0200 mox  r271760 : merge fixes
    2009-05-11 10:49:44 +0200 mox  r271759 : manual merge to DEV300_m47
    2009-05-11 10:42:11 +0200 mox  r271758 : merge fixes
    2009-05-11 10:29:16 +0200 mox  r271757 : Manual merge to DEV300_m47
    2009-05-11 10:21:13 +0200 mox  r271756 : manual merge to DEV300_m47
    2009-05-11 10:10:29 +0200 mox  r271755 : manual merge to DEV300_m47
    2009-05-11 10:01:33 +0200 mox  r271754 : Manual merge to DEV300_m47
    2009-05-11 09:59:30 +0200 mox  r271753 : manual merge to DEV300_m47
    2009-05-11 09:57:33 +0200 mox  r271752 : merge fixes
    2009-05-11 09:56:05 +0200 mox  r271751 : merge fixes
    2009-05-11 09:53:26 +0200 mox  r271749 : Manual merge to DEV300_m47
    2009-05-11 09:49:34 +0200 mox  r271748 : manual merge to DEV300_m47
    2009-05-11 09:43:20 +0200 mox  r271747 : manual merge to DEV300_m47
    2009-05-11 09:30:10 +0200 mox  r271745 : Manual merge to DEV300_m47
    2009-05-11 09:28:59 +0200 mox  r271744 : manual merge to DEV300_m47
    2009-05-11 09:24:49 +0200 mox  r271743 : Fix to merge
    2009-05-11 09:21:55 +0200 mox  r271742 : Manual merge to DEV300_m47
    2009-05-11 09:18:13 +0200 mox  r271741 : merge fixes
    2009-05-11 09:00:50 +0200 mox  r271739 : Manual merge to DEV300_m47
    2009-05-09 13:26:10 +0200 mox  r271734 : cleanup
    2009-05-09 13:17:22 +0200 mox  r271733 : WNT build fixes
    2009-05-09 09:23:59 +0200 mox  r271732 : Implement proper cross-platform font width calculation
    Implement faux bold support
    2009-02-21 19:47:08 +0100 mox  r268339 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 267171 (milestone: DEV300:m41)
    2009-01-19 21:51:21 +0100 mox  r266530 : Fix compilation on win32
    2009-01-19 21:37:20 +0100 mox  r266529 : Fix typo
    2009-01-19 21:35:28 +0100 mox  r266528 : Better debug
    2009-01-19 21:13:30 +0100 mox  r266527 : Win32 fixes for proper text rendering
    2009-01-19 21:12:56 +0100 mox  r266526 : Win32 fixes for proper text rendering
    2008-12-27 13:04:05 +0100 mox  r265814 : configure fixes
    2008-12-27 11:37:00 +0100 mox  r265813 : x86_64 works only with system-cairo
    2008-12-26 20:02:32 +0100 mox  r265809 : Use the fix for 64bit builds
    2008-12-25 16:58:11 +0100 mox  r265802 : Fix build breaker on WNT
    2008-12-24 23:04:58 +0100 mox  r265801 : Unbreak build after rebase.
    2008-12-23 18:52:32 +0100 mox  r265790 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 265758 (milestone: DEV300:m38)
    2008-12-23 18:23:09 +0100 mox  r265789 : Fix the fix
    2008-12-23 18:21:27 +0100 mox  r265788 : Fix OS2 stuff
    2008-12-11 19:50:40 +0100 mox  r265354 : Fix build breaker on Mac
    2008-12-09 22:00:53 +0100 mox  r265139 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 264807 (milestone: DEV300:m37)
    2008-12-08 23:02:32 +0100 thb  r265052 : Removed outdated parts from readme
    2008-12-08 22:26:54 +0100 mox  r265051 : cleanup
    2008-12-07 19:55:31 +0100 mox  r264967 : Fix for non-intel processors.
    2008-12-07 19:47:11 +0100 mox  r264963 : sysdata fixes
    2008-12-07 19:23:27 +0100 mox  r264959 : Sysdata fixes
    2008-12-07 19:01:48 +0100 mox  r264958 : Fix sysdata usage
    2008-12-07 11:41:33 +0100 mox  r264951 : sysdata fixes
    2008-12-07 11:38:32 +0100 mox  r264950 : sysdata fixes
    2008-12-06 23:15:06 +0100 mox  r264947 : Try to fix error: __sync_val_compare_and_swap_4
    2008-12-06 23:09:30 +0100 mox  r264945 : Revert unnecessary change.
    2008-12-06 23:04:40 +0100 mox  r264944 : Use pre/postx from tools module.
    2008-12-06 22:49:08 +0100 mox  r264943 : Use proper pre/post includes.
    2008-12-06 22:48:03 +0100 mox  r264942 : Use pre/postx from tools module.
    2008-12-06 22:24:10 +0100 mox  r264941 : Fix build breaker.
    2008-12-06 21:55:46 +0100 mox  r264940 : Make pre/postx.h properly available
    2008-12-06 21:54:23 +0100 mox  r264939 : Make pre/postx.h properly available.
    2008-12-06 21:43:09 +0100 mox  r264938 : Try to fix error: __sync_val_compare_and_swap_4
    2008-12-06 21:12:18 +0100 mox  r264937 : Remove obsolete pre-built binaries
    2008-12-06 21:07:40 +0100 mox  r264936 : WNT: do not hardcode pixman version in cairo build
    2008-12-06 19:26:44 +0100 mox  r264934 : Revert pixman upgrade.
    2008-12-06 18:35:14 +0100 mox  r264933 : Fix build breaker
    2008-12-06 18:31:11 +0100 mox  r264932 : Use static pixman lib on unx/32bit to avoid linking problems
    2008-12-06 17:22:52 +0100 mox  r264930 : Update pixman to 0.13.2
    2008-12-06 13:30:41 +0100 mox  r264928 : Fix accidentally changed property
    2008-12-06 13:09:00 +0100 mox  r264927 : Fix accidental prop changes
    2008-12-06 12:40:08 +0100 mox  r264926 : Fix build breaker on Win32
    2008-12-06 12:39:22 +0100 mox  r264925 : Fix build breaker on Win32
    2008-12-06 12:30:23 +0100 mox  r264924 : Fix build breakers on win32
    2008-12-06 11:45:33 +0100 mox  r264923 : revert.
    2008-12-06 11:43:05 +0100 mox  r264922 : Try to fix header include problems on WNT
    2008-12-06 09:57:35 +0100 mox  r264921 : Cleanup accidental props
    2008-11-29 14:43:51 +0100 mox  r264580 : Move headers around to make all platforms compile
    2008-11-29 14:41:59 +0100 mox  r264579 : WaE fixes for X11
    2008-11-29 13:13:49 +0100 mox  r264578 : Fix build breaker on linux
    2008-11-29 12:21:03 +0100 mox  r264577 : Fix build breaker
    2008-11-29 12:13:50 +0100 mox  r264576 : Try to fix build breaker
    2008-11-28 22:51:27 +0100 mox  r264573 : Revert header includes to common style
    2008-11-18 18:59:15 +0100 mox  r263794 : Fix build breaker.
    2008-11-17 20:28:19 +0100 mox  r263740 : Revert most configure hacks
    2008-11-17 20:12:51 +0100 mox  r263739 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 263288 (milestone: DEV300:m35)
    2008-11-14 21:22:22 +0100 mox  r263698 : ZLIB_FIX define set
    2008-11-14 18:48:22 +0100 mox  r263694 : hardcode zlib paths
    2008-11-14 16:23:07 +0100 mox  r263683 : Fix typo
    2008-11-13 20:16:13 +0100 mox  r263662 : WaE fix
    2008-11-13 19:44:29 +0100 mox  r263661 : Properly include zlib headers for win32
    2008-11-12 20:05:51 +0100 mox  r263610 : Add debugging code.
    2008-11-10 19:44:35 +0100 mox  r263537 : Try to fix build breaker
    2008-11-09 22:34:35 +0100 mox  r263504 : Remove accidentally added svn:ignore properties.
    2008-11-09 22:33:21 +0100 mox  r263503 : prop should be actually deleted.
    2008-11-09 22:30:06 +0100 mox  r263502 : props should be empty.
    2008-11-09 22:23:22 +0100 mox  r263501 : Try fix props again...
    2008-11-09 22:11:26 +0100 mox  r263500 : try to fix svn:ignore
    2008-11-09 21:30:01 +0100 mox  r263499 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 262620 (milestone: DEV300:m34)
    2008-11-09 20:30:55 +0100 mox  r263498 : add missing cairo patch
    2008-11-09 10:56:33 +0100 mox  r263494 : Resync cairo module with cws cairosource01
    2008-11-01 09:32:19 +0100 mox  r262870 : CWS-TOOLING: rebase CWS cairocanvastext01 to trunk at 262620 (milestone: DEV300:m34)
    2008-10-26 20:55:48 +0100 mox  r262663 : Fix build breaker
    2008-10-25 13:10:00 +0200 mox  r262662 : CWS rebase to m33
    2008-10-12 19:47:56 +0200 mox  r262170 : Migrate CWS cairocanvastext01 to SVN.

diff --git a/cairo/cairo-1.8.0.patch b/cairo/cairo-1.8.0.patch
index b8533c8..454f234 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$(top_srcdir)/../pixman-0.12.0/pixman
-+PIXMAN_LIBS := $(top_builddir)/../pixman-0.12.0/pixman/$(CFG)/pixman-1.lib
++PIXMAN_CFLAGS := -I$(SRC_ROOT)/cairo/$(INPATH)/inc
++PIXMAN_LIBS := $(SRC_ROOT)/cairo/$(INPATH)/lib/pixman-1.lib
  
  CAIRO_LIBS =  gdi32.lib msimg32.lib user32.lib
  ifeq ($(CAIRO_HAS_PNG_FUNCTIONS),1)
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index 73d3a27..59a3a35 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -125,6 +125,10 @@ LDFLAGS:=$(cairo_LDFLAGS)
 cairo_CFLAGS+=-xc99=none
 .ENDIF
 
+.IF "$(CPU)"=="I"
+cairo_CFLAGS+=-march=i486
+.ENDIF
+
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
 CONFIGURE_FLAGS=--enable-xlib --enable-ft --disable-svg --disable-png --enable-gtk-doc=no --enable-test-surfaces=no --enable-static=no ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index b33d02f..93ce366 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -109,11 +109,22 @@ LDFLAGS+=-L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -L$(SOLARLIBDIR) -lpthread -ld
 pixman_CFLAGS+=-xc99=none
 .ENDIF
 
+.IF "$(CPU)"=="I"
+pixman_CFLAGS+=-march=i486
+.ENDIF
+
 pixman_CFLAGS+=-fPIC
 
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes CFLAGS="$(pixman_CFLAGS)"
+.IF "$(CPUNAME)"=="X86_64"
+# static builds tend to fail on 64bit
+CONFIGURE_FLAGS=--enable-static=no --enable-shared=yes
+.ELSE
+# use static lib to avoid linking problems with older system pixman libs
+CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
+.ENDIF
+CONFIGURE_FLAGS+=CFLAGS="$(pixman_CFLAGS)"
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
@@ -135,7 +146,11 @@ OUT2LIB+=pixman$/.libs$/*.a
 OUT2LIB+=pixman$/release$/*.lib
 .ENDIF
 .ELSE
+.IF "$(CPUNAME)"=="X86_64"
 OUT2LIB+=pixman$/.libs$/libpixman-1.so
+.ELSE
+OUT2LIB+=pixman$/.libs$/libpixman-1.a
+.ENDIF
 .ENDIF
 
 # --- Targets ------------------------------------------------------

More information about the ooo-build-commit mailing list