Commit graph

63 commits

Author SHA1 Message Date
Peter Foley
0d0bd89720 make cairo build with libpng 1.5 2011-10-01 18:34:47 -04:00
Tor Lillqvist
516d2e0518 Hmm, why did I think the ATSUI API would be gone in the 10.5 SDK?
The ATSUI API that cairo uses seems to compile fine against both 10.5
and 10.6 SDKs. Maybe then against 10.7 it won't?
2011-09-27 17:53:25 +03:00
Tor Lillqvist
1682fcc235 Dmake's .IF expression parser is apparently broken, >= works but > doesn't 2011-09-27 17:29:49 +03:00
Tor Lillqvist
98ab45513c Make cairo build against MacOSX SDK 10.5
Factor out the part of the iOS patch that comments out ATSUI-using API
into a new patch file, and use that when building against the MacOSX
SDK 10.5.

Whether the callers of cairo will build then, no idea... Will see.
2011-09-27 12:47:06 +03:00
Tor Lillqvist
97d7cb0854 Bypass cairo's ApplicationServices/ApplicationServices.h test completely for iOS 2011-08-09 01:42:21 +03:00
Caolán McNamara
16038a4d5c Revert "Disable pdf and ps surfaces that break internal cairo build"
This reverts commit 04ab4c38d662c469cea1afa540b60625266bc7e5 because
it breaks a buildbot
2011-08-05 13:57:26 +01:00
Fridrich Štrba
afff1341b4 Disable pdf and ps surfaces that break internal cairo build 2011-08-04 10:05:53 +02:00
Caolán McNamara
e2c3e30962 restore workaround for windows lack of soft links 2011-08-02 16:15:59 +01:00
Bjoern Michaelsen
31796472e7 Merge branch 'master' into feature/gnumake4 2011-07-21 18:51:33 +02:00
Tor Lillqvist
d722971de4 We want cairo-quartz.h for iOS, not the X ones 2011-07-14 22:01:05 +03:00
Tor Lillqvist
16d420b1cc Do build the cairo "quartz" surface for iOS, too
No ATSUI font stuff on iOS. But otherwise there isn't really anything
MacOSX specific there. The code builds against the iOS SDK, too.
2011-07-05 23:11:57 +03:00
Tor Lillqvist
3c4b37d77c Don't build cairo for Android
We might have to reconsider later, but bypass cairo for now. It won't
build anyway, as there is no "native" font backend for Android. Sure,
we could biuld fontconfig and freetype and pretend that is "native",
but let's see for now.
2011-07-03 21:28:54 +03:00
Tor Lillqvist
6c5e6ac641 Move an iOS-specific hunk to the iOS-specific patch file 2011-07-01 03:09:53 +03:00
Tor Lillqvist
7f48a4b480 Split out the iOS-specific patch to fix build with old MacOSX SDK 2011-07-01 02:55:52 +03:00
Tor Lillqvist
b2320b1e49 Enable building the "quartz" font backend without the "quartz" surface, for iOS
The quartz surface code won't build for iOS, but the font code
will. So let's try to use it. Maybe later make the surface build, too,
it might be trivial.
2011-07-01 02:24:04 +03:00
Caolán McNamara
ed0f6feebd this must be the bit I missed 2011-06-30 12:23:28 +01:00
Caolán McNamara
1cd91cabe9 make cairo an unconditional requirement for text rendering 2011-06-30 11:34:59 +01:00
Bjoern Michaelsen
31daa1bd60 Merge branch 'master' into feature/gnumake4
Conflicts:
	cairo/cairo-1.8.0.patch
	cairo/prj/build.lst
	gdk-pixbuf/makefile.mk
	libcroco/makefile.mk
2011-06-19 12:03:35 +02:00
Ivo Hinkelmann
6e5685efb1 masterfix DEV300: #i10000# missing stlport dep [hg:5d377dd89e6b] 2011-06-17 10:55:05 +02:00
Ivo Hinkelmann
44aee83382 masterfix DEV300: #i10000# SRC_ROOT -> SOLARSRC [hg:5851574127d1] 2011-06-17 10:49:50 +02:00
Tor Lillqvist
95b0fe9f51 Fix configury for Android, but won't build 2011-06-10 00:07:14 +03:00
Tor Lillqvist
78f9b77628 Always compare CROSS_COMPILING explicitly to "YES" 2011-06-06 09:07:30 +03:00
Tor Lillqvist
718381b51c Fix cairo build when cross-compiling to ppc MacOSX 2011-06-06 00:30:56 +03:00
Tor Lillqvist
56f35e6b39 Drop %_EXT% which was always empty 2011-06-03 13:27:35 +03:00
Michael Meeks
9eeeab292c allow building non-system cairo with system libpng14 2011-05-30 15:07:49 +01:00
Tor Lillqvist
e5c37050ba Drop unnecessary quotes around platform triplets 2011-05-30 02:57:36 +03:00
Tor Lillqvist
9fc04f1763 Cross-compiling and iOS support 2011-05-30 01:15:48 +03:00
Norbert Thiebaud
0bb3ffd645 cairo depend on libpng 2011-05-28 06:04:08 -05:00
Tor Lillqvist
afd1aece66 Can't use SRC_ROOT on Windows thanks to the symbolic links 2011-05-28 12:59:23 +03:00
Jan Holesovsky
e0785dd388 Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
	python/makefile.mk
	zlib/makefile.mk
2011-04-22 15:08:24 +02:00
ka
182318fb5e rsvglibs: minor adjustments wrt. new/updated external libs 2011-03-28 04:04:23 +02:00
Jan Holesovsky
5f7158e265 Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
	boost/aliasing.patch
	boost/makefile.mk
	cairo/cairo/makefile.mk
	cairo/pixman/makefile.mk
	dictionaries/da_DK/README_th_da_DK.txt
	dictionaries/da_DK/description.xml
	dictionaries/da_DK/dictionaries.xcu
	dictionaries/da_DK/makefile.mk
	dictionaries/da_DK/th_da_DK.dat
	dictionaries/de_AT/th_de_AT_v2.idx
	dictionaries/de_CH/th_de_CH_v2.idx
	dictionaries/de_DE/COPYING
	dictionaries/de_DE/COPYING_GPLv2
	dictionaries/de_DE/COPYING_GPLv2.txt
	dictionaries/de_DE/README_extension_owner.txt
	dictionaries/de_DE/README_th_de_DE_v2.txt
	dictionaries/de_DE/makefile.mk
	dictionaries/de_DE/th_de_DE_v2.idx
	icu/makefile.mk
	moz/makefile.mk
	python/makefile.mk
2011-03-09 10:38:32 +01:00
Philipp Lohmann [pl]
394514c504 rsvglibs: add libpng dependency for cairo 2011-03-03 15:43:51 +01:00
ka
6d7d3e6434 rsvglibs: added PNG support for cairo 2011-03-03 13:51:32 +01:00
Philipp Lohmann [pl]
0d9ba0a484 rsvglibs: add pango dependency 2011-03-01 18:55:44 +01:00
tono
2f324e58ca mingwport33: i#116329: MinGW port enhancement: configurable libstdc++ name 2011-01-06 21:56:21 +09:00
Fridrich Štrba
f7cefa123e Don't build pixman/test to prevent build failure when wrong cairo is linked 2010-09-30 13:47:06 +02:00
Fridrich Štrba
8f44f0d5f0 cairo-cairo-makefile-mk.diff: Fix linking of internal cairo library 2010-09-14 12:31:24 +02:00
Fridrich Štrba
399cb3be84 cairo-pixman-makefile-mk.diff: Build pixman as shared library on x86_64 too 2010-09-14 12:27:12 +02:00
sb
da1320efe1 sb126: merged in DEV300_m84 2010-06-30 15:38:26 +02:00
sb
33474c4fff sb126: #i110197# remove -Wl,-z,noexecstack hack 2010-06-22 09:31:32 +02:00
tono
9bc06e6ac0 i#111958: MinGW port enhancement: runtime-pseude-reloc-v2 2010-05-31 21:53:32 +09:00
Hans-Joachim Lankenau
95778f5226 ause110: #i106731# missed cairo module 2010-04-01 17:33:48 +02:00
Jens-Heiner Rechtien
72e939d8ed changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) 2010-02-12 15:01:35 +01:00
Ivo Hinkelmann
43a7c90bdb cws l10ntools: #i107386# #i107993# #ii107992# #i107991# #i108587# Added some buildtypes , fix for broken localize_sl regarding UPDMINOREXT , pmladeks localize.pl ooo enforcer patch 2010-01-22 18:50:33 +01:00
Jens-Heiner Rechtien
c5c13c0be9 CWS-TOOLING: integrate CWS cloph13
2009-09-01  #i104566# also use syslibroot/isysroot for external components
2009-08-28  #i104568# clean up duplicated definitions of OBJCXXFLAGS
2009-08-28  #i104567# add ccache-detection to configure (to skip to objcxx-flags)
2009-08-28  #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility
use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches
ignore "-isysroot /Developer/..." arguments for OOo's cpp
2009-09-16 14:49:32 +00:00
Oliver Bolte
721cd486db #i10000# make cairo buildable for Hamburg RE 2009-09-15 09:49:37 +00:00
Vladimir Glazounov
e863a48ae3 CWS-TOOLING: integrate CWS mingwport22
2009-08-19 16:18:46 +0200 tono  r275156 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-08-05 12:27:41 +0200 tono  r274650 : CWS-TOOLING: rebase CWS mingwport22 to trunk@274622 (milestone: DEV300:m54)
2009-08-01 00:56:35 +0200 tono  r274552 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-27 00:13:27 +0200 tono  r274344 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 06:19:59 +0200 tono  r274332 : i#103803: mingw gcc-4.4.0 port: invalid "extern static"
2009-07-25 06:13:56 +0200 tono  r274331 : i#103802: mingw gcc-4.4.0 port: inhibit use of pthread
2009-07-25 06:05:22 +0200 tono  r274330 : i#103801: mingw gcc-4.4.0 port: specify relocatable data section
2009-07-25 05:54:09 +0200 tono  r274329 : i#103800: mingw gcc-4.4.0 port: remove invalid scope
2009-07-25 05:44:58 +0200 tono  r274328 : i#103799: mingw gcc-4.4.0 port: add some #include
2009-07-25 05:33:09 +0200 tono  r274327 : i#103798: mingw gcc-4.4.0 port: add backward in include path
2009-07-25 05:24:42 +0200 tono  r274326 : i#103797: mingw gcc-4.4.0 port: nooptimize c++-uno bridge
2009-07-25 05:16:20 +0200 tono  r274325 : i#103795: mingw gcc-4.4.0 port: use gcc dll
2009-07-25 04:01:59 +0200 tono  r274324 : i#103794: mingw gcc-4.4.0 port: make use of dwarf2 eh
2009-07-25 02:44:01 +0200 tono  r274322 : i#103793: mingw port: Exclude msvc[pr]80.dll from packaging
2009-07-25 02:28:21 +0200 tono  r274321 : i#103791: mingw port fix typo
2009-08-26 06:36:38 +00:00
Jens-Heiner Rechtien
554c270738 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@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@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@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@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@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@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@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.
2009-05-18 12:01:49 +00:00
Oliver Bolte
b64816d455 CWS-TOOLING: integrate CWS ause099
2009-01-29 12:30:57 +0100 hjs  r267116 : #i98365# fix unsetting g+s bit
2009-01-23 14:21:19 +0100 hjs  r266819 : #i40246# - cleanup
2009-01-23 14:14:07 +0100 hjs  r266818 : #i40246# - fix quoting of final echo line
2009-01-23 12:42:33 +0100 hjs  r266807 : #i98365# leave higher bits alone
2009-01-23 11:23:42 +0100 rt  r266799 : Header
2009-01-22 19:14:25 +0100 hjs  r266753 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:22:18 +0100 hjs  r266737 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:54 +0100 hjs  r266736 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:24 +0100 hjs  r266735 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:08:33 +0100 hjs  r266734 : #i40246# renamed variable
2009-01-22 16:05:26 +0100 hjs  r266733 : #i40246# renamed variable
2009-01-20 17:46:54 +0100 hjs  r266610 : #i98290# cleanup
2009-01-19 19:32:19 +0100 hjs  r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39)
2008-12-08 21:00:09 +0100 hjs  r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37)
2008-11-27 18:25:18 +0100 hjs  r264513 : #i40246# - support multiple patches per archive
2008-11-17 19:00:12 +0100 hjs  r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35)
2009-02-19 07:29:28 +00:00