Mark H Weaver
d2478b4cdd
Merge branch 'master' into core-updates
2016-10-19 10:54:36 -04:00
Efraim Flashner
8ee04627d8
gnu: zimg: Update to 2.3.
...
* gnu/packages/image.scm (zimg): Update to 2.3.
2016-10-18 00:07:20 +03:00
Efraim Flashner
b333d00c35
gnu: jasper: Update to 1.900.5.
...
* gnu/packages/image.scm (jasper): Update to 1.900.5.
[source]: Remove patches.
[native-inputs]: Remove unzip.
* gnu/packages/patches/jasper-CVE-2007-2721.patch,
gnu/packages/patches/jasper-CVE-2008-3520.patch,
gnu/packages/patches/jasper-CVE-2008-3522.patch,
gnu/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch,
gnu/packages/patches/jasper-CVE-2014-8137.patch,
gnu/packages/patches/jasper-CVE-2014-8138.patch,
gnu/packages/patches/jasper-CVE-2014-8157.patch,
gnu/packages/patches/jasper-CVE-2014-8158.patch,
gnu/packages/patches/jasper-CVE-2014-9029.patch,
gnu/packages/patches/jasper-CVE-2016-1577.patch,
gnu/packages/patches/jasper-CVE-2016-1867.patch,
gnu/packages/patches/jasper-CVE-2016-2089.patch,
gnu/packages/patches/jasper-CVE-2016-2116.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
2016-10-17 23:51:38 +03:00
Mark H Weaver
dcaf70897a
Merge branch 'master' into core-updates
2016-10-17 16:47:12 -04:00
Efraim Flashner
4a2798e067
gnu: freeimage: Use 'modify-phases' syntax.
...
* gnu/packages/image.scm (freeimage)[arguments]: Use 'modify-phases'
syntax.
2016-10-14 13:43:12 +03:00
Efraim Flashner
76e8566c1b
gnu: freeimage: Fix CVE-2016-5684.
...
* gnu/packages/image.scm (freeimage)[source]: Add patch.
* gnu/packages/patches/freeimage-CVE-2016-5684.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
2016-10-14 13:42:43 +03:00
Mark H Weaver
abcf4858cd
Merge branch 'master' into core-updates
2016-10-12 09:28:14 -04:00
Leo Famulari
f803f775d2
gnu: vigra: Workaround rounding error in test suite on 32-bit CPUs.
...
* gnu/packages/image.scm (vigra)[arguments]: Pass '-ffloat-store' to
C_FLAGS and CXX_FLAGS.
2016-10-07 22:44:30 -04:00
Ludovic Courtès
79355ae3e8
Merge branch 'master' into core-updates
2016-09-30 12:05:27 +02:00
Arun Isaac
9311722703
gnu: Add optipng.
...
* gnu/packages/image.scm (optipng): New variable.
Signed-off-by: Kei Kebreau <kei@openmailbox.org>
2016-09-25 16:53:00 -04:00
Ricardo Wurmus
39162ee49b
gnu: extempore: Only build on x86_64.
...
* gnu/packages/algebra.scm (kiss-fft-for-extempore)[supported-systems]:
Only build on x86_64.
* gnu/packages/gl.scm (nanovg-for-extempore)[supported-systems]:
Likewise.
* gnu/packages/image.scm (stb-image-for-extempore)[supported-systems]:
Likewise.
* gnu/packages/llvm.scm (llvm-for-extempore)[supported-systems]:
Likewise.
* gnu/packages/music.scm (portmidi-for-extempore)[supported-systems]:
Likewise.
(extempore)[supported-systems]: Likewise.
2016-09-21 21:47:56 +02:00
Ricardo Wurmus
ac2a38a59a
gnu: Add stb-image-for-extempore.
...
* gnu/packages/image.scm (stb-image-for-extempore): New variable.
2016-09-16 17:31:11 +02:00
Leo Famulari
24f2334e36
gnu: libjpeg: Update to 9b.
...
* gnu/packages/image.scm (libjpeg): Update to 9b.
2016-09-11 13:04:52 -04:00
Leo Famulari
a2f3c614f4
gnu: libpng: Update to 1.6.25.
...
* gnu/packages/image.scm (libpng): Update to 1.6.25.
2016-09-11 13:04:52 -04:00
Leo Famulari
4d4a6ed775
gnu: zimg: Update to 2.2.1.
...
* gnu/packages/image.scm (zimg): Update to 2.2.1.
2016-09-11 13:04:00 -04:00
Leo Famulari
35eade9cf3
gnu: jbig2dec: Update to 0.13.
...
* gnu/packages/image.scm (jbig2dec): Update to 0.13.
[source]: Update URL.
[home-page]: Update URL.
* gnu/packages/patches/jbig2dec-ignore-testtest.patch: Adjust patch.
2016-09-11 13:04:00 -04:00
Leo Famulari
cbe2cc02fb
gnu: jpegoptim: Update to 1.4.4.
...
* gnu/packages/image.scm (jpegoptim): Update to 1.4.4.
2016-09-11 13:04:00 -04:00
Leo Famulari
2884c63cbc
gnu: Remove openjpeg-2.0.
...
* gnu/packages/image.scm (openjpeg-2.0): Remove variable.
2016-09-09 21:03:20 -04:00
Leo Famulari
4ce01773f3
gnu: openjpeg: Fix CVE-2016-5157.
...
* gnu/packages/patches/openjpeg-CVE-2016-5157.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (openjpeg): Use it.
2016-09-09 21:03:19 -04:00
Leo Famulari
0f97e7e5cd
gnu: openjpeg-2.*: Fix CVE-2016-7163.
...
* gnu/packages/patches/openjpeg-CVE-2016-7163.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (openjpeg, openjpeg-2.0): Use it.
2016-09-09 21:03:19 -04:00
Leo Famulari
876d80d424
gnu: openjpeg: Update to 2.1.1.
...
* gnu/packages/image.scm (openjpeg): Update to 2.1.1.
[source]: Use GitHub URL and add file-name field. Remove
"openjpeg-use-after-free-fix.patch" and "openjpeg-CVE-2015-6581.patch" from
patches.
2016-09-09 21:03:19 -04:00
Eric Bavier
1fa3e33604
gnu: Add steghide.
...
* gnu/packages/image.scm (steghide): New variable.
* gnu/packages/patches/steghide-fixes.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Add it.
2016-09-09 00:45:14 -05:00
Brendan Tildesley
f5e4229a07
gnu: Add libicns.
...
* gnu/packages/image.scm (libicns): New variable.
Signed-off-by: David Craven <david@craven.ch>
2016-09-04 13:00:46 +02:00
Leo Famulari
568230c378
gnu: libtiff: Incorporate grafted security patches.
...
* gnu/packages/image.scm (libtiff)[source]: Add patches from libtiff/fixed.
[replacement]: Remove field.
(libtiff/fixed): Remove variable.
2016-08-29 21:04:17 -04:00
Leo Famulari
4e9d5055fb
gnu: libtiff: Fix CVE-2016-5314.
...
* gnu/packages/patches/libtiff-CVE-2016-5314.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (libtiff/fixed): Use it.
2016-08-29 20:55:07 -04:00
Leo Famulari
ed5940b617
gnu: libtiff: Fix CVE-2016-{3623,3945,3990,3991,5321,5323}.
...
* gnu/packages/image.scm (libtiff)[replacement]: New field.
(libtiff/fixed): New variable.
* gnu/packages/patches/libtiff-CVE-2016-3623.patch,
gnu/packages/patches/libtiff-CVE-2016-3945.patch,
gnu/packages/patches/libtiff-CVE-2016-3990.patch,
gnu/packages/patches/libtiff-CVE-2016-3991.patch,
gnu/packages/patches/libtiff-CVE-2016-5321.patch,
gnu/packages/patches/libtiff-CVE-2016-5323.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
2016-08-29 20:20:52 -04:00
Tobias Geerinckx-Rice
af7aaaebab
gnu: Add perceptualdiff.
...
* gnu/packages/image.scm (perceptualdiff): New variable.
2016-07-26 11:20:27 +02:00
Leo Famulari
0f971a0475
gnu: Update URLs for sourceforge.net.
...
* gnu/packages/audio.scm: Update URLs pointing to sourceforge.net.
* gnu/packages/fonts.scm: Likewise.
* gnu/packages/gl.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/lxde.scm: Likewise.
* gnu/packages/slim.scm: Likewise.
* gnu/packages/textutils.scm: Likewise.
2016-07-22 11:47:12 -04:00
Leo Famulari
de67e92288
gnu: Update URLs for sourceforge.net.
...
* gnu/packages/admin.scm: Update URLs pointing to sourceforge.net.
* gnu/packages/audacity.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/boost.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/code.scm: Likewise.
* gnu/packages/compression.scm: Likewise.
* gnu/packages/cups.scm: Likewise.
* gnu/packages/djvu.scm: Likewise.
* gnu/packages/docbook.scm: Likewise.
* gnu/packages/documentation.scm: Likewise.
* gnu/packages/flashing-tools.scm: Likewise.
* gnu/packages/fonts.scm: Likewise.
* gnu/packages/fontutils.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/ghostscript.scm: Likewise.
* gnu/packages/gl.scm: Likewise.
* gnu/packages/gnucash.scm: Likewise.
* gnu/packages/graphviz.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mcrypt.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/networking.scm: Likewise.
* gnu/packages/onc-rpc.scm: Likewise.
* gnu/packages/password-utils.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/photo.scm: Likewise.
* gnu/packages/popt.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/rdesktop.scm: Likewise.
* gnu/packages/screen.scm: Likewise.
* gnu/packages/swig.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xml.scm: Likewise.
2016-07-21 18:09:40 -04:00
Efraim Flashner
365a4a7f40
gnu: Add zimg.
...
* gnu/packages/image.scm (zimg): New variable.
2016-05-30 22:22:25 +03:00
Leo Famulari
726f088884
gnu: devil: Fix CVE-2009-3994.
...
* gnu/packages/patches/devil-CVE-2009-3994.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (devil): Use it.
2016-05-30 12:36:26 -04:00
Efraim Flashner
44c5f0258d
gnu: giflib: Use 'modify-phases'.
...
* gnu/packages/image.scm (giflib)[arguments]: Use 'modify-phases'.
2016-05-19 13:06:49 +03:00
Efraim Flashner
3fdb2a84be
gnu: giflib: Update to 5.1.4 [fixes CVE-2015-7555, CVE-2016-3977].
...
* gnu/packages/image.scm (giflib): Update to 5.1.4.
2016-05-19 13:01:55 +03:00
Efraim Flashner
bf512da1e4
gnu: giblib: Add mirror for source.
...
* gnu/packages/image.scm (giblib)[source]: Add a download mirror from
slackbuilds.
2016-05-16 14:07:47 +03:00
Mark H Weaver
99828fa788
gnu: Update module imports for asciidoc and doxygen.
...
This is a followup to commit 0573a923de
.
* gnu/packages/algebra.scm, gnu/packages/bioinformatics.scm,
gnu/packages/fcitx.scm, gnu/packages/fish.scm,
gnu/packages/freedesktop.scm, gnu/packages/game-development.scm,
gnu/packages/gcc.scm, gnu/packages/graphics.scm, gnu/packages/image.scm,
gnu/packages/kodi.scm, gnu/packages/libreoffice.scm,
gnu/packages/linux.scm, gnu/packages/messaging.scm,
gnu/packages/mpd.scm, gnu/packages/music.scm, gnu/packages/rdf.scm,
gnu/packages/serialization.scm, gnu/packages/version-control.scm,
gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/xdisorg.scm,
gnu/packages/xiph.scm: Change imports of (gnu packages asciidoc) or
(gnu packages doxygen) to (gnu packages documentation).
2016-05-12 20:18:15 -04:00
Mark H Weaver
8c15e084fe
gnu: imlib2: Update to 1.4.9 [fixes CVE-2011-5326, CVE-2016-{3993,3994}].
...
* gnu/packages/image.scm (imlib2): Update to 1.4.9.
[source]: Remove patch.
* gnu/packages/patches/imlib2-CVE-2016-4024.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
2016-05-04 13:51:48 -04:00
Leo Famulari
e993fb8493
gnu: imlib2: Fix CVE-2016-4024.
...
* gnu/packages/patches/imlib2-CVE-2016-4024.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/image.scm (imlib2): Use it.
2016-04-22 23:59:37 -04:00
Leo Famulari
baa8be83e9
gnu: imlib2: Update to 1.4.8.
...
gnu/packages/image.scm (imlib2): Update to 1.4.8.
2016-04-22 23:58:33 -04:00
Ricardo Wurmus
2df831a78a
gnu: Add libpng-1.2.
...
* gnu/packages/image.scm (libpng-1.2): New variable.
2016-04-15 22:10:02 +02:00
Alex Kost
fc1adab148
gnu: packages: Use 'search-patches' everywhere.
...
* gnu/packages/abiword.scm: Use 'search-patches' for 'patches' field.
* gnu/packages/acl.scm: Likewise.
* gnu/packages/admin.scm: Likewise.
* gnu/packages/algebra.scm: Likewise.
* gnu/packages/animation.scm: Likewise.
* gnu/packages/apr.scm: Likewise.
* gnu/packages/audacity.scm: Likewise.
* gnu/packages/audio.scm: Likewise.
* gnu/packages/autotools.scm: Likewise.
* gnu/packages/avahi.scm: Likewise.
* gnu/packages/backup.scm: Likewise.
* gnu/packages/base.scm: Likewise.
* gnu/packages/bash.scm: Likewise.
* gnu/packages/bioinformatics.scm: Likewise.
* gnu/packages/cdrom.scm: Likewise.
* gnu/packages/ci.scm: Likewise.
* gnu/packages/cmake.scm: Likewise.
* gnu/packages/cpio.scm: Likewise.
* gnu/packages/cross-base.scm: Likewise.
* gnu/packages/dico.scm: Likewise.
* gnu/packages/doxygen.scm: Likewise.
* gnu/packages/ebook.scm: Likewise.
* gnu/packages/elf.scm: Likewise.
* gnu/packages/emacs.scm: Likewise.
* gnu/packages/engineering.scm: Likewise.
* gnu/packages/firmware.scm: Likewise.
* gnu/packages/flashing-tools.scm: Likewise.
* gnu/packages/fltk.scm: Likewise.
* gnu/packages/ftp.scm: Likewise.
* gnu/packages/games.scm: Likewise.
* gnu/packages/gawk.scm: Likewise.
* gnu/packages/gcc.scm: Likewise.
* gnu/packages/gd.scm: Likewise.
* gnu/packages/ghostscript.scm: Likewise.
* gnu/packages/glib.scm: Likewise.
* gnu/packages/gnome.scm: Likewise.
* gnu/packages/gnucash.scm: Likewise.
* gnu/packages/gnunet.scm: Likewise.
* gnu/packages/gnupg.scm: Likewise.
* gnu/packages/gnuzilla.scm: Likewise.
* gnu/packages/graphics.scm: Likewise.
* gnu/packages/grub.scm: Likewise.
* gnu/packages/gtk.scm: Likewise.
* gnu/packages/guile.scm: Likewise.
* gnu/packages/icu4c.scm: Likewise.
* gnu/packages/idutils.scm: Likewise.
* gnu/packages/image.scm: Likewise.
* gnu/packages/imagemagick.scm: Likewise.
* gnu/packages/irc.scm: Likewise.
* gnu/packages/ldc.scm: Likewise.
* gnu/packages/libcanberra.scm: Likewise.
* gnu/packages/libevent.scm: Likewise.
* gnu/packages/libreoffice.scm: Likewise.
* gnu/packages/libunwind.scm: Likewise.
* gnu/packages/libusb.scm: Likewise.
* gnu/packages/linux.scm: Likewise.
* gnu/packages/lirc.scm: Likewise.
* gnu/packages/llvm.scm: Likewise.
* gnu/packages/lsh.scm: Likewise.
* gnu/packages/lua.scm: Likewise.
* gnu/packages/lxqt.scm: Likewise.
* gnu/packages/mail.scm: Likewise.
* gnu/packages/maths.scm: Likewise.
* gnu/packages/mcrypt.scm: Likewise.
* gnu/packages/messaging.scm: Likewise.
* gnu/packages/mit-krb5.scm: Likewise.
* gnu/packages/mp3.scm: Likewise.
* gnu/packages/multiprecision.scm: Likewise.
* gnu/packages/music.scm: Likewise.
* gnu/packages/ninja.scm: Likewise.
* gnu/packages/nvi.scm: Likewise.
* gnu/packages/ocaml.scm: Likewise.
* gnu/packages/orpheus.scm: Likewise.
* gnu/packages/ots.scm: Likewise.
* gnu/packages/parallel.scm: Likewise.
* gnu/packages/patchutils.scm: Likewise.
* gnu/packages/pcre.scm: Likewise.
* gnu/packages/pdf.scm: Likewise.
* gnu/packages/perl.scm: Likewise.
* gnu/packages/plotutils.scm: Likewise.
* gnu/packages/polkit.scm: Likewise.
* gnu/packages/pulseaudio.scm: Likewise.
* gnu/packages/python.scm: Likewise.
* gnu/packages/qemu.scm: Likewise.
* gnu/packages/qt.scm: Likewise.
* gnu/packages/ratpoison.scm: Likewise.
* gnu/packages/rdf.scm: Likewise.
* gnu/packages/readline.scm: Likewise.
* gnu/packages/rush.scm: Likewise.
* gnu/packages/scheme.scm: Likewise.
* gnu/packages/screen.scm: Likewise.
* gnu/packages/sdl.scm: Likewise.
* gnu/packages/slim.scm: Likewise.
* gnu/packages/ssh.scm: Likewise.
* gnu/packages/tcl.scm: Likewise.
* gnu/packages/tcsh.scm: Likewise.
* gnu/packages/texinfo.scm: Likewise.
* gnu/packages/tls.scm: Likewise.
* gnu/packages/tor.scm: Likewise.
* gnu/packages/tv.scm: Likewise.
* gnu/packages/valgrind.scm: Likewise.
* gnu/packages/version-control.scm: Likewise.
* gnu/packages/video.scm: Likewise.
* gnu/packages/vpn.scm: Likewise.
* gnu/packages/vtk.scm: Likewise.
* gnu/packages/w3m.scm: Likewise.
* gnu/packages/web.scm: Likewise.
* gnu/packages/wicd.scm: Likewise.
* gnu/packages/wm.scm: Likewise.
* gnu/packages/xdisorg.scm: Likewise.
* gnu/packages/xfce.scm: Likewise.
* gnu/packages/xiph.scm: Likewise.
* gnu/packages/xml.scm: Likewise.
* gnu/packages/xorg.scm: Likewise.
* gnu/packages/zip.scm: Likewise.
2016-04-14 10:38:21 +03:00
Andreas Enge
019b38758c
gnu: vigra: Update to 1.11.0.
...
* gnu/packages/image.scm (vigra)[source]: Update to 1.11.0.
[arguments]: Disable parallel builds.
2016-03-18 09:01:02 +01:00
Efraim Flashner
e224495ce1
gnu: jasper: Add fixes for CVE-2016-1577, CVE-2016-2089, CVE-2016-2116.
...
* gnu/packages/patches/jasper-CVE-2016-1557.patch,
gnu/packages/patches/jasper-CVE-2016-2089.patch,
gnu/packages/patches/jasper-CVE-2016-2116.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/image.scm (jasper)[source]: Add patches.
2016-03-08 11:54:58 +02:00
Andreas Enge
451b5c5dc6
gnu: vigra: Update to a development snapshot.
...
* gnu/packages/image.scm (vigra): Update to a git snapshot to fix build
problems with the current python-numpy.
2016-03-05 19:09:42 +01:00
Leo Famulari
90bcecc568
gnu: jasper: Add fixes for several security flaws.
...
* gnu/packages/patches/jasper-CVE-2007-2721.patch,
gnu/packages/patches/jasper-CVE-2008-3520.patch,
gnu/packages/patches/jasper-CVE-2011-4516-and-CVE-2011-4517.patch,
gnu/packages/patches/jasper-CVE-2014-8137.patch,
gnu/packages/patches/jasper-CVE-2014-8138.patch,
gnu/packages/patches/jasper-CVE-2014-8157.patch,
gnu/packages/patches/jasper-CVE-2014-8158.patch,
gnu/packages/patches/jasper-CVE-2014-9029.patch,
gnu/packages/patches/jasper-CVE-2016-1867.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/image.scm (jasper)[source]: Add patches.
2016-02-04 15:09:41 -05:00
Mark H Weaver
86fa2ea92f
gnu: libtiff: Update to 4.0.6. Add fixes for CVE-2015-{8665,8683}.
...
* gnu/packages/patches/libtiff-CVE-2015-8665+CVE-2015-8683.patch,
gnu/packages/patches/libtiff-oob-accesses-in-decode.patch,
gnu/packages/patches/libtiff-oob-write-in-nextdecode.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/image.scm (libtiff): Update to 4.0.6.
[source]: Add patches.
2016-01-21 00:30:15 -05:00
Mark H Weaver
ce755b609d
gnu: libpng: Update to 1.5.26 [fixes CVE-2015-8472 and CVE-2015-8540].
...
* gnu/packages/image.scm (libpng): Update to 1.5.26.
2015-12-26 11:01:01 -05:00
Ludovic Courtès
f79a576e77
gnu: jasper: Patch CVE-2008-3522.
...
* gnu/packages/patches/jasper-CVE-2008-3522.patch: New file.
* gnu/packages/image.scm (jasper)[source]: Use it.
* gnu-system.am (dist_patch_DATA): Add it.
2015-11-28 16:29:11 +01:00
David Thompson
b0b23e52a3
gnu: Add jasper.
...
* gnu/packages/image.scm (jasper): New variable.
2015-11-25 11:44:11 -05:00
Mark H Weaver
328a14e869
gnu: libpng: Update to 1.5.24 [fixes CVE-2015-8126].
...
* gnu/packages/image.scm (libpng): Update to 1.5.24.
2015-11-18 17:47:40 -05:00
Mark H Weaver
21ef9843e4
Revert "gnu: libpng: Use 1.5.24 as a replacement [fixes CVE-2015-8126]."
...
This reverts commit 1b076e630f
.
2015-11-18 17:47:17 -05:00
David Thompson
3aab2c839f
gnu: Add devil.
...
* gnu/packages/image.scm (devil): New variable.
* gnu/packages/patches/devil-fix-libpng.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
2015-11-16 08:47:23 -05:00
Amirouche Boubekki
fcc43c1f7b
gnu: images: Add jpegoptim 1.4.3
...
* gnu/packages/images.scm (jpegoptim): New variable jpegoptim
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2015-11-16 10:03:49 +01:00
Ludovic Courtès
1b076e630f
gnu: libpng: Use 1.5.24 as a replacement [fixes CVE-2015-8126].
...
Reported by Leo Famulari <leo@famulari.name>.
* gnu/packages/image.scm (libpng-urls): New procedure.
(libpng)[source]: Use it.
[replacement]: New field.
(libpng-1.5.24): New variable.
2015-11-16 09:51:44 +01:00
宋文武
53e85d0aa5
gnu: leptonica: Disable parallel tests.
...
* gnu/packages/image.scm (leptonica)[arguments]: Add #:parallel-tests?.
2015-10-29 22:01:11 +08:00
宋文武
c7c5c5ae8b
gnu: leptonica: Disable failing tests.
...
* gnu/packages/image.scm (leptonica)[arguments]: Add 'disable-failing-tests' phase.
2015-10-28 20:48:45 +08:00
宋文武
bce5ae1d26
gnu: leptonica: Update to 1.72.
...
* gnu/packages/image.scm (leptonica): Update to 1.72.
2015-10-27 21:47:37 +08:00
Efraim Flashner
938ecdfcab
gnu: giflib: Update to 5.1.1.
...
* gnu/packages/image.scm (giflib): Update to 5.1.1.
2015-10-20 14:12:09 -04:00
Mark H Weaver
f956d661ad
gnu: libwmf: Add fixes for several security flaws.
...
* gnu/packages/patches/libwmf-CAN-2004-0941.patch,
gnu/packages/patches/libwmf-CVE-2007-0455.patch,
gnu/packages/patches/libwmf-CVE-2007-2756.patch,
gnu/packages/patches/libwmf-CVE-2007-3472.patch,
gnu/packages/patches/libwmf-CVE-2007-3473.patch,
gnu/packages/patches/libwmf-CVE-2007-3477.patch,
gnu/packages/patches/libwmf-CVE-2009-3546.patch: New files.
* gnu/packages/patches/libwmf-CVE-2015-0848+4588+4695+4696.patch: Delete
file. Replace with ...
* gnu/packages/patches/libwmf-CVE-2015-0848+CVE-2015-4588.patch,
gnu/packages/patches/libwmf-CVE-2015-4695.patch,
gnu/packages/patches/libwmf-CVE-2015-4696.patch: ... these new files.
* gnu-system.am (dist_patch_DATA): Adjust accordingly.
* gnu/packages/image.scm (libwmf)[source]: Adjust set of patches.
2015-10-08 10:46:30 -04:00
Mark H Weaver
7ab73c4add
gnu: openjpeg-2.x: Add fix for CVE-2015-6581.
...
* gnu/packages/patches/openjpeg-CVE-2015-6581.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/image.scm (openjpeg, openjpeg-2.0)[source]: Add patch.
2015-10-07 22:18:13 -04:00
Mark H Weaver
93bd4a37ee
gnu: freeimage: Add fix for CVE-2015-0852.
...
* gnu/packages/patches/freeimage-CVE-2015-0852.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/image.scm (freeimage)[source]: Add patch.
2015-10-02 12:53:21 -04:00
Mark H Weaver
bcc09d9ac1
gnu: freeimage: Update to 3.17.0.
...
* gnu/packages/image.scm (freeimage): Update to 3.17.0.
[source]: Use 'string-concatenate' in URI computation.
2015-10-02 12:53:21 -04:00
Mark H Weaver
b927058237
gnu: openjpeg-2.x: Add fix for use-after-free in opj_j2k_write_mco.
...
* gnu/packages/patches/openjpeg-use-after-free-fix.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/image.scm (openjpeg, openjpeg-2.0)[source]: Add patch.
[home-page]: Update.
2015-10-02 12:33:26 -04:00
Ludovic Courtès
75710da667
Merge branch 'master' into core-updates
2015-09-13 21:28:01 +02:00
Ludovic Courtès
6f6eb85760
gnu: libtiff: Add "doc" output.
...
* gnu/packages/image.scm (libtiff)[outputs, arguments]: New fields.
2015-09-09 15:25:05 +02:00
Andreas Enge
1de0afd5a5
gnu: libtiff: Build with the current libjpeg instead of libjpeg-8.
...
* gnu/packages/image.scm (libtiff)[inputs]: Use libjpeg instead of libjpeg-9.
[arguments]: Drop the now unneeded field.
2015-09-05 17:58:53 +02:00
Andreas Enge
45468e3649
gnu: libtiff: Update to 4.0.5.
...
* gnu/packages/patches/libtiff-CVE-2012-4564.patch,
gnu/packages/patches/libtiff-CVE-2013-1960.patch,
gnu/packages/patches/libtiff-CVE-2013-1961.patch,
gnu/packages/patches/libtiff-CVE-2013-4231.patch,
gnu/packages/patches/libtiff-CVE-2013-4232.patch,
gnu/packages/patches/libtiff-CVE-2013-4243.patch,
gnu/packages/patches/libtiff-CVE-2013-4244.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt2.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt3.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt4.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt1.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt2.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt3.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt4.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt5.patch,
gnu/packages/patches/libtiff-CVE-2014-8129.patch,
gnu/packages/patches/libtiff-CVE-2014-9330.patch,
gnu/packages/patches/libtiff-CVE-2014-9655.patch: Delete files.
* gnu-system.am (dist_patch_DATA): Unregister the patches.
* gnu/packages/image.scm (libtiff): Update to 4.0.5 and drop the patches.
2015-09-05 17:58:45 +02:00
Andreas Enge
6376ed4a34
gnu: libtiff: Update home page.
...
* gnu/packages/image.scm (libtiff)[home-page]: Update.
2015-09-04 21:51:43 +02:00
Andreas Enge
ced7cc92d7
gnu: vigra: Add support for OpenEXR.
...
* gnu/packages/image.scm (vigra)[inputs]: Add ilmbase and openexr.
[arguments]: Augment #:configure-flags.
2015-09-04 21:30:00 +02:00
Alex Kost
7c125ce023
gnu packages: Avoid description lines with leading "(".
...
* gnu/packages/curl.scm (curl): Reformat description to avoid a line
beginning with "(" because such lines break font-lock highlighting
in Emacs.
* gnu/packages/flashing-tools.scm (dfu-programmer): Likewise.
* gnu/packages/games.scm (gnugo): Likewise.
* gnu/packages/gnome.scm (json-glib): Likewise.
* gnu/packages/image.scm (jbig2dec): Likewise.
* gnu/packages/maths.scm (units): Likewise.
* gnu/packages/pdf.scm (mupdf): Likewise.
* gnu/packages/web.scm (perl-encode-locale): Likewise.
* gnu/packages/wordnet.scm (wordnet): Likewise.
* gnu/packages/xml.scm (libxml2):Likewise.
2015-07-18 13:05:01 +03:00
Mark H Weaver
9ed5486439
gnu: libwmf: Fix CVE-2006-3376, CVE-2009-1364, CVE-2015-{0848,4588,4695,4696}.
...
* gnu/packages/patches/libwmf-CVE-2006-3376.patch,
gnu/packages/patches/libwmf-CVE-2009-1364.patch,
gnu/packages/patches/libwmf-CVE-2015-0848+4588+4695+4696.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/image.scm (libwmf)[source]: Add patches.
2015-07-06 20:04:50 -04:00
Mark H Weaver
2abf678682
Merge branch 'master' into core-updates
2015-06-18 01:32:37 -04:00
宋文武
b9ecd5ae24
gnu: Add libmng.
...
* gnu/packages/image.scm (libmng): New variable.
2015-06-16 23:30:06 +08:00
Mark H Weaver
8e28d22c91
gnu: libtiff: Add fixes for several CVEs.
...
* gnu/packages/patches/libtiff-CVE-2012-4564.patch,
gnu/packages/patches/libtiff-CVE-2013-1960.patch,
gnu/packages/patches/libtiff-CVE-2013-1961.patch,
gnu/packages/patches/libtiff-CVE-2013-4231.patch,
gnu/packages/patches/libtiff-CVE-2013-4232.patch,
gnu/packages/patches/libtiff-CVE-2013-4243.patch,
gnu/packages/patches/libtiff-CVE-2013-4244.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt1.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt2.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt3.patch,
gnu/packages/patches/libtiff-CVE-2014-8127-pt4.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt1.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt2.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt3.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt4.patch,
gnu/packages/patches/libtiff-CVE-2014-8128-pt5.patch,
gnu/packages/patches/libtiff-CVE-2014-8129.patch,
gnu/packages/patches/libtiff-CVE-2014-9330.patch,
gnu/packages/patches/libtiff-CVE-2014-9655.patch: New files.
* gnu-system.am (dist_patch_DATA): Add them.
* gnu/packages/image.scm (libtiff)[source]: Add patches.
2015-06-16 01:02:01 -04:00
Ludovic Courtès
1eefe4a87b
gnu: Tweak a few synopses and descriptions reported by 'lint'.
...
* gnu/packages/haskell.scm (ghc-text)[synopsis]: Remove period.
[description]: Two space after end-of-sentence periods.
(ghc-http)[description]: Likewise.
* gnu/packages/image.scm (libwebp)[description]: Likewise.
* gnu/packages/libedit.scm (libedit)[description]: Likewise.
* gnu/packages/kde.scm (oxygen-icons)[synopsis]: Capitalize.
2015-05-13 22:51:56 +02:00
Alex Kost
85a02905e4
gnu: imlib2: Update to 1.4.7.
...
* gnu/packages/image.scm (imlib2): Update to 1.4.7.
2015-04-27 20:56:00 +03:00
Ludovic Courtès
f8503e2b25
utils: 'modify-phases' no longer introduces quotes.
...
Suggested by Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>.
* guix/build/utils.scm (%modify-phases): Remove quotes.
* guix/build/cmake-build-system.scm (%standard-phases): Adjust
accordingly.
* guix/build/glib-or-gtk-build-system.scm (%standard-phases): Likewise.
* guix/build/gnu-dist.scm (%dist-phases): Likewise.
* guix/build/perl-build-system.scm (%standard-phases): Likewise.
* guix/build/python-build-system.scm (%standard-phases): Likewise.
* guix/build/ruby-build-system.scm (%standard-phases): Likewise.
* guix/build/waf-build-system.scm (%standard-phases): Likewise.
* gnu/packages/bash.scm, gnu/packages/code.scm, gnu/packages/gl.scm,
gnu/packages/gnome.scm, gnu/packages/graphics.scm,
gnu/packages/image.scm, gnu/packages/key-mon.scm,
gnu/packages/ocr.scm, gnu/packages/plotutils.scm,
gnu/packages/search.scm, gnu/packages/video.scm: Likewise.
2015-03-31 22:43:01 +02:00
Taylan Ulrich Bayırlı/Kammer
894e2cba52
gnu: Add leptonica.
...
* gnu/packages/image.scm (leptonica): New variable.
2015-03-27 19:39:31 +01:00
Taylan Ulrich Bayırlı/Kammer
060ad3def4
gnu: Add libwebp.
...
* gnu/packages/image.scm (libwebp): New variable.
2015-03-27 19:39:31 +01:00
Ludovic Courtès
166191b377
gnu: Update packages to use 'non-copyleft' instead of 'bsd-style'.
...
* gnu/packages/avr.scm, gnu/packages/compression.scm,
gnu/packages/curl.scm, gnu/packages/cyrus-sasl.scm,
gnu/packages/databases.scm, gnu/packages/firmware.scm,
gnu/packages/flex.scm, gnu/packages/fontutils.scm,
gnu/packages/gd.scm, gnu/packages/ghostscript.scm,
gnu/packages/gnunet.scm, gnu/packages/graphics.scm,
gnu/packages/hugs.scm, gnu/packages/image.scm,
gnu/packages/linux.scm, gnu/packages/mail.scm,
gnu/packages/maths.scm, gnu/packages/mit-krb5.scm,
gnu/packages/python.scm, gnu/packages/rdf.scm,
gnu/packages/ssh.scm, gnu/packages/tcl.scm,
gnu/packages/xdisorg.scm, gnu/packages/xiph.scm,
gnu/packages/yasm.scm, gnu/packages/zip.scm: Use 'non-copyleft'
instead of 'bsd-style'.
2015-03-14 19:27:14 +01:00
Andreas Enge
97039f6ef2
gnu: Add vigra.
...
* gnu/packages/image.scm (vigra): New variable.
Co-authored-by: John Darrington <john@darrington.wattle.id.au>
2015-03-13 10:35:13 +01:00
Taylan Ulrich Bayırlı/Kammer
0731a47cd4
gnu: Add libungif.
...
* gnu/packages/image.scm (libungif): New variable.
2015-03-09 22:57:43 +01:00
Ludovic Courtès
da6dd842d0
gnu: Remove now unneeded 'unpack' phases for unzip.
...
This is a followup to commit cd0385b
.
* gnu/packages/bioinformatics.scm (hisat)[arguments]: Remove 'unpack'
phase.
* gnu/packages/image.scm (freeimage): Likewise.
* gnu/packages/python.scm (python2-cssutils): Likewise.
2015-02-27 15:08:37 +01:00
Eric Bavier
ca4077561f
gnu: openjpeg: Upgrade to 2.1.0.
...
* gnu/packages/image.scm (openjpeg): Upgrade to 2.1.0.
(openjpeg-2.0): New variable.
* gnu/packages/pdf.scm (mupdf)[inputs]: Use openjpeg-2.0.
2015-02-02 13:03:42 -06:00
Mark H Weaver
73161579b2
gnu: libpng: Update to 1.5.21.
...
* gnu/packages/image.scm (libpng): Update to 1.5.21.
2015-01-12 18:35:42 -05:00
Ricardo Wurmus
da2021bca1
gnu: openjpeg: Update to 2.0.1.
...
* gnu/packages/image.scm (openjpeg): Update to 2.0.1.
2015-01-09 14:24:07 +01:00
Ricardo Wurmus
6140b9d875
gnu: Add openjpeg-1.
...
* gnu/packages/image.scm (openjpeg-1): New variable.
2015-01-09 14:23:57 +01:00
Ricardo Wurmus
4100fe9d33
gnu: openjpeg: update home page URL.
...
* gnu/packages/image.scm (openjpeg)[home-page]: Update URL.
2015-01-09 14:23:46 +01:00
David Thompson
f9664de768
gnu: freeimage: Remove MIPS from supported-systems.
...
* gnu/packages/image.scm (freeimage): Drop support for "mips64el-linux".
2014-11-04 22:10:50 -05:00
David Thompson
43402c5cd2
gnu: Add freeimage.
...
* gnu/packages/image.scm (freeimage): New variable.
2014-11-02 12:33:25 -05:00
Alex Kost
8835aed4ad
licenses: Add 'imlib2'.
...
* guix/licenses.scm (imlib2): New variable.
* gnu/packages/image.scm (imlib2): Use it.
2014-10-26 22:22:43 +03:00
Eric Bavier
35b9e4232c
gnu: Some cleanup based on lint checkers.
...
* gnu/packages/admin.scm, gnu/packages/aidc.scm, gnu/packages/algebra.scm,
gnu/packages/apr.scm, gnu/packages/avahi.scm, gnu/packages/backup.scm,
gnu/packages/base.scm, gnu/packages/calcurse.scm, gnu/packages/cdrom.scm,
gnu/packages/check.scm, gnu/packages/compression.scm, gnu/packages/cook.scm,
gnu/packages/crypto.scm, gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
gnu/packages/cyrus-sasl.scm, gnu/packages/databases.scm,
gnu/packages/doxygen.scm, gnu/packages/dwm.scm, gnu/packages/elf.scm,
gnu/packages/emacs.scm, gnu/packages/feh.scm, gnu/packages/file.scm,
gnu/packages/fish.scm, gnu/packages/flex.scm, gnu/packages/fltk.scm,
gnu/packages/fontutils.scm, gnu/packages/games.scm, gnu/packages/gcal.scm,
gnu/packages/gcc.scm, gnu/packages/geeqie.scm, gnu/packages/ghostscript.scm,
gnu/packages/gimp.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gperf.scm, gnu/packages/grub.scm, gnu/packages/gsasl.scm,
gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm,
gnu/packages/hurd.scm, gnu/packages/icu4c.scm, gnu/packages/image.scm,
gnu/packages/imagemagick.scm, gnu/packages/irssi.scm, gnu/packages/kde.scm,
gnu/packages/libdaemon.scm, gnu/packages/libevent.scm,
gnu/packages/libidn.scm, gnu/packages/libusb.scm, gnu/packages/linux.scm,
gnu/packages/lout.scm, gnu/packages/lsh.scm, gnu/packages/lsof.scm,
gnu/packages/lua.scm, gnu/packages/maths.scm, gnu/packages/mcrypt.scm,
gnu/packages/mp3.scm, gnu/packages/netpbm.scm, gnu/packages/noweb.scm,
gnu/packages/ocaml.scm, gnu/packages/openssl.scm, gnu/packages/pcre.scm,
gnu/packages/pdf.scm, gnu/packages/pkg-config.scm,
gnu/packages/pretty-print.scm, gnu/packages/python.scm, gnu/packages/qt.scm,
gnu/packages/rsync.scm, gnu/packages/scheme.scm, gnu/packages/scrot.scm,
gnu/packages/sdl.scm, gnu/packages/skribilo.scm, gnu/packages/ssh.scm,
gnu/packages/stalonetray.scm, gnu/packages/tcl.scm, gnu/packages/tcsh.scm,
gnu/packages/telephony.scm, gnu/packages/texlive.scm, gnu/packages/tor.scm,
gnu/packages/valgrind.scm, gnu/packages/version-control.scm,
gnu/packages/vim.scm, gnu/packages/vpn.scm, gnu/packages/w3m.scm,
gnu/packages/web.scm, gnu/packages/wordnet.scm, gnu/packages/xiph.scm,
gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/packages/zile.scm,
gnu/packages/zip.scm, gnu/packages/zsh.scm [synopsis, description]: Adjust
according to lint checkers.
* gnu/packages/fltk.scm (fltk)[source]: Wrap long line in uri.
* /gnu/packages/xiph.scm (libogg, libtheora, vorbis-tools)[source]: Same.
2014-10-26 13:03:53 -05:00
Eric Bavier
a0e9b72e44
gnu: libjpeg: Upgrade to version 9a.
...
* gnu/packages/image.scm (libjpeg): Upgrade to version 9a.
2014-10-11 21:11:23 -05:00
Alex Kost
e596ab0f24
gnu: Move giflib to (gnu packages image).
...
* gnu/packages/giflib.scm: Remove. Move the contents to (gnu packages image).
* gnu-system.am (GNU_SYSTEM_MODULES): Remove giflib file name.
* gnu/packages/emacs.scm: Remove giflib module name.
* gnu/packages/image.scm (giflib): New variable.
2014-09-30 08:50:35 +04:00
Alex Kost
f7d28082bb
gnu: Add giblib.
...
* gnu/packages/image.scm (giblib): New variable.
2014-09-26 09:23:10 +04:00
Alex Kost
76d88cfa57
gnu: Add imlib2.
...
* gnu/packages/image.scm (imlib2): New variable.
2014-09-26 09:23:10 +04:00
Mark H Weaver
b5b73a8269
Use #:prefix instead of #:renamer with 'symbol-prefix-proc'.
...
* gnu/packages/abiword.scm, gnu/packages/admin.scm, gnu/packages/aidc.scm,
gnu/packages/backup.scm, gnu/packages/bittorrent.scm,
gnu/packages/boost.scm, gnu/packages/compression.scm,
gnu/packages/cryptsetup.scm, gnu/packages/curl.scm,
gnu/packages/cyrus-sasl.scm, gnu/packages/dc.scm, gnu/packages/emacs.scm,
gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/geeqie.scm,
gnu/packages/ghostscript.scm, gnu/packages/gimp.scm,
gnu/packages/gkrellm.scm, gnu/packages/gl.scm, gnu/packages/glib.scm,
gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm,
gnu/packages/gnutls.scm, gnu/packages/gnuzilla.scm, gnu/packages/gsasl.scm,
gnu/packages/gtk.scm, gnu/packages/gv.scm, gnu/packages/image.scm,
gnu/packages/indent.scm, gnu/packages/inkscape.scm,
gnu/packages/lesstif.scm, gnu/packages/links.scm, gnu/packages/lisp.scm,
gnu/packages/lsh.scm, gnu/packages/lsof.scm, gnu/packages/maths.scm,
gnu/packages/mp3.scm, gnu/packages/openssl.scm, gnu/packages/ots.scm,
gnu/packages/pciutils.scm, gnu/packages/pcre.scm, gnu/packages/pdf.scm,
gnu/packages/pulseaudio.scm, gnu/packages/python.scm, gnu/packages/slim.scm,
gnu/packages/ssh.scm, gnu/packages/texlive.scm, gnu/packages/vim.scm,
gnu/packages/vpn.scm, gnu/packages/web.scm, gnu/packages/wv.scm,
gnu/packages/xiph.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm,
gnu/packages/yasm.scm, gnu/packages/zip.scm,
guix/build/cmake-build-system.scm, guix/build/perl-build-system.scm,
guix/build/python-build-system.scm, guix/download.scm: Replaces uses of
#:renamer and 'symbol-prefix-proc' with #:prefix.
2014-09-23 18:52:29 -04:00
Ludovic Courtès
f07aa672fd
Merge branch 'core-updates'
2014-09-22 23:06:33 +02:00
Marek Benc
38c55e5c8e
gnu: Add openjpeg.
...
* gnu/packages/image.scm (openjpeg): New variable.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-15 09:00:12 +02:00
Marek Benc
8d9872b539
gnu: Add jbig2dec
...
* gnu/packages/image.scm (jbig2dec): New variable.
* gnu/packages/patches/jbig2dec-ignore-testtest.patch: New file.
* gnu-system.am (dist_patch_DATA): Added the above patch.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2014-09-15 08:54:02 +02:00
Mark H Weaver
66ea98e321
Merge branch 'master' into core-updates
...
Conflicts:
gnu/packages/image.scm
2014-09-11 18:26:28 -04:00