mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-25 16:47:29 +09:00
Issue #1274 - Part 5: Misc fixes and version update.
This commit is contained in:
wolfbeast
Roy Tam
parent
fd38014a63
commit
82d70c6ae2
5 changed files with 22 additions and 193 deletions
|
|
@ -1,10 +1,10 @@
|
||||||
Cairo is free software.
|
Cairo is free software.
|
||||||
|
|
||||||
This (modified) version of the cairo implementation is available to be
|
This (modified) version of the cairo implementation is available to be
|
||||||
redistributed and/or modified under the terms of either the Mozilla
|
redistributed and/or modified under the terms the Mozilla Public License
|
||||||
Public License (MPL) version 2.0. Some files in the original cairo
|
(MPL) version 2.0. Some files in the original cairo source code are
|
||||||
source code are available under more liberal terms, but we believe that
|
available under more liberal terms, but we believe that in all cases,
|
||||||
in all cases, each file may be used under the MPL 2.0.
|
each file may be used under the MPL 2.0.
|
||||||
|
|
||||||
Where the original code was not explicitly MPL licensed, the original
|
Where the original code was not explicitly MPL licensed, the original
|
||||||
more liberal license information and copyright has been retained for
|
more liberal license information and copyright has been retained for
|
||||||
|
|
|
||||||
|
|
@ -1,187 +0,0 @@
|
||||||
Quick-start build instructions
|
|
||||||
------------------------------
|
|
||||||
1) Configure the package:
|
|
||||||
|
|
||||||
./configure
|
|
||||||
|
|
||||||
2) Compile it:
|
|
||||||
|
|
||||||
make
|
|
||||||
|
|
||||||
3) Install it:
|
|
||||||
|
|
||||||
make install
|
|
||||||
|
|
||||||
This final step may require temporary root access (eg. with sudo) if
|
|
||||||
you don't have write permission to the directory in which cairo will
|
|
||||||
be installed.
|
|
||||||
|
|
||||||
NOTE: If you are working with source from git/cvs rather than from a tar
|
|
||||||
file, then you should use ./autogen.sh in place of ./configure
|
|
||||||
anywhere it is mentioned in these instructions.
|
|
||||||
|
|
||||||
More detailed build instructions
|
|
||||||
--------------------------------
|
|
||||||
1) Configure the package
|
|
||||||
|
|
||||||
The first step in building cairo is to configure the package by
|
|
||||||
running the configure script. [Note: if you don't have a configure
|
|
||||||
script, skip down below to the Extremely detailed build
|
|
||||||
instructions.]
|
|
||||||
|
|
||||||
The configure script attempts to automatically detect as much as
|
|
||||||
possible about your system. So, you should primarily just accept
|
|
||||||
its defaults by running:
|
|
||||||
|
|
||||||
./configure
|
|
||||||
|
|
||||||
The configure script does accept a large number of options for
|
|
||||||
fine-tuning its behavior. See "./configure --help" for a complete
|
|
||||||
list. The most commonly used options are discussed here.
|
|
||||||
|
|
||||||
--prefix=PREFIX
|
|
||||||
|
|
||||||
This option specifies the directory under which the software
|
|
||||||
should be installed. By default configure will choose a
|
|
||||||
directory such as /usr/local. If you would like to install
|
|
||||||
cairo to some other location, pass the director to configure
|
|
||||||
with the --prefix option. For example:
|
|
||||||
|
|
||||||
./configure --prefix=/opt/cairo
|
|
||||||
|
|
||||||
would install cairo into the /opt/cairo directory. You could
|
|
||||||
also choose a prefix directory within your home directory if
|
|
||||||
you don't have write access to any system-wide directory.
|
|
||||||
|
|
||||||
After installing into a custom prefix, you will need to set
|
|
||||||
some environment variables to allow the software to be
|
|
||||||
found. Assuming the /opt/cairo prefix and assuming you are
|
|
||||||
using the bash shell, the following environment variables
|
|
||||||
should be set:
|
|
||||||
|
|
||||||
PKG_CONFIG_PATH=/opt/cairo/lib/pkgconfig
|
|
||||||
LD_LIBRARY_PATH=/opt/cairo/lib
|
|
||||||
export PKG_CONFIG_PATH LD_LIBRARY_PATH
|
|
||||||
|
|
||||||
(NOTE: On Mac OS X, at least, use DYLD_LIBRARY_PATH in place
|
|
||||||
of LD_LIBRARY_PATH above.)
|
|
||||||
|
|
||||||
--enable-quartz
|
|
||||||
--enable-atsui
|
|
||||||
--enable-xcb
|
|
||||||
--enable-glitz
|
|
||||||
--enable-beos
|
|
||||||
--enable-os2
|
|
||||||
--enable-directfb
|
|
||||||
|
|
||||||
Some of cairo's backends are marked as experimental and will
|
|
||||||
not be built by default. If you would like to build and
|
|
||||||
experiment with these backends, you will need to pass one of
|
|
||||||
the above options to the configure script. You may need to
|
|
||||||
have certain libraries installed first as discussed in the
|
|
||||||
dependencies section of the README file.
|
|
||||||
|
|
||||||
--disable-xlib
|
|
||||||
--disable-win32
|
|
||||||
--disable-png
|
|
||||||
--disable-freetype
|
|
||||||
--disable-ps
|
|
||||||
--disable-pdf
|
|
||||||
--disable-svg
|
|
||||||
|
|
||||||
Cairo's configure script detects the libraries needed to build
|
|
||||||
each stable backend, and when it finds them, enables each
|
|
||||||
backend. If you would like to override this detection and
|
|
||||||
disable a backend, (even when it would be possible to build
|
|
||||||
it), use one of the options above to disable the backend.
|
|
||||||
|
|
||||||
2) Compile the package:
|
|
||||||
|
|
||||||
This step is very simple. Just:
|
|
||||||
|
|
||||||
make
|
|
||||||
|
|
||||||
The Makefiles included with cairo are designed to work on as many
|
|
||||||
different systems as possible.
|
|
||||||
|
|
||||||
When cairo is compiled, you can also run some automated tests of
|
|
||||||
cairo with:
|
|
||||||
|
|
||||||
make check
|
|
||||||
|
|
||||||
NOTE: Some versions of X servers will cause the -xlib tests to
|
|
||||||
report failures in make check even when cairo is working just
|
|
||||||
fine. If you see failures in nothing but -xlib tests, please
|
|
||||||
examine the corresponding -xlib-out.png images and compare them to
|
|
||||||
the -ref.png reference images (the -xlib-diff.png images might also
|
|
||||||
be useful). If the results seem "close enough" please do not report
|
|
||||||
a bug against cairo as the "failures" you are seeing are just due
|
|
||||||
to subtle variations in X server implementations.
|
|
||||||
|
|
||||||
3) Install the package:
|
|
||||||
|
|
||||||
The final step is to install the package with:
|
|
||||||
|
|
||||||
make install
|
|
||||||
|
|
||||||
If you are installing to a system-wide location you may need to
|
|
||||||
temporarily acquire root access in order to perform this
|
|
||||||
operation. A good way to do this is to use the sudo program:
|
|
||||||
|
|
||||||
sudo make install
|
|
||||||
|
|
||||||
Extremely detailed build instructions
|
|
||||||
-------------------------------------
|
|
||||||
So you want to build cairo but it didn't come with a configure
|
|
||||||
script. This is probably because you have checked out the latest
|
|
||||||
in-development code via git. If you need to be on the bleeding edge,
|
|
||||||
(for example, because you're wanting to develop some aspect of cairo
|
|
||||||
itself), then you're in the right place and should read on.
|
|
||||||
|
|
||||||
However, if you don't need such a bleeding-edge version of cairo, then
|
|
||||||
you might prefer to start by building the latest stable cairo release:
|
|
||||||
|
|
||||||
http://cairographics.org/releases
|
|
||||||
|
|
||||||
or perhaps the latest (unstable) development snapshot:
|
|
||||||
|
|
||||||
http://cairographics.org/snapshots
|
|
||||||
|
|
||||||
There you'll find nicely packaged tar files that include a configure
|
|
||||||
script so you can go back the the simpler instructions above.
|
|
||||||
|
|
||||||
But you're still reading, so you're someone that loves to
|
|
||||||
learn. Excellent! We hope you'll learn enough to make some excellent
|
|
||||||
contributions to cairo. Since you're not using a packaged tar file,
|
|
||||||
you're going to need some additional tools beyond just a C compiler in
|
|
||||||
order to compile cairo. Specifically, you need the following utilities:
|
|
||||||
|
|
||||||
automake (1.8 or newer)
|
|
||||||
autoconf
|
|
||||||
libtool
|
|
||||||
|
|
||||||
Hopefully your platform of choice has packages readily available so
|
|
||||||
that you can easily install things with your system's package
|
|
||||||
management tool, (such as "apt-get install automake" on Debian or "yum
|
|
||||||
install automake" on Fedora, etc.). Note that Mac OS X ships with it's
|
|
||||||
own utility called libtool which is not what you want, (the one you do
|
|
||||||
want goes by the name of glibtool).
|
|
||||||
|
|
||||||
Once you have all of those packages installed, the next step is to run
|
|
||||||
the autogen.sh script. That can be as simple as:
|
|
||||||
|
|
||||||
./autogen.sh
|
|
||||||
|
|
||||||
Or, if you're using Mac OS X, you'll have to let it know to use
|
|
||||||
glibtool by instead doing:
|
|
||||||
|
|
||||||
LIBTOOLIZE=glibtoolize ./autogen.sh
|
|
||||||
|
|
||||||
But before you run that command, note that the autogen.sh script
|
|
||||||
accepts all the same arguments as the configure script, (and in fact,
|
|
||||||
will generate the configure script and run it with the arguments you
|
|
||||||
provide). So go back up to step (1) above and see what additional
|
|
||||||
arguments you might want to pass, (such as prefix). Then continue with
|
|
||||||
the instructions, simply using ./autogen.sh in place of ./configure.
|
|
||||||
|
|
||||||
Happy hacking!
|
|
||||||
|
|
@ -1,3 +1,8 @@
|
||||||
|
Important note: the source code included in this directory is a subset
|
||||||
|
of the library, insofar as is needed to supply functionality to the
|
||||||
|
UXP source. For the complete and unmodified source of Cairo, please
|
||||||
|
go to the website indicated below.
|
||||||
|
|
||||||
Cairo - Multi-platform 2D graphics library
|
Cairo - Multi-platform 2D graphics library
|
||||||
http://cairographics.org
|
http://cairographics.org
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CAIRO_VERSION_MAJOR 1
|
#define CAIRO_VERSION_MAJOR 1
|
||||||
#define CAIRO_VERSION_MINOR 9
|
#define CAIRO_VERSION_MINOR 10
|
||||||
#define CAIRO_VERSION_MICRO 5
|
#define CAIRO_VERSION_MICRO 28
|
||||||
|
|
||||||
@PS_SURFACE_FEATURE@
|
@PS_SURFACE_FEATURE@
|
||||||
|
|
||||||
|
|
|
||||||
11
gfx/cairo/moz.build
Normal file
11
gfx/cairo/moz.build
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||||
|
# vim: set filetype=python:
|
||||||
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
|
||||||
|
DIRS += ['cairo/src']
|
||||||
|
|
||||||
|
if CONFIG['MOZ_TREE_PIXMAN']:
|
||||||
|
DIRS += ['libpixman/src']
|
||||||
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue