Commit graph

161 commits

Author SHA1 Message Date
Ludovic Courtès 8394619bac
gnu: Simplify package inputs.
This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
2021-12-13 17:48:25 +01:00
Maxime Devos a682fea916
gnu: gs-font: Rename to 'font-ghostscript'.
According to (guix)Fonts, font package names must be prefixed
with 'font-'.  Adjust 'gs-fonts' to follow this convention.

* gnu/packages/fontutils.scm
  (gs-fonts)[name]: Set to "font-ghostscript".
  (gs-fonts): Rename variable to 'font-ghostscript'.
  (gs-fonts): Add deprecated package.
* gnu/packages/ghostscript.scm
  (ghostscript)[arguments]<#:configure-flags>: Replace 'gs-fonts'
  with 'font-ghostscript'.
  (ghostscript)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontconfig)[inputs]: Likewise.
* gnu/packages/gtk.scm
  (pango-1.42)[arguments]{disable-layout-test}: Likewise.
* gnu/packages/imagemagick.scm
  (graphicsmagick)[arguments]{configure-flags}: Likewise.
  (graphicsmagick)[inputs]: Likewise.
* gnu/packages/mp3.scm (ripperx)[propagated-inputs]: Likewise.
* doc/guix.texi (X11 Fonts): Likewise.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-07-25 17:52:36 +02:00
Mark H Weaver 2d3d7faf0a
gnu: imagemagick: Add more upstream fixes.
* gnu/packages/patches/imagemagick-ReadDCMImage-fix.patch,
gnu/packages/patches/imagemagick-ReadDCMPixels-fix.patch,
gnu/packages/patches/imagemagick-WriteTHUMBNAILImage-fix.patch: New files.
* gnu/local.mk (dist_patch_DATA): Add them.
* gnu/packages/imagemagick.scm (source): Add patches.
2021-03-27 19:49:14 -04:00
Mark H Weaver bfc69d5e7c
gnu: imagemagick: Fix CVE-2020-27829.
* gnu/packages/patches/imagemagick-CVE-2020-27829.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/imagemagick.scm (source): Add patch.
2021-03-27 19:49:07 -04:00
Mark H Weaver cb3ae2f246
gnu: imagemagick: Hide 'imagemagick/stable' variant.
* gnu/packages/imagemagick.scm (imagemagick/stable): Hide it.
(imagemagick): Remove inherited 'hidden?' property.
2021-03-27 19:49:02 -04:00
Mark H Weaver ea2b379ac5
gnu: imagemagick: Update to 6.9.12-4.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.12-4.
2021-03-27 19:48:58 -04:00
Mark H Weaver be3aef49ed
gnu: imagemagick: Add 'imagemagick/stable' variant.
* gnu/packages/imagemagick.scm (imagemagick/stable): New variable.
(imagemagick): This is now an alias to 'imagemagick/stable'.
2021-03-27 19:48:39 -04:00
Mark H Weaver 7c2b840d6c
gnu: imagemagick: Remove graft.
Note that this commit does *not* integrate the fixes that were previously
applied via the graft.  This commit simply discards those fixes.  We will
address those security flaws, without grafting, in subsequent commits.

* gnu/packages/imagemagick.scm (imagemagick)[replacement]: Remove field.
(imagemagick/fixed): Remove variable.
2021-03-27 19:48:31 -04:00
Léo Le Bouter 2e0ff59f0c
gnu: imagemagick/fixed: Redirect old sonames to new sonames.
* gnu/packages/imagemagick.scm (imagemagick/fixed)[arguments]: Add
'fix-compat-cheat-rename-so phase to redirect old soname paths (expected
without grafting) to new sonames introduced by ImageMagick 6.9.12-0 and
later. These sonames are probably not forward compatible but most probably
backwards compatible so it should suffice until we remove the graft.
2021-03-18 11:13:18 +01:00
Leo Famulari bb2427fa28
gnu: ImageMagick: Refer to the version number in a more robust way.
* gnu/packages/imagemagick.scm (imagemagick)[arguments]: Replace use of VERSION
with (PACKAGE-VERSION THIS-PACKAGE).
(imagemagick/fixed): Adjust accordingly.
2021-03-14 16:33:12 -04:00
Leo Famulari bb5d84a048
gnu: ImageMagick: Fix version number in build configuration of grafted replacement.
Fixes <https://bugs.gnu.org/47110>.

This is a followup to commits 852ba914a4 and
82e887ba48.

* gnu/packages/imagemagick.scm (imagemagick/fixed)[name, arguments]: New
fields.
2021-03-12 14:41:17 -05:00
Léo Le Bouter 852ba914a4
gnu: imagemagick/fixed: Retain version length for successful grafting.
* gnu/packages/imagemagick.scm (imagemagick/fixed):
[version]: Append 'g'.
[source]: Hardcode version.
2021-03-10 01:36:26 +01:00
Léo Le Bouter 82e887ba48
gnu: imagemagick: Update to 6.9.12-2 [security fixes].
* gnu/packages/imagemagick.scm (imagemagick/fixed): New variable.
(imagemagick)[replacement]: Graft.
2021-03-09 23:02:51 +01:00
Efraim Flashner 6985a1acb3
Merge branch 'master' into staging 2021-01-10 14:30:36 +02:00
Vinicius Monego 5e99a02b61
gnu: graphicsmagick: Add dependency on libwebp.
* gnu/packages/imagemagick.scm (graphicsmagick): Add dependency on libwebp.
[inputs]: Add libwebp.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2021-01-03 17:24:26 +02:00
Vincent Legoll c369e032ad
gnu: graphicsmagick: Update to 1.3.36.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.36.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2021-01-02 23:44:59 +02:00
Marius Bakke cb89b36cbc
gnu: ImageMagick: Update to 6.9.11-48.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-48.
(imagemagick-next): Remove variable.
* gnu/packages/video.scm (transcode)[inputs]: Change from IMAGEMAGICK-NEXT to
IMAGEMAGICK.
2020-12-13 21:44:10 +01:00
Marius Bakke 4688dc9bb8
gnu: transcode: Build with a newer ImageMagick.
* gnu/packages/imagemagick.scm (imagemagick-next): New public variable.
* gnu/packages/video.scm (transcode)[inputs]: Change from IMAGEMAGICK to
IMAGEMAGICK-NEXT.
2020-11-11 21:35:32 +01:00
Marius Bakke 2565b90068
gnu: ImageMagick: Update to 6.9.11-34.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-34.
2020-10-13 23:48:14 +02:00
Marius Bakke ed2f0ca8b1
gnu: ImageMagick: Update to 6.9.11-24.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-24.
2020-07-25 16:16:07 +02:00
Marius Bakke 36c50eab98
gnu: ImageMagick: Update to 6.9.11-11.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.11-11.
2020-05-26 22:32:49 +02:00
Marius Bakke 2c5bc95a19
gnu: ImageMagick: Build reproducibly.
Fixes <https://bugs.gnu.org/38449>.

* gnu/packages/imagemagick.scm (imagemagick)[arguments]: In #:configure-flags,
add "--enable-reproducible-build".

(cherry picked from commit 87bc9f022c)
2020-03-26 22:35:37 +01:00
Marius Bakke 961d2ee269
Merge branch 'master' into core-updates 2020-03-14 13:13:40 +01:00
Marius Bakke aebba13c0b
Merge branch 'staging' 2020-03-14 12:57:21 +01:00
Marius Bakke 6d84566e5e
gnu: GraphicsMagick: Update to 1.3.35.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.35.
2020-03-14 11:55:33 +01:00
Marius Bakke 690160f648
gnu: ImageMagick: Update to 6.9.10-95.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-95.
2020-02-24 19:41:34 +01:00
Marius Bakke 6ecb884683
gnu: ImageMagick: Update to 6.9.10-92.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-92.
2020-02-14 18:33:58 +01:00
Marius Bakke 52665d2b6b
Merge branch 'staging' into core-updates 2020-02-03 15:45:44 +01:00
Marius Bakke 0a83339bb1
Merge branch 'master' into staging 2020-02-03 15:35:51 +01:00
Leo Famulari 7c73da9907
gnu: GraphicsMagick: Update to 1.3.34.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.34.
2020-01-29 15:17:45 -05:00
Marius Bakke 4bd428a7ce
gnu: Replace uses of 'libjpeg' with 'libjpeg-turbo'.
* gnu/packages/abiword.scm (abiword)[inputs]: Change from LIBJPEG to
LIBJPEG-TURBO.
* gnu/packages/admin.scm (testdisk)[inputs]: Likewise.
* gnu/packages/algebra.scm (giac)[inputs]: Likewise.
* gnu/packages/animation.scm (synfig)[inputs]: Likewise.
* gnu/packages/astronomy.scm (gnuastro, celestia)[inputs]: Likewise.
* gnu/packages/cdrom.scm (dvdstyler)[inputs]: Likewise.
* gnu/packages/cran.scm (r-jpeg, r-tiff, r-readbitmap)[inputs]: Likewise.
* gnu/packages/cups.scm (cups-filters, hplip)[inputs]: Likewise.
* gnu/packages/display-managers.scm (slim)[inputs]: Likewise.
* gnu/packages/ebook.scm (fbreader)[inputs]: Likewise.
* gnu/packages/emacs.scm (emacs)[inputs]: Likewise.
* gnu/packages/enlightenment.scm (efl)[propagated-inputs]: Likewise.
* gnu/packages/fltk.scm (fltk, ntk)[inputs]: Likewise.
* gnu/packages/fontutils.scm (fontforge)[inputs]: Likewise.
* gnu/packages/freedesktop.scm (weston)[inputs]: Likewise.
* gnu/packages/game-development.scm (sfml, allegro, aseprite, python-pygame,
eureka, ioquake3)[inputs]: Likewise.
* gnu/packages/games.scm (adanaxisgpl, freedroidrpg, irrlicht, minetest,
fizmo, supertuxkart, gzdoom, xmoto, xonotic)[inputs]: Likewise.
* gnu/packages/gd.scm (gd, perl-gd)[inputs]: Likewise.
* gnu/packages/ghostscript.scm (lcms)[inputs]: Likewise.
(ghostscript)[inputs, native-inputs]: Likewise.
* gnu/packages/gimp.scm (gegl, gimp)[inputs]: Likewise.
* gnu/packages/gnome.scm (libgnomeui, eog, tracker-miners, gthumb)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/gnustep.scm (windowmaker)[inputs]: Likewise.
* gnu/packages/graphics.scm (blender, blender-2.79, openimageio,
openscenegraph, openscenegraph-3.4, povray, fgallery)[inputs]: Likewise.
* gnu/packages/graphviz.scm (graphviz)[inputs]: Likewise.
* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Likewise.
* gnu/packages/gtk.scm (gdk-pixbuf)[inputs]: Likewise.
* gnu/packages/image-processing.scm (dcmtk, mia, vtk, opencv, vips, nip2, vxl,
insight-toolkit)[inputs]: Likewise.
* gnu/packages/image-viewers.scm (gpicview, luminance-hdr)[inputs]: Likewise.
* gnu/packages/image.scm (jpegoptim, libtiff, leptonica, imlib2, freeimage,
vigra, libwebp, libmng, jasper, steghide, jp2a)[inputs]: Likewise.
* gnu/packages/imagemagick.scm (imagemagick, graphicsmagick)[inputs]: Likewise.
* gnu/packages/java.scm (icedtea-6, icedtea-7, openjdk9, openjdk11,
openjdk12)[inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (khtml)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/machine-learning.scm (dlib, tensorflow)[inputs]: Likewise.
* gnu/packages/mate.scm (atril, eom)[inputs]: Likewise.
* gnu/packages/maths.scm (hdf4, hdf-java, hdf-eos2, netcdf)[inputs]: Likewise.
* gnu/packages/netpbm.scm (netpbm)[inputs]: Likewise.
* gnu/packages/pdf.scm (zathura-pdf-mupdf, podofo, mupdf, fbida)[inputs]: Likewise.
* gnu/packages/photo.scm (libraw, libpano13, enblend-enfuse, darktable, hugin,
rawtherapee)[inputs]: Likewise.
* gnu/packages/prolog.scm (swi-prolog)[native-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-hdf4, python-pillow)[inputs]: Likewise.
* gnu/packages/qt.scm (qtbase, qtwebkit)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/scanner.scm (sane-backends, xsane)[inputs]: Likewise.
* gnu/packages/scheme.scm (racket)[inputs]: Likewise.
* gnu/packages/scribus.scm (scribus)[inputs]: Likewise.
* gnu/packages/sdl.scm (sdl-image)[propagated-inputs]: Likewise.
(guile-sdl)[native-inputs]: Likewise.
* gnu/packages/spice.scm (spice-gtk)[inputs]: Likewise.
* gnu/packages/statistics.scm (r-with-tests)[inputs]: Likewise.
* gnu/packages/tcl.scm (perl-tk)[inputs]: Likewise.
* gnu/packages/upnp.scm (readymedia)[inputs]: Likewise.
* gnu/packages/video.scm (mplayer, mpv, v4l-utils, motion)[inputs]: Likewise.
* gnu/packages/web-browsers.scm (dillo, links)[inputs]: Likewise.
* gnu/packages/web.scm (netsurf)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk)[inputs]: Likewise.
* gnu/packages/wine.scm (wine)[inputs]: Likewise.
* gnu/packages/wv.scm (wv)[inputs]: Likewise.
* gnu/packages/wxwidgets.scm (wxwidgets, wxwidgets-2)[inputs]: Likewise.
* gnu/packages/xdisorg.scm (xscreensaver)[inputs]: Likewise.
* gnu/packages/xfce.scm (tumbler)[inputs]: Likewise.
* gnu/packages/xfig.scm (xfig, transfig)[inputs]: Likewise.
* gnu/packages/xorg.scm (xpra)[inputs]: Likewise.
2020-01-22 22:12:34 +01:00
Marius Bakke 25b8d676c0
gnu: ImageMagick: Update to 6.9.10-87.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-87.
2020-01-19 21:51:45 +01:00
Brett Gilio 94c7f70faa
Merge branch 'master' into staging 2019-12-13 07:58:30 -06:00
Tobias Geerinckx-Rice 8d73e6a244
gnu: graphicsmagick: Update to 1.3.33.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.33.
2019-12-12 03:02:30 +01:00
Marius Bakke ed530aeb71
gnu: imagemagick: Update to 6.9.10-78.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-78.
2019-12-11 01:14:36 +01:00
Marius Bakke a40416f2bf
gnu: imagemagick: Update to 6.9.10-68.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-68.
2019-10-08 21:23:03 +02:00
Marius Bakke c0e40f4fd2
gnu: ImageMagick: Update to 6.9.10-58.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-58.
2019-08-04 13:49:55 +02:00
Marius Bakke 42dcfca4cc
Merge branch 'master' into staging 2019-07-04 16:16:41 +02:00
Leo Famulari 1facde6a19
gnu: GraphicsMagick: Update to 1.3.32.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.32.
2019-07-03 16:24:47 -04:00
Marius Bakke af65e4c289
gnu: ImageMagick: Update to 6.9.10-51.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-51.
2019-07-02 14:49:47 +02:00
Marius Bakke 730c1cc04e
gnu: ImageMagick: Update to 6.9.10-50.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-50.
2019-06-30 13:41:21 +02:00
Marius Bakke 16c38e2b9c
gnu: imagemagick: Update to 6.9.10-49.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-49.
2019-06-14 11:47:41 +02:00
Marius Bakke d43a696080
gnu: imagemagick: Update to 6.9.10-46.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-46.
2019-05-24 23:28:32 +02:00
Marius Bakke 563ecba5cf
gnu: ImageMagick: Update to 6.9.10-45.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-45.
2019-05-13 14:14:42 +02:00
Marius Bakke 569f53e1a8
gnu: imagemagick: Update to 6.9.10-42.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-42.
2019-05-04 16:53:49 +02:00
Marius Bakke b58c754ea8
gnu: ImageMagick: Update to 6.9.10-35.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-35.
2019-04-01 01:32:40 +02:00
Marius Bakke 3374e9207f
gnu: imagemagick: Update to 6.9.10-34.
* gnu/packages/imagemagick.scm (imagemagick): Update to 6.9.10-34.
2019-03-23 22:55:00 +01:00
Marius Bakke 3cb61ca85a
Merge branch 'master' into staging 2019-03-23 22:50:07 +01:00
Tobias Geerinckx-Rice b97df9e570
gnu: graphicsmagick: Update to 1.3.31.
* gnu/packages/imagemagick.scm (graphicsmagick): Update to 1.3.31.
2019-03-22 13:06:59 +01:00
Tobias Geerinckx-Rice 304ed82c53
gnu: graphicsmagick: Don't use NAME in source URI.
* gnu/packages/imagemagick.scm (graphicsmagick)[source]: Hard-code NAME.
2019-03-22 13:06:59 +01:00