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: Sun, 28 Apr 2019 08:50:50 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 7d62fa206b701504b110f253e3efb217eed475ad
Merge: c5db31d cd8dce8
Author: Ludovic Courtès <address@hidden>
Date:   Sun Apr 28 14:45:35 2019 +0200

    Merge branch 'staging'

 gnu/local.mk                                       |  12 +-
 gnu/packages/apr.scm                               |   4 +-
 gnu/packages/base.scm                              |   6 +-
 gnu/packages/build-tools.scm                       |   4 +-
 gnu/packages/certs.scm                             |   4 +-
 gnu/packages/cups.scm                              |  14 +-
 gnu/packages/databases.scm                         |   9 +-
 gnu/packages/documentation.scm                     |   4 +-
 gnu/packages/elf.scm                               |   4 +-
 gnu/packages/emacs-xyz.scm                         |  25 +
 gnu/packages/fontutils.scm                         |  61 +-
 gnu/packages/freedesktop.scm                       |  33 +-
 gnu/packages/gdb.scm                               |   4 +-
 gnu/packages/geo.scm                               |   4 +-
 gnu/packages/gl.scm                                |  56 +-
 gnu/packages/glib.scm                              |   4 +-
 gnu/packages/gnome.scm                             | 887 +++++++++++++--------
 gnu/packages/gtk.scm                               | 124 +--
 gnu/packages/imagemagick.scm                       |   4 +-
 gnu/packages/libffi.scm                            |  45 +-
 gnu/packages/linux.scm                             |  25 +-
 gnu/packages/maths.scm                             |  12 +-
 gnu/packages/networking.scm                        |   3 +-
 gnu/packages/ninja.scm                             |   4 +-
 gnu/packages/nss.scm                               |  10 +-
 .../patches/at-spi2-core-meson-compat.patch        |  18 +
 gnu/packages/patches/doxygen-test.patch            |   8 +-
 .../patches/gcr-disable-failing-tests.patch        | 126 ---
 ...-fix-collection-tests-to-work-with-gpg-21.patch |  31 -
 .../patches/gnome-todo-libical-compat.patch        |  17 -
 .../patches/gtk3-fix-deprecation-macro-use.patch   |  28 -
 ...8.0-fix-variable-length-integer-receiving.patch |  15 +
 ...on-robotframework-honor-source-date-epoch.patch |  62 ++
 .../patches/texlive-bin-CVE-2018-17407.patch       | 249 ++++++
 .../texlive-bin-pdftex-poppler-compat.patch        | 188 -----
 .../patches/texlive-bin-xetex-poppler-compat.patch |  31 -
 gnu/packages/patches/totem-meson-compat.patch      |  14 +
 gnu/packages/patches/valgrind-glibc-compat.patch   |  18 -
 gnu/packages/pciutils.scm                          |   4 +-
 gnu/packages/pdf.scm                               |   4 +-
 gnu/packages/python-web.scm                        |  15 +-
 gnu/packages/python-xyz.scm                        | 297 ++++++-
 gnu/packages/rust.scm                              |   4 +-
 gnu/packages/sdl.scm                               |   9 +-
 gnu/packages/tex.scm                               |  36 +-
 gnu/packages/valgrind.scm                          |  13 +-
 gnu/packages/video.scm                             |  13 +-
 gnu/packages/vulkan.scm                            |  40 +-
 gnu/packages/wm.scm                                |   1 +
 gnu/packages/xdisorg.scm                           |  37 +-
 gnu/packages/xiph.scm                              |  12 +-
 gnu/packages/xorg.scm                              |  45 +-
 guix/build/ruby-build-system.scm                   |  55 +-
 53 files changed, 1620 insertions(+), 1132 deletions(-)

diff --cc gnu/packages/gnome.scm
index e0ffe34,e4739ec..17dc2fd
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -33,7 -33,7 +33,8 @@@
  ;;; Copyright © 2018 Vasile Dumitrascu <address@hidden>
  ;;; Copyright © 2018 Björn Höfling <address@hidden>
  ;;; Copyright © 2018, 2019 Timothy Sample <address@hidden>
 +;;; Copyright © 2019 Danny Milosavljevic <address@hidden>
+ ;;; Copyright © 2019 Marius Bakke <address@hidden>
  ;;;
  ;;; This file is part of GNU Guix.
  ;;;



reply via email to

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