[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'gnome-updates'
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'gnome-updates' |
|
Date: |
Thu, 12 May 2016 22:51:00 +0000 (UTC) |
mhw pushed a commit to branch master
in repository guix.
commit 207c604637737408a3d4cd9214a9e69ce4b21bb3
Merge: 11d7d7b ef06d54
Author: Mark H Weaver <address@hidden>
Date: Thu May 12 18:48:36 2016 -0400
Merge branch 'gnome-updates'
gnu/local.mk | 18 +-
gnu/packages/fontutils.scm | 29 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/game-development.scm | 10 +-
gnu/packages/glib.scm | 138 +-
gnu/packages/gnome.scm | 432 ++--
gnu/packages/gnuzilla.scm | 16 +-
gnu/packages/gstreamer.scm | 3 +
gnu/packages/gtk.scm | 95 +-
gnu/packages/inkscape.scm | 7 +-
gnu/packages/key-mon.scm | 13 -
gnu/packages/music.scm | 12 +-
gnu/packages/patches/glib-tests-desktop.patch | 138 --
gnu/packages/patches/glib-tests-gapplication.patch | 28 -
gnu/packages/patches/glib-tests-homedir.patch | 59 -
gnu/packages/patches/glib-tests-prlimit.patch | 14 -
gnu/packages/patches/glib-tests-timer.patch | 11 -
gnu/packages/patches/gtk2-theme-paths.patch | 41 +
gnu/packages/patches/icecat-CVE-2016-2805.patch | 75 -
.../patches/icecat-CVE-2016-2807-pt1.patch | 35 -
.../patches/icecat-CVE-2016-2807-pt2.patch | 69 -
.../patches/icecat-CVE-2016-2807-pt3.patch | 33 -
.../patches/icecat-CVE-2016-2807-pt4.patch | 37 -
.../patches/icecat-CVE-2016-2807-pt5.patch | 35 -
gnu/packages/patches/icecat-CVE-2016-2808.patch | 389 ---
gnu/packages/patches/icecat-CVE-2016-2814.patch | 35 -
.../icecat-re-enable-DHE-cipher-suites.patch | 24 -
.../patches/icecat-update-bundled-graphite2.patch | 2488 --------------------
.../patches/inkscape-drop-wait-for-targets.patch | 68 +
gnu/packages/patches/poppler-CVE-2015-8868.patch | 30 -
gnu/packages/patches/totem-debug-format-fix.patch | 11 +
gnu/packages/pdf.scm | 24 +-
gnu/packages/xdisorg.scm | 4 +-
guix/profiles.scm | 143 +-
34 files changed, 646 insertions(+), 3922 deletions(-)
diff --cc gnu/local.mk
index e7001ec,8611158..acb9790
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -529,26 -524,14 +525,17 @@@ dist_patch_DATA =
gnu/packages/patches/guile-relocatable.patch \
gnu/packages/patches/guile-rsvg-pkgconfig.patch \
gnu/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
+ gnu/packages/patches/gtk2-theme-paths.patch \
gnu/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
+ gnu/packages/patches/hdf5-config-date.patch \
gnu/packages/patches/hop-bigloo-4.0b.patch \
gnu/packages/patches/hop-linker-flags.patch \
gnu/packages/patches/hydra-automake-1.15.patch \
gnu/packages/patches/hydra-disable-darcs-test.patch \
+ gnu/packages/patches/hypre-doc-tables.patch \
+ gnu/packages/patches/hypre-ldflags.patch \
gnu/packages/patches/icecat-avoid-bundled-includes.patch \
- gnu/packages/patches/icecat-re-enable-DHE-cipher-suites.patch \
- gnu/packages/patches/icecat-update-bundled-graphite2.patch \
- gnu/packages/patches/icecat-CVE-2016-2805.patch \
- gnu/packages/patches/icecat-CVE-2016-2807-pt1.patch \
- gnu/packages/patches/icecat-CVE-2016-2807-pt2.patch \
- gnu/packages/patches/icecat-CVE-2016-2807-pt3.patch \
- gnu/packages/patches/icecat-CVE-2016-2807-pt4.patch \
- gnu/packages/patches/icecat-CVE-2016-2807-pt5.patch \
- gnu/packages/patches/icecat-CVE-2016-2808.patch \
- gnu/packages/patches/icecat-CVE-2016-2814.patch \
gnu/packages/patches/icu4c-CVE-2014-6585.patch \
gnu/packages/patches/icu4c-CVE-2015-1270.patch \
gnu/packages/patches/icu4c-CVE-2015-4760.patch \