Commit Graph

94 Commits

Author SHA1 Message Date
Vladimír Čunát
6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Vladimír Čunát
f681a7683c poppler: maintenance update 2014-08-02 04:31:26 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Vladimír Čunát
3ecbd88269 poppler: update 2014-07-13 21:55:19 +02:00
Chaddaï Fouché
7fec0b5832 Fixed pkgconfig support for poppler-qt4 2014-04-24 10:52:42 +02:00
Vladimír Čunát
8db9fe47fe poppler_0_18: remove, only used by libreoffice
I need to test libreoffice still builds, so I push this to x-updates.
(I hate having to do such things to try a couple of jobs.)
2014-03-08 11:26:03 +01:00
Vladimír Čunát
d37aec1ac4 poppler: bugfix update 0.24.4 -> .5
Also Qt4 binding bugfix.
2014-01-19 10:24:56 +01:00
Ian-Woo Kim
010e63c69d poppler-glib.pc has ${includedir}/poppler in cflags (needed for dependent pkgs)
Cf. #1458.
2014-01-05 13:03:30 +01:00
Vladimír Čunát
493eaf95dd poppler: bugfix update 0.24.3 -> .4 2013-12-09 21:14:39 +01:00
Lluís Batlle i Rossell
cfe5f74e88 Updating poppler to 0.24.3. 2013-11-06 10:09:08 +01:00
Marc Weber
78f7baf3b7 Fix .deepOverride on poppler, glib
By moving the default derivation into callPackage call, close #1115.
2013-10-26 13:54:24 +02:00
Vladimír Čunát
0fc3e2817a poppler: bugfix update to 0.24.1 2013-08-28 11:05:35 +02:00
Vladimír Čunát
a0192e3d0e poppler: update
Tested by running evince.
2013-08-25 19:54:02 +02:00
Vladimír Čunát
d5ac09f60f poppler: bugfix update, waiting with major bump 2013-08-03 10:46:48 +02:00
Mathijs Kwik
04cbaef102 keep lcms versioning in all-packages.nix 2013-07-01 07:52:13 +02:00
Vladimír Čunát
1f81984293 non-Linux: more adjustments
Also reordered stuff in all-packages.nix.
2013-06-18 23:59:23 +02:00
Vladimír Čunát
2058d95eb4 non-Linux platforms: extend to some important pkgs 2013-06-18 22:03:35 +02:00
Vladimír Čunát
53fa11cfc9 poppler: attempt to fix missing libiconv on non-Linux 2013-06-18 12:53:19 +02:00
Mathijs Kwik
0bcd97bb0b popplerQt4: force linking to poppler_glib
to fix:
ldd /nix/store/...poppler-qt4-0.22.3/lib/libpoppler-qt4.so
libpoppler.so.36 => not found
2013-06-06 09:13:44 +02:00
Vladimír Čunát
0bed8c15e3 poppler: downgrade to stable, drop deps that aren't really needed 2013-06-05 09:44:11 +02:00
Vladimír Čunát
4a4c9c239e poppler: minor update
Includes some thread safety fixes.
2013-05-29 23:29:57 +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
b7ca8c801b poppler_0_18: fix buildNativeInputs 2013-02-23 09:12:04 +01: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
b58f8f0ddb poppler: again downgrade the old version
poppler_0_18 can be removed per-package when they're upgraded
2013-02-13 09:16:58 +01:00
Vladimír Čunát
1dec399ddd add poppler_0_20: some pkgs don't build with newer 2013-02-12 23:27:54 +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
0d582266a8 Remove unused patch
svn path=/nixpkgs/trunk/; revision=25321
2010-12-29 18:04:17 +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