Commit Graph

128 Commits

Author SHA1 Message Date
Sandro Jäckel
cf50cc1363
cairo: remove unnecessary ? null from inputs, little cleanups 2022-11-27 22:25:51 +01:00
Sergei Trofimovich
b55345f131 cairo: pull upstream fix for grayscale aliasing bug
It's a cairo part of the fix for issue #185385 reported by @tobiasBora.
2022-08-06 10:05:07 +01:00
Jiajie Chen
5d3bef551c cairo: add patch to fix crashes on darwin
Apply patches regardless of os.
2022-07-06 16:44:34 +08:00
Alyssa Ross
686a131c98 cairo: enable debug info 2021-09-10 08:15:56 +00:00
Frederik Ramcke
e591a6235d
cairo: add patch for CVE-2020-35492 (PR: #131949) 2021-07-31 15:44:32 +02:00
Martin Weinelt
07dead5d63
Merge pull request #128297 from sternenseemann/cairo-unconditional-tee
cairo: enable tee unconditionally
2021-06-27 14:15:12 +02:00
sternenseemann
6102c4a326 cairo: enable tee unconditionally
The pycairo test suite fails on darwin because cairo's tee backend is
not enabled: https://github.com/pygobject/pycairo/issues/238
Since cairo builds on darwin fine with tee, there seems to be no
reason not to enable it.
2021-06-27 12:47:40 +02:00
Jan Tojnar
17dd568643
cairo: Apply patch to fix PDF output
Otherwise PDFs exported from Inkscape trip up ghostscript.
2021-06-16 19:56:11 +02:00
Ben Siraphob
2f78ee7e81 pkgs/development: stdenv.lib -> lib 2021-01-24 00:16:29 +07:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ryan Burns
6529627e13 cairo: fix build on darwin 2020-10-17 14:32:44 -07:00
Ben Wolsieffer
98be04b83a cairo: make OpenGL support require X11
If OpenGL is enabled without X11, the build fails with:

In file included from /nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/egl.h:39,
                 from cairo-gl.h:130,
                 from cairo-gl-private.h:51,
                 from cairo-gl-composite.c:48:
/nix/store/<...>-libglvnd-1.3.1-dev/include/EGL/eglplatform.h:128:10: fatal error: X11/Xlib.h: No such file or directory
  128 | #include <X11/Xlib.h>
      |          ^~~~~~~~~~~~
compilation terminated.
2020-08-16 10:33:44 +00:00
worldofpeace
46bf4cb283
Merge pull request #83808 from glittershark/fix-cairo-no-xlib
cairo: pass --disable-xlib to config if no x11
2020-04-14 09:13:36 -04:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Griffin Smith
84f720d9a4 cairo: pass --disable-xlib to config if no x11
It appears that cairo's configure script, at least on MacOS but perhaps
elsewhere, unconditionally enables xlib support, even if the library
isn't present, which breaks the build on MacOS always (since x11 is
disabled by default now). This explicitly passes `--disable-x11` if
x11Support is set to false, which fixes the build for me.
2020-03-30 16:42:55 -04:00
Ben Wolsieffer
34207efc93 cairo: enable GL support on 32-bit ARM and MIPS
Mesa works fine on ARM now and this can result in obscure ARM specific bugs.
2019-12-02 19:37:30 -05:00
adisbladis
c9d8624ccd
treewide: Get rid of libGLU_combined 2019-11-18 20:10:43 +00:00
volth
c814d72b51 treewide: name -> pname 2019-08-17 10:54:38 +00:00
Matthew Bauer
f0733a07d5 treewide: remove libGLSupported from pkgs
This isn’t a package, and we already have mesaPlatforms to handle this logic.
2019-06-17 11:49:22 -04:00
Jorge Acereda
b7a41a280f cairo: make x11 optional, disabled on darwin 2019-04-18 09:41:29 +02:00
Symphorien Gibol
1f17cd9223 cairo: fix cross 2019-04-16 19:00:01 +02:00
Matthew Bauer
1d4efdc109 cairo: use buildInputs for libraries 2019-03-02 02:17:21 -05:00
Vladimír Čunát
32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
worldofpeace
21531d353b
Merge #55894: cairo: apply patch for CVE-2018-19876
(cherry picked from commit bad2db31b7)
Forward-picked from staging to staging-next;
it's a trivial patch and we now rebuild anyway due to unzip.
2019-02-17 08:25:53 +01:00
Jan Malakhovski
11e3bceff0 cairo: move defaults to package file 2019-02-03 15:32:17 +00:00
Will Dietz
1b04d28df2 cairo: 1.15.14 -> 1.16.0 2018-10-30 18:41:29 -05:00
Will Dietz
b4323269f5 cairo: 1.15.12 -> 1.15.14 2018-09-25 09:21:37 -05:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Silvan Mosberger
57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Orivej Desh
ef695239a0 cairo: 1.15.10 -> 1.15.12
The previous 1.15.10 (and the stable 1.14.12) have the bug
https://bugs.freedesktop.org/show_bug.cgi?id=104325 which breaks
perlPackages.Cairo and pythonPackages.cairocffi tests.
2018-05-30 21:22:35 +00:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Jan Tojnar
b9219912de
cairo: 1.14.10 → 1.15.10 2018-04-12 11:53:47 +02:00
Matthew Bauer
ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Alexander V. Nikolaev
0acec7e984 treewide: transition mesa to libGLU_combined 2018-02-24 17:06:49 +02:00
Alexander V. Nikolaev
8f2a22935c treewide: transition from mesa_noglu to libGL 2018-02-24 17:03:46 +02:00
Vladimír Čunát
351b59be55
cairo: bugfix 1.14.8 -> 1.14.10 2017-06-17 22:11:34 +02:00
John Ericson
4c0d7da183 Get rid of all with { inherit... } and just used let inherit...
The old forms presumably predates, or were made in ignorance of,
`let inherit`. This way is better style as the scoping as more lexical,
something which Nix can (or might already!) take advantage of.
2017-03-30 03:05:05 -04:00
Thomas Tuegel
65592837b6
freetype: 2.6.5 -> 2.7.1
The Infinality bytecode interpreter is removed in favor of the new v40 TrueType
interpreter. In the past, the Infinality interpreter provided support for
ClearType-style hinting instructions while the default interpreter (then v35)
provided support only for original TrueType-style instructions. The v40
interpreter corrects this deficiency, so the Infinality interpreter is no longer
necessary.

To understand why the Infinality interpreter is no longer necessary, we should
understand how ClearType differs from TrueType and how the v40 interpreter
works. The following is a summary of information available on the FreeType
website [1] mixed with my own editorializing.

TrueType instructions use horizontal and vertical hints to improve glyph
rendering. Before TrueType, fonts were only vertically hinted; horizontal hints
improved rendering by snapping stems to pixel boundaries. Horizontal hinting is
a risk because it can significantly distort glyph shapes and kerning. Extensive
testing at different resolutions is needed to perfect the TrueType
hints. Microsoft invested significant effort to do this with its "Core fonts for
the Web" project, but few other typefaces have seen this level of attention.

With the advent of subpixel rendering, the effective horizontal resolution of
most displays increased significantly. ClearType eschews horizontal hinting in
favor of horizontal supersampling. Most fonts are designed for the Microsoft
bytecode interpreter, which implements a compatibility mode with
TrueType-style (horizontal and vertical) instructions. However, applying the
full horizontal hints to subpixel-rendered fonts leads to color fringes and
inconsistent stem widths. The Infinality interpreter implements several
techniques to mitigate these problems, going so far as to embed font- and
glyph-specific hacks in the interpreter. On the other hand, the v40 interpreter
ignores the horizontal hinting instructions so that glyphs render as they are
intended to on the Microsoft interpreter. Without the horizontal hints, the
problems of glyph and kerning distortion, color fringes, and inconsistent stem
widths--the problems the Infinality interpreter was created to solve--simply
don't occur in the first place.

There are also security concerns which motivate removing the Infinality patches.
Although there is an updated version of the Infinality interpreter for FreeType
2.7, the lack of a consistent upstream maintainer is a security concern. The
interpreter is a Turing-complete virtual machine which has had security
vulnerabilities in the past. While the default interpreter is used in billions
of devices and is maintained by an active developer, the Infinality interpreter
is neither scrutinized nor maintained. We will probably never know if there are
defects in the Infinality interpreter, and if they were discovered they would
likely never be fixed. I do not think that is an acceptable situtation for a
core library like FreeType.

Dropping the Infinality patches means that font rendering will be less
customizable. I think this is an acceptable trade-off. The Infinality
interpreter made many compromises to mitigate the problems with horizontal
hinting; the main purpose of customization is to tailor these compromises to the
user's preferences. The new interpreter does not have to make these compromises
because it renders fonts as their designers intended, so this level of
customization is not necessary.

The Infinality-associated patches are also removed from cairo. These patches
only set the default rendering options in case they aren't set though
Fontconfig. On NixOS, the rendering options are always set in Fontconfig, so
these patches never actually did anything for us!

The Fontconfig test suite is patched to account for a quirk in the way PCF fonts
are named.

The fontconfig option `hintstyle` is no longer configurable in NixOS. This
option selects the TrueType interpreter; the v40 interpreter is `hintslight` and
the older v35 interpreter is `hintmedium` or `hintfull` (which have actually
always been the same thing). The setting may still be changed through the
`localConf` option or by creating a user Fontconfig file.

Users with HiDPI displays should probably disable hinting and antialiasing: at
best they have no visible effect.

The fontconfig-ultimate settings are still available in NixOS, but they are no
longer the default. They still work, but their main purpose is to set rendering
quirks which are no longer necessary and may actually be
detrimental (e.g. setting `hintfull` for some fonts). Also, the vast array of
font substitutions provided is not an appropriate default; the default setting
should be to give the user the font they asked for.

[1]. https://www.freetype.org/freetype2/docs/subpixel-hinting.html
2017-03-12 17:31:33 -05:00
Daiderd Jordan
ab0bb24973
Revert "cairo: Add ApplicationServices as propagatedBuildInput"
This reverts commit 0f67005c4a.
2017-01-09 20:58:27 +01:00
Johannes Bornhold
0f67005c4a cairo: Add ApplicationServices as propagatedBuildInput
Noticed that it caused depending packages to fail, like librsvg, imagemagiv, graphviz.
2017-01-07 19:21:42 +01:00
Johannes Bornhold
bbdca635cf cairo: Add CoreText for darwin
This helps so that fonts are properly rendered in gtk when used with the backend
"quartz".
2017-01-07 17:31:10 +01:00
Vladimír Čunát
af220f2a7a
cairo: maintenance 1.14.6 -> 1.14.8 2016-12-10 15:22:52 +01:00
Franz Pletz
2b2f273375
cairo: add patch to fix CVE-2016-9082
cc #20078
2016-11-03 02:45:11 +01:00
Eelco Dolstra
8172cd734c docdev -> devdoc
It's "developer documentation", not "documentation developer" after
all.
2016-09-01 11:07:23 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Nikolay Amiantov
c8658f9da8 cairo: add infinality patches 2016-08-20 03:21:05 +03:00
Vincent Laporte
f3536f8ca0 cairo: build cairo-xlib even on Darwin 2016-04-19 18:06:53 +02:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Ryan Trinkle
8605dab964 webkitgtk: add darwin support 2016-03-30 09:40:36 +02:00