Commit Graph

106 Commits

Author SHA1 Message Date
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
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Stéphane Jourdois
0a2c78fb5f cairo: maintenance update 1.14.2 -> 1.14.4 (close #10778) 2015-11-04 18:39:28 +01:00
Vladimír Čunát
436bf848b9 cairo: reduce bin output, and fixup a reference 2015-10-28 19:38:17 +01:00
Vladimír Čunát
fd819711c6 cairo: get rid of xlibs-wrapper 2015-10-13 20:18:50 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Vladimír Čunát
0c74f18e4c xlibs.xlibs: remove
It was really ugly that `xlibs.xlibs` meant something else than `xlibs`,
especially when using `with xlibs`, such as in wine.
Also, now `xlibs` is the same as `xorg`.
2015-09-15 11:59:33 +02:00
Tobias Geerinckx-Rice
b2d7f4b1ba Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
2015-05-27 22:00:06 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Vladimír Čunát
d3399ca45b cairo: maintenance update
The removed patch was included in the release.
2015-04-18 07:08:15 +02:00
Eric Seidel
e08b9ab8d3 kill libiconvOr*
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
2015-02-07 20:29:28 -08:00
Vladimír Čunát
e75fe2e528 cairo: pull an upstream patch to fix racket
Close #5165, #5166.
Also enableParallelBuilding in racket.
2014-11-28 20:28:47 +01:00
Vladimír Čunát
39b5e54bbe cairo: major update 1.12.* -> 1.14.0
ABI diff only suggest that one enum value got updated,
which should be fine for us.
http://upstream-tracker.org/compat_reports/cairo/1.12.16_to_1.14.0/abi_compat_report.html#Low_Risk_Problems
2014-10-19 19:31:58 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
e07ce3314d Fix some "meta.licenses" attributes 2014-01-25 03:04:46 +01:00
Vladimír Čunát
1e113b8284 pangomm: update, so we can drop older cairo 2013-12-10 17:14:22 +01:00
Mathijs Kwik
1a55c4b89f Merge remote-tracking branch 'official/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/tools/typesetting/tex/texlive/default.nix
	pkgs/top-level/all-packages.nix
2013-09-11 10:53:31 +02:00
Vladimír Čunát
f082abfd55 cairo: bugfix update
Released less than a day ago :-)
2013-08-27 17:44:21 +02:00
Vladimír Čunát
207ca1f05a darwin: attempt to fix pango via flattening cairo includes
Changes hash only on darwin.
2013-08-07 18:28:04 +02:00
Vladimír Čunát
98f3716650 clean some include flags that weren't really needed
Tested the builds still work (x86_64-linux).
2013-08-03 10:45:13 +02:00
Eelco Dolstra
552fd3d599 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
2013-06-25 18:42:56 +02:00
Jason \"Don\" O'Conal
8ce7550a9f cairo-1.12.2: fix pixman include path 2013-06-17 14:14:09 +02:00
Michael Raskin
1a41887398 Fix a missing option declaration after merge 2013-06-14 00:11:34 +04:00