guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: Merge branch 'staging'


From: guix-commits
Subject: 01/01: Merge branch 'staging'
Date: Sat, 9 Feb 2019 09:26:49 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 50a93adc05b611836e740c4b55571890f4c6770a
Merge: 722ac64 69fb26d
Author: Ludovic Courtès <address@hidden>
Date:   Sat Feb 9 15:14:59 2019 +0100

    Merge branch 'staging'

 doc/guix.texi                                      |  38 +-
 gnu/local.mk                                       |  32 +-
 gnu/packages/audio.scm                             |   2 +-
 gnu/packages/base.scm                              |  38 +-
 gnu/packages/boost.scm                             |  26 +-
 gnu/packages/build-tools.scm                       |   4 +-
 gnu/packages/certs.scm                             |   4 +-
 gnu/packages/cmake.scm                             |   4 +-
 gnu/packages/compression.scm                       |  12 +-
 gnu/packages/cups.scm                              |   8 +-
 gnu/packages/curl.scm                              |  18 +-
 gnu/packages/cyrus-sasl.scm                        |   9 +-
 gnu/packages/databases.scm                         |  12 +-
 gnu/packages/ebook.scm                             |  23 +-
 gnu/packages/enlightenment.scm                     |   1 +
 gnu/packages/freedesktop.scm                       |   8 +-
 gnu/packages/game-development.scm                  |   6 +-
 gnu/packages/games.scm                             |  24 +-
 gnu/packages/geo.scm                               |   3 +-
 gnu/packages/ghostscript.scm                       |   8 +-
 gnu/packages/gl.scm                                |  34 +-
 gnu/packages/glib.scm                              |  27 +-
 gnu/packages/gnome.scm                             |  56 +--
 gnu/packages/gnuzilla.scm                          |   8 +-
 gnu/packages/gstreamer.scm                         |  28 +-
 gnu/packages/gtk.scm                               |  48 +-
 gnu/packages/icu4c.scm                             |   4 +-
 gnu/packages/image.scm                             |  12 +-
 gnu/packages/imagemagick.scm                       |   4 +-
 gnu/packages/kerberos.scm                          |   4 +-
 gnu/packages/libevent.scm                          |   4 +-
 gnu/packages/libreoffice.scm                       |  45 +-
 gnu/packages/linux.scm                             |  51 +--
 gnu/packages/llvm.scm                              |  20 -
 gnu/packages/maths.scm                             |   4 +-
 gnu/packages/mpd.scm                               |   2 +-
 gnu/packages/nettle.scm                            |   4 +-
 gnu/packages/openldap.scm                          |  10 +-
 ...r.patch => allegro-mesa-18.2.5-and-later.patch} |   0
 ....patch => allegro4-mesa-18.2.5-and-later.patch} |  14 +-
 gnu/packages/patches/cairo-CVE-2016-9082.patch     | 122 -----
 gnu/packages/patches/cairo-setjmp-wrapper.patch    |  78 ----
 .../patches/cyrus-sasl-CVE-2013-4122.patch         | 130 ------
 gnu/packages/patches/efl-mesa-compat.patch         |  21 +
 gnu/packages/patches/fbreader-curl-7.62.patch      |  30 ++
 .../patches/ghostscript-CVE-2018-16509.patch       | 193 --------
 gnu/packages/patches/ghostscript-bug-699708.patch  | 160 -------
 .../patches/glib-networking-connection.patch       |  51 +++
 .../patches/glib-networking-ssl-cert-file.patch    |  29 --
 .../patches/gnutls-skip-pkgconfig-test.patch       |  24 -
 .../patches/inkscape-poppler-compat3.patch         | 499 +++++++++++++++++++++
 .../patches/json-glib-fix-tests-32bit.patch        | 174 -------
 gnu/packages/patches/libreoffice-boost.patch       |  17 +
 gnu/packages/patches/libtiff-CVE-2017-18013.patch  |  45 --
 gnu/packages/patches/libtiff-CVE-2017-9935.patch   | 162 -------
 gnu/packages/patches/libtiff-CVE-2018-10963.patch  |  40 --
 gnu/packages/patches/libtiff-CVE-2018-8905.patch   |  61 ---
 gnu/packages/patches/pingus-boost-headers.patch    | 379 ++++++++++++++++
 gnu/packages/patches/poppler-CVE-2018-19149.patch  |  80 ----
 .../postgresql-disable-resolve_symlinks.patch      |  25 ++
 gnu/packages/patches/pyqt-public-sip.patch         |  70 +--
 gnu/packages/patches/qt-5-renameat2.patch          |  35 --
 gnu/packages/patches/sssd-curl-compat.patch        |  18 +
 .../texlive-bin-luatex-poppler-compat.patch        | 318 +++++++++++++
 .../texlive-bin-pdftex-poppler-compat.patch        | 188 ++++++++
 .../patches/texlive-bin-xetex-poppler-compat.patch |  31 ++
 gnu/packages/patches/wesnoth-newer-boost.patch     |  46 ++
 .../zathura-plugindir-environment-variable.patch   |  32 --
 gnu/packages/pdf.scm                               |  21 +-
 gnu/packages/php.scm                               |   2 +
 gnu/packages/python-compression.scm                |  19 +-
 gnu/packages/qt.scm                                | 182 ++++----
 gnu/packages/ruby.scm                              |  25 +-
 gnu/packages/scribus.scm                           |  54 ++-
 gnu/packages/spice.scm                             |   6 +-
 gnu/packages/sssd.scm                              |   1 +
 gnu/packages/storage.scm                           |   2 +-
 gnu/packages/tex.scm                               |  10 +-
 gnu/packages/tls.scm                               |  17 +-
 gnu/packages/video.scm                             |   4 +-
 gnu/packages/vulkan.scm                            |  42 +-
 gnu/packages/web.scm                               |  26 +-
 gnu/packages/xdisorg.scm                           |  14 +-
 gnu/services/databases.scm                         |  63 ++-
 guix/build/download.scm                            |  16 +-
 85 files changed, 2325 insertions(+), 1896 deletions(-)

diff --cc gnu/local.mk
index 81d2eac,a63f595..1ea8069
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -662,10 -663,9 +663,8 @@@ dist_patch_DATA =                                 
        
    %D%/packages/patches/biber-fix-encoding-write.patch         \
    %D%/packages/patches/binutils-loongson-workaround.patch     \
    %D%/packages/patches/blast+-fix-makefile.patch              \
 -  %D%/packages/patches/blender-newer-ffmpeg.patch             \
    %D%/packages/patches/boost-fix-icu-build.patch              \
    %D%/packages/patches/byobu-writable-status.patch            \
-   %D%/packages/patches/cairo-CVE-2016-9082.patch                      \
-   %D%/packages/patches/cairo-setjmp-wrapper.patch             \
    %D%/packages/patches/calibre-no-updates-dialog.patch                \
    %D%/packages/patches/calibre-use-packaged-feedparser.patch  \
    %D%/packages/patches/casync-renameat2-declaration.patch     \



reply via email to

[Prev in Thread] Current Thread [Next in Thread]