01/01: Merge branch 'master' into core-updates

[Mark H. Weaver]

mhw pushed a commit to branch core-updates
in repository guix.

commit 54d9479d8adf86e486d02267427829f43e7042b6
Merge: 52cabc6 d771ba6
Author: Mark H Weaver <address@hidden>
Date:   Sat May 27 03:39:12 2017 -0400

    Merge branch 'master' into core-updates

 gnu/local.mk                                       |   4 -
 gnu/packages/admin.scm                             |  39 ++-
 gnu/packages/avr.scm                               |   4 +-
 gnu/packages/connman.scm                           |   5 +-
 gnu/packages/cross-base.scm                        |  32 +-
 gnu/packages/crypto.scm                            |  26 +-
 gnu/packages/emacs.scm                             |  53 ++-
 gnu/packages/embedded.scm                          |  43 ++-
 gnu/packages/fontutils.scm                         |  11 +-
 gnu/packages/game-development.scm                  |  15 +-
 gnu/packages/games.scm                             |   9 +-
 gnu/packages/gnuzilla.scm                          |  56 ++-
 gnu/packages/graphics.scm                          | 106 +++---
 gnu/packages/kodi.scm                              |   6 +-
 gnu/packages/linux.scm                             |  95 +++++-
 gnu/packages/logging.scm                           |  40 +++
 gnu/packages/make-bootstrap.scm                    |   4 +-
 gnu/packages/messaging.scm                         |  53 ++-
 gnu/packages/ocaml.scm                             | 257 ++++++++++++++
 gnu/packages/patches/graphite2-CVE-2017-5436.patch |  25 --
 .../patches/graphite2-check-code-point-limit.patch |  50 ---
 .../graphite2-fix-32-bit-wrap-arounds.patch        |  93 -----
 .../graphite2-non-linear-classes-even-number.patch |  26 --
 gnu/packages/python.scm                            | 212 +++++++++++-
 gnu/packages/tls.scm                               |   4 +-
 gnu/packages/video.scm                             |   4 +-
 gnu/packages/webkit.scm                            |   4 +-
 gnu/packages/wm.scm                                |  11 +-
 gnu/packages/xdisorg.scm                           |   4 +-
 guix/base64.scm                                    | 377 +++++++++++----------
 guix/build-system/gnu.scm                          |   4 +-
 guix/build/pull.scm                                |  25 +-
 guix/modules.scm                                   |  21 +-
 tests/modules.scm                                  |  25 +-
 34 files changed, 1166 insertions(+), 577 deletions(-)

diff --cc gnu/local.mk
index 416bf9e,a97be8b..6bb2306
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -640,12 -640,7 +640,8 @@@ dist_patch_DATA =                                 
        
    %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
    %D%/packages/patches/gobject-introspection-cc.patch         \
    %D%/packages/patches/gobject-introspection-girepository.patch       \
-   %D%/packages/patches/graphite2-CVE-2017-5436.patch          \
-   %D%/packages/patches/graphite2-check-code-point-limit.patch \
    %D%/packages/patches/graphite2-ffloat-store.patch           \
-   %D%/packages/patches/graphite2-fix-32-bit-wrap-arounds.patch        \
-   %D%/packages/patches/graphite2-non-linear-classes-even-number.patch \
 +  %D%/packages/patches/grep-gnulib-lock.patch                   \
    %D%/packages/patches/grep-timing-sensitive-test.patch               \
    %D%/packages/patches/gsl-test-i686.patch                    \
    %D%/packages/patches/gspell-dash-test.patch                 \
diff --cc gnu/packages/fontutils.scm
index 5544111,efea81d..c5a6923
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -375,21 -385,17 +375,16 @@@ applications should be."
  (define-public graphite2
    (package
     (name "graphite2")
--   (version "1.3.9")
 -   (replacement graphite2/fixed)
++   (version "1.3.10")
     (source
       (origin
         (method url-fetch)
         (uri (string-append "https://github.com/silnrsi/graphite/releases/";
                             "download/" version "/" name "-" version ".tgz"))
-        (patches (search-patches
-                  "graphite2-ffloat-store.patch"
-                  "graphite2-check-code-point-limit.patch"
-                  "graphite2-CVE-2017-5436.patch"
-                  "graphite2-fix-32-bit-wrap-arounds.patch"
-                  "graphite2-non-linear-classes-even-number.patch"))
+        (patches (search-patches "graphite2-ffloat-store.patch"))
         (sha256
          (base32
--         "0rs5h7m340z75kygx8d72cps0q6yvvqa9i788vym7585cfv8a0gc"))))
++         "1bm1rl2ww0m8rvmknh8fpajyz9xqv43qs9qrzf7xd5gaz6rf7zch"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("python" ,python-2) ; because of "import imap" in tests