Commit graph

31 commits

Author SHA1 Message Date
Bjoern Michaelsen
d335c2a02a remove stray makefile.mk in cairo
Change-Id: Ie920fbdf140db81bc4426048a6c0e05f9a823d7d
2013-02-18 16:46:15 +01:00
Tor Lillqvist
c29098917a Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.

Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
2012-12-25 17:53:25 +00:00
Tor Lillqvist
12152d253e Replace GUIBASE checks with equivalent OS checks
The idea is to get rid of GUIBASE and GUI checks as much as possible.

GUIBASE=aqua <=> OS=MACOSX
GUIBASE=WIN <=> OS=WNT
GUIBASE=cocoatouch <=> OS=IOS
GUIBASE=android <=> OS=ANDROID

Don't set GUIBASE to these values any more in configure.ac
either.

GUIBASE_FOR_BUILD is not used anywhere.

Conflicts:
	configure.ac
	postprocess/packcomponents/makefile.mk
	postprocess/packregistry/makefile.mk

Change-Id: Ie0526b40e1073f2328ba6c333e28752104b0fed3
2012-12-18 20:52:24 -05:00
Matúš Kukan
2cb7ba189d cairo: convert to gbuild
Change-Id: I1f3dd368a0d0b78b73df3baad214a1079bbbd1d3
Reviewed-on: https://gerrit.libreoffice.org/1144
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
2012-11-20 20:36:42 +00:00
Jung-uk Kim
34ca8dd9ad fdo#54015: At least FreeBSD ld requires -z origin when RPATH contains $ORIGIN
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
* bulk replacement of "-Wl,-z,origin,-rpath,..." with
  "-Wl,-z,origin -Wl,rpath,..."
* additional hunk for directory/c-sdk/config/FreeBSD.mk in
  moz/seamonkey-source-1.1.14.patch did not apply and has been dropped

Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
2012-08-29 12:02:26 +02:00
Thomas Collerton
9520dbf59f EasyHack fdo#42783: get rid of CPU define/build system variable
Change-Id: I6a178f7ff9c8306e15bcfa847ad1e5e4f8476504
2012-05-09 16:31:31 +02:00
Fridrich Štrba
619b314317 Upgrade pixman to 0.24.4 2012-04-10 14:06:44 +02:00
Stephan Bergmann
7c4f2ec8a7 Simplify install name handling for external libraries on Mac OS X
...by allowing our special @___... tokens anywhere within an install name,
so that external modules can configure --prefix=/@___... etc.  This removes
the need for the special extshl and EXTRPATH=LOADER.  Also, a new
OUT2BIN_NONE can be used for external modules where the generated libraries
need the default EXTRPATH=OOO, but generated executables are only used
during the build and such need RPATH=NONE.
2012-02-29 18:46:38 +01:00
Fridrich Štrba
b4c74957cb Fix MMX build of pixman with MSVC 2011-12-19 09:42:32 +01:00
Tor Lillqvist
2800d3366c Do build cairo for Android, will likely be needed 2011-12-17 00:42:04 +02:00
Fridrich Štrba
8cb10ca246 Make buid pixman on windows 2011-12-16 16:24:09 +01:00
Fridrich Štrba
6de6fcefde Missing pixman file 2011-12-16 15:32:09 +01:00
Fridrich Štrba
cc850798eb Upgrading internal cairo/pixman (phase 1) 2011-12-16 12:30:30 +01: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
Caolán McNamara
1cd91cabe9 make cairo an unconditional requirement for text rendering 2011-06-30 11:34:59 +01: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
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
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
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
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
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
Release Engineers
5cdde801ee CWS-TOOLING: integrate CWS cairosource01
2008-11-28 13:29:24 +0100 rene  r264546 : i96634# add patch from kendy fixing --disable-mozilla with the new mozbootstrap stuff
2008-11-28 12:43:54 +0100 rene  r264540 : revert commit to wrong branch
2008-11-28 11:52:54 +0100 rene  r264537 : #ii10000# work around gcc taking hours/OOMing with qnametostr.cxx
2008-11-24 21:40:36 +0100 mox  r264268 : Remove the support for pre-built binaries, now that cairo can be built
from source
2008-11-24 21:39:01 +0100 mox  r264267 : Remove the support for pre-built binaries, now that cairo can be built
from source
2008-11-14 22:25:27 +0100 mox  r263699 : Fix build breakers on vanilla Win32
2008-11-10 19:45:48 +0100 mox  r263538 : Try to fix build breaker
2008-11-09 10:48:43 +0100 mox  r263493 : Full pixman_CFLAGS and pixman_LIBS are needed for configure to work
properly on UNX.
2008-11-08 20:24:06 +0100 mox  r263491 : Patch for pixman is still needed to fix build breakers in VM with Linux/FreeBSD
2008-11-05 21:29:44 +0100 mox  r263358 : CWS-TOOLING: rebase CWS cairosource01 to trunk@263288 (milestone: DEV300:m35)
2008-11-03 20:36:48 +0100 mox  r263306 : Update cairo sources missing from migration.
2008-11-03 20:33:17 +0100 mox  r263305 : Migrate CWS cairosource01 to SVN.
2008-11-30 07:56:43 +00:00
Vladimir Glazounov
e834e63cac CWS-TOOLING: integrate CWS mingwport15 2008-10-01 07:05:18 +00:00
Rüdiger Timm
8e678c5570 #i10000# Correct license header 2008-07-16 14:59:04 +00:00
Mox Soini
d775f2516d Add build files. Cairo module now feature complete. 2008-06-03 03:23:47 +00:00