Commit graph

20 commits

Author SHA1 Message Date
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
5e4aa51173 poppler: share most things between glib and qt4 versions
Most of the stuff was duplicated (headers, the core library).
The new solution makes the _qt4 package use the _glib one,
because it depended on glib through cairo anyway
(and _glib bindings themselves are just ~350kB).

This also fixes a problem that mergeAttrsByFuncDefaultsClean
didn't merge patches, which affected dbus.libs.
2013-04-21 20:15:38 +00:00
Vladimír Čunát
b37b73a56c poppler: update, include qt4+cairo patches
The patches should provide smoother font rendering, like it's with poppler+gtk+cairo.
The code was taken from @mornfall f4fce48c #470, thanks.
2013-04-18 20:54:47 +02:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Vladimír Čunát
b41ec8f8eb poppler: update; but openjpeg still not detected 2013-02-12 21:40:20 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Yury G. Kudryashov
3dde54caeb poppler-0.18.4
svn path=/nixpkgs/trunk/; revision=32875
2012-03-08 07:59:53 +00:00
Yury G. Kudryashov
e1e6b10eee poppler-0.18.2
I've checked that everything in `grep -rl poppler .` compiles.

svn path=/nixpkgs/trunk/; revision=30902
2011-12-15 08:34:34 +00:00
Yury G. Kudryashov
63959f2a5a Let poppler use ${POPPLER_DATADIR}
Also upgrade poppler-data

svn path=/nixpkgs/trunk/; revision=29342
2011-09-19 08:35:30 +00:00
Eelco Dolstra
a7b9ef8f4b * Update Poppler to 0.16.7.
svn path=/nixpkgs/branches/kde-4.7/; revision=27703
2011-07-11 13:04:38 +00:00
Yury G. Kudryashov
b93fed7f31 poppler-0.14.5
svn path=/nixpkgs/trunk/; revision=25122
2010-12-14 13:30:06 +00:00
Lluís Batlle i Rossell
9dcfc5263b Updating poppler
svn path=/nixpkgs/trunk/; revision=19299
2010-01-07 20:39:52 +00:00
Sander van der Burg
895f15eb04 Upgraded popper to 0.10.6
svn path=/nixpkgs/trunk/; revision=15566
2009-05-12 11:55:17 +00:00
Eelco Dolstra
94d7d1fdbb * Got rid of all --disable-static flags; they're redundant now.
* Also a bunch of style cleanups (tabs, with args, ...).

svn path=/nixpkgs/branches/stdenv-updates/; revision=15235
2009-04-21 23:18:09 +00:00
Lluís Batlle i Rossell
40b58959a5 Adding pdf2djvu, updating djvulibre, and getting more headers from poppler.
svn path=/nixpkgs/trunk/; revision=14760
2009-03-29 20:32:41 +00:00
Ludovic Courtès
5c3c2d9860 Poppler: Disable test suite when `qt4Support' is true.
svn path=/nixpkgs/trunk/; revision=14155
2009-02-21 21:53:50 +00:00
Ludovic Courtès
d622b7a1f8 Poppler 0.10.4.
svn path=/nixpkgs/trunk/; revision=14149
2009-02-20 23:43:29 +00:00
Sander van der Burg
08e92c5e70 Added kdegraphics-4.2 closure
svn path=/nixpkgs/trunk/; revision=14114
2009-02-18 15:25:40 +00:00
Ludovic Courtès
8d32e65de6 Poppler 0.8.4.
svn path=/nixpkgs/trunk/; revision=12372
2008-07-17 15:02:57 +00:00
Yury G. Kudryashov
6203fa41f7 Added poppler and poppler-data
svn path=/nixpkgs/trunk/; revision=9633
2007-11-11 16:00:51 +00:00