[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/09: Merge branch 'master' into gtk-rebuild
|
From: |
??? |
|
Subject: |
02/09: Merge branch 'master' into gtk-rebuild |
|
Date: |
Sat, 23 May 2015 03:32:31 +0000 |
iyzsong pushed a commit to branch gtk-rebuild
in repository guix.
commit 86a81222cad9841c67e9d9bcd46c567383e9a34f
Merge: 3e3d47f 8605321
Author: 宋文武 <address@hidden>
Date: Sat May 23 09:43:12 2015 +0800
Merge branch 'master' into gtk-rebuild
Conflicts:
gnu/packages/gtk.scm
.dir-locals.el | 1 +
.gitignore | 4 +-
AUTHORS | 2 +
Makefile.am | 29 +-
NEWS | 372 +++++
README | 3 +-
THANKS | 2 +
build-aux/check-available-binaries.scm | 2 +-
build-aux/check-final-inputs-self-contained.scm | 2 +-
build-aux/hydra/gnu-system.scm | 33 +-
build-aux/hydra/guix.scm | 33 +-
build-aux/list-packages.scm | 6 +-
build-aux/make-binary-tarball.scm | 47 +
config-daemon.ac | 7 +-
configure.ac | 14 +-
daemon.am | 9 +-
doc.am | 14 +-
doc/guix.texi | 1115 ++++++++++++--
etc/completion/bash/guix | 139 ++
gnu-system.am | 93 +-
gnu/artwork.scm | 4 +-
gnu/build/activation.scm | 95 ++-
gnu/build/file-systems.scm | 17 +-
gnu/build/install.scm | 47 +-
gnu/packages.scm | 26 +-
gnu/packages/admin.scm | 34 +-
gnu/packages/apl.scm | 6 +-
gnu/packages/apr.scm | 25 +-
gnu/packages/audacity.scm | 102 ++
gnu/packages/audio.scm | 394 +++++-
gnu/packages/autogen.scm | 8 +-
gnu/packages/autotools.scm | 6 +-
gnu/packages/base.scm | 99 ++-
gnu/packages/bash.scm | 54 +-
gnu/packages/bioinformatics.scm | 1006 ++++++++++++-
gnu/packages/boost.scm | 45 +-
gnu/packages/bootstrap/i686-linux/bash | Bin 1331220 -> 1351732
bytes
gnu/packages/bootstrap/i686-linux/mkdir | Bin 725756 -> 714316
bytes
gnu/packages/bootstrap/i686-linux/tar | Bin 1140196 -> 1285420
bytes
gnu/packages/bootstrap/i686-linux/xz | Bin 865372 -> 861836
bytes
gnu/packages/bootstrap/x86_64-linux/bash | Bin 1419928 -> 1425560
bytes
gnu/packages/bootstrap/x86_64-linux/mkdir | Bin 799312 -> 792448
bytes
gnu/packages/bootstrap/x86_64-linux/tar | Bin 1229888 -> 1369912
bytes
gnu/packages/bootstrap/x86_64-linux/xz | Bin 926000 -> 927264
bytes
gnu/packages/busybox.scm | 5 +-
gnu/packages/calendar.scm | 52 +
gnu/packages/cdrom.scm | 37 +-
gnu/packages/certs.scm | 2 -
gnu/packages/check.scm | 54 +-
gnu/packages/cmake.scm | 14 +-
gnu/packages/code.scm | 75 +-
gnu/packages/commencement.scm | 128 +-
gnu/packages/compression.scm | 86 +-
gnu/packages/cross-base.scm | 25 +-
gnu/packages/cups.scm | 4 +-
gnu/packages/curl.scm | 10 +-
gnu/packages/databases.scm | 190 +++-
gnu/packages/dejagnu.scm | 4 +-
gnu/packages/dictionaries.scm | 47 +-
gnu/packages/disk.scm | 28 +
gnu/packages/ebook.scm | 8 +-
gnu/packages/ed.scm | 4 +-
gnu/packages/elf.scm | 13 +-
gnu/packages/emacs.scm | 196 ++-
gnu/packages/engineering.scm | 2 +-
gnu/packages/enlightenment.scm | 9 +-
gnu/packages/fcitx.scm | 87 +
gnu/packages/feh.scm | 4 +-
gnu/packages/fltk.scm | 41 +-
gnu/packages/freedesktop.scm | 159 ++-
gnu/packages/ftp.scm | 8 +-
gnu/packages/game-development.scm | 85 +-
gnu/packages/games.scm | 132 ++-
gnu/packages/gcc.scm | 152 ++-
gnu/packages/gd.scm | 79 +
gnu/packages/gdb.scm | 4 +-
gnu/packages/gettext.scm | 10 +-
gnu/packages/ghostscript.scm | 34 +-
gnu/packages/gimp.scm | 7 +-
gnu/packages/gl.scm | 243 +++-
gnu/packages/glib.scm | 68 +-
gnu/packages/gnome.scm | 842 +++++++++--
gnu/packages/gnucash.scm | 72 +
gnu/packages/gnunet.scm | 4 +-
gnu/packages/gnupg.scm | 12 +-
gnu/packages/gnutls.scm | 23 +-
gnu/packages/gnuzilla.scm | 69 +-
gnu/packages/graphics.scm | 5 +-
gnu/packages/gstreamer.scm | 155 +-
gnu/packages/gtk.scm | 206 ++-
gnu/packages/guile.scm | 117 ++
gnu/packages/haskell.scm | 685 ++++++++-
gnu/packages/hurd.scm | 14 +-
gnu/packages/ibus.scm | 92 ++
gnu/packages/icu4c.scm | 4 +-
gnu/packages/image.scm | 114 ++-
gnu/packages/imagemagick.scm | 48 +-
gnu/packages/java.scm | 658 ++++++---
gnu/packages/{freedesktop.scm => jemalloc.scm} | 43 +-
gnu/packages/julia.scm | 193 +++
gnu/packages/kde.scm | 2 +-
gnu/packages/key-mon.scm | 2 +-
gnu/packages/{ld-wrapper.scm => ld-wrapper.in} | 120 +-
gnu/packages/libedit.scm | 2 +-
gnu/packages/libidn.scm | 4 +-
gnu/packages/libreoffice.scm | 634 ++++++++
gnu/packages/libusb.scm | 11 +-
gnu/packages/linux-libre-i686.conf | 381 ++++--
gnu/packages/linux-libre-x86_64.conf | 405 ++++--
gnu/packages/linux.scm | 257 +++-
gnu/packages/lirc.scm | 61 +
gnu/packages/lisp.scm | 26 +-
gnu/packages/lsh.scm | 4 +-
gnu/packages/lsof.scm | 12 +-
gnu/packages/m4.scm | 11 +-
gnu/packages/mail.scm | 271 ++++-
gnu/packages/man.scm | 10 +-
gnu/packages/maths.scm | 222 +++-
gnu/packages/messaging.scm | 23 +-
gnu/packages/moe.scm | 10 +-
gnu/packages/music.scm | 172 ++
gnu/packages/nano.scm | 4 +-
gnu/packages/ncurses.scm | 17 +-
gnu/packages/netpbm.scm | 52 +-
gnu/packages/nettle.scm | 20 +-
gnu/packages/networking.scm | 107 ++
gnu/packages/node.scm | 5 +-
gnu/packages/ntp.scm | 4 +-
gnu/packages/ocr.scm | 93 ++
gnu/packages/ocrad.scm | 46 -
gnu/packages/openldap.scm | 4 +-
gnu/packages/openssl.scm | 5 +-
gnu/packages/package-management.scm | 38 +-
gnu/packages/parallel.scm | 5 +-
.../patches/audacity-fix-ffmpeg-binding.patch | 32 +
.../patches/bitlbee-configure-doc-fix.patch | 15 +
.../patches/calibre-no-updates-dialog.patch | 18 +
gnu/packages/patches/cmake-fix-tests.patch | 40 +-
gnu/packages/patches/curl-gss-api-fix.patch | 38 -
gnu/packages/patches/elfutils-tests-ptrace.patch | 64 +
gnu/packages/patches/emacs-exec-path.patch | 18 +
gnu/packages/patches/fltk-shared-lib-defines.patch | 51 +
gnu/packages/patches/fuse-CVE-2015-3202.patch | 65 +
gnu/packages/patches/gcc-5.0-libvtv-runpath.patch | 15 +
gnu/packages/patches/gcc-arm-link-spec-fix.patch | 16 +
gnu/packages/patches/gcc-libvtv-runpath.patch | 15 +
gnu/packages/patches/geoclue-config.patch | 25 +
gnu/packages/patches/ghostscript-runpath.patch | 17 +
.../patches/gitolite-openssh-6.8-compat.patch | 25 +
.../patches/gnutls-fix-duplicate-manpages.patch | 30 +
.../patches/gobject-introspection-cc.patch | 25 +-
gnu/packages/patches/gstreamer-0.10-bison3.patch | 32 -
.../patches/gstreamer-0.10-silly-test.patch | 14 -
gnu/packages/patches/guix-test-networking.patch | 15 -
gnu/packages/patches/hop-linker-flags.patch | 60 +
gnu/packages/patches/icecat-CVE-2015-0797.patch | 35 +
.../patches/icecat-CVE-2015-2708-pt1.patch | 240 +++
.../patches/icecat-CVE-2015-2708-pt2.patch | 284 ++++
.../patches/icecat-CVE-2015-2708-pt3.patch | 228 +++
.../patches/icecat-CVE-2015-2708-pt4.patch | 26 +
.../patches/icecat-CVE-2015-2710-pt1.patch | 199 +++
.../patches/icecat-CVE-2015-2710-pt2.patch | 64 +
.../patches/icecat-CVE-2015-2710-pt3.patch | 50 +
.../patches/icecat-CVE-2015-2713-pt1.patch | 102 ++
.../patches/icecat-CVE-2015-2713-pt2.patch | 47 +
gnu/packages/patches/icecat-CVE-2015-2716.patch | 62 +
gnu/packages/patches/librep-rules.mk.patch | 30 -
gnu/packages/patches/libtool-skip-tests.patch | 55 -
gnu/packages/patches/libtool-skip-tests2.patch | 33 +
gnu/packages/patches/lirc-localstatedir.patch | 13 +
gnu/packages/patches/mplayer2-theora-fix.patch | 286 ++++
gnu/packages/patches/openssl-runpath.patch | 15 +
...erl-gd-options-passthrough-and-fontconfig.patch | 53 +
.../patches/perl-module-pluggable-search.patch | 25 +
.../patches/perl-net-amazon-s3-moose-warning.patch | 17 +
.../patches/portaudio-audacity-compat.patch | 324 ++++
.../patches/pulseaudio-longer-test-timeout.patch | 13 +
gnu/packages/patches/pycairo-wscript.patch | 31 +
gnu/packages/patches/python-fix-tests.patch | 53 +-
.../patches/python-sqlite-3.8.4-test-fix.patch | 15 -
gnu/packages/patches/qemu-CVE-2015-3456.patch | 85 +
gnu/packages/patches/qt4-ldflags.patch | 18 +
.../patches/qt5-conflicting-typedefs.patch | 70 +
gnu/packages/patches/qt5-runpath.patch | 25 +
gnu/packages/patches/r-fix-15899.patch | 17 +
gnu/packages/patches/rsem-makefile.patch | 682 ++++++++
gnu/packages/patches/serf-comment-style-fix.patch | 23 +
.../patches/serf-deflate-buckets-test-fix.patch | 69 +
.../patches/source-highlight-regexrange-test.patch | 15 -
.../patches/subversion-sqlite-3.8.9-fix.patch | 59 +
gnu/packages/patches/tvtime-gcc41.patch | 58 +
gnu/packages/patches/tvtime-pngoutput.patch | 15 +
gnu/packages/patches/tvtime-videodev2.patch | 15 +
gnu/packages/patches/tvtime-xmltv.patch | 28 +
gnu/packages/patches/udev-gir-libtool.patch | 17 -
gnu/packages/patches/upower-builddir.patch | 44 +
.../patches/webkitgtk-2.4.8-gmutexlocker.patch | 289 ++++
.../patches/wicd-template-instantiation.patch | 29 +
.../patches/wpa-supplicant-2015-2-fix.patch | 51 +
.../patches/wpa-supplicant-2015-3-fix.patch | 43 +
.../patches/wpa-supplicant-2015-4-fix-pt1.patch | 75 +
.../patches/wpa-supplicant-2015-4-fix-pt2.patch | 68 +
.../patches/wpa-supplicant-2015-4-fix-pt3.patch | 54 +
.../patches/wpa-supplicant-2015-4-fix-pt4.patch | 52 +
.../patches/wpa-supplicant-2015-4-fix-pt5.patch | 34 +
.../patches/wpa-supplicant-CVE-2015-1863.patch | 42 +
.../patches/xf86-video-sis-fix-exa-crash.patch | 45 +
gnu/packages/pcre.scm | 6 +-
gnu/packages/pdf.scm | 8 +-
gnu/packages/perl.scm | 1501 +++++++++++++++++-
gnu/packages/photo.scm | 2 +-
gnu/packages/plotutils.scm | 6 +-
gnu/packages/polkit.scm | 7 +-
gnu/packages/popt.scm | 29 +
gnu/packages/pretty-print.scm | 8 +-
gnu/packages/pulseaudio.scm | 8 +-
gnu/packages/python.scm | 605 +++++++-
gnu/packages/qemu.scm | 10 +-
gnu/packages/qt.scm | 31 +-
gnu/packages/rdf.scm | 28 +-
gnu/packages/ruby.scm | 4 +-
gnu/packages/samba.scm | 7 +-
gnu/packages/sawfish.scm | 5 +-
gnu/packages/scheme.scm | 64 +-
gnu/packages/sdl.scm | 18 +-
gnu/packages/search.scm | 96 ++-
gnu/packages/socat.scm | 55 -
gnu/packages/ssh.scm | 10 +-
gnu/packages/statistics.scm | 11 +-
gnu/packages/task-management.scm | 61 +
gnu/packages/tbb.scm | 9 +-
gnu/packages/telephony.scm | 36 +-
gnu/packages/texlive.scm | 2 -
gnu/packages/textutils.scm | 126 ++-
gnu/packages/tor.scm | 6 +-
gnu/packages/tv.scm | 64 +
gnu/packages/upnp.scm | 6 +-
gnu/packages/version-control.scm | 91 +-
gnu/packages/video.scm | 573 ++++++--
gnu/packages/vpn.scm | 31 +
gnu/packages/web.scm | 772 +++++++++-
gnu/packages/webkit.scm | 142 ++
gnu/packages/wicd.scm | 4 +-
gnu/packages/wine.scm | 9 +-
gnu/packages/wxwidgets.scm | 6 +
gnu/packages/xdisorg.scm | 79 +-
gnu/packages/xfce.scm | 40 +-
gnu/packages/xiph.scm | 62 +
gnu/packages/xml.scm | 104 ++
gnu/packages/xorg.scm | 43 +-
gnu/services/avahi.scm | 5 +-
gnu/services/base.scm | 47 +-
gnu/services/databases.scm | 121 ++
gnu/services/dbus.scm | 126 --
gnu/services/desktop.scm | 300 ++++
gnu/services/lirc.scm | 68 +
gnu/services/networking.scm | 38 +-
gnu/services/ssh.scm | 2 +-
gnu/services/xorg.scm | 73 +-
gnu/system.scm | 103 +-
.../{os-config.tmpl => examples/bare-bones.tmpl} | 23 +-
gnu/system/examples/desktop.tmpl | 43 +
gnu/system/file-systems.scm | 18 +-
gnu/system/grub.scm | 3 +-
gnu/system/install.scm | 79 +-
gnu/system/linux-initrd.scm | 18 +-
gnu/system/nss.scm | 23 +
gnu/system/vm.scm | 1 +
guix/build-system/cmake.scm | 17 +-
guix/build-system/glib-or-gtk.scm | 17 +-
guix/build-system/gnu.scm | 32 +-
guix/build-system/haskell.scm | 140 ++
guix/build-system/perl.scm | 15 +-
guix/build-system/python.scm | 13 +-
guix/build-system/ruby.scm | 15 +-
guix/build-system/waf.scm | 13 +-
guix/build/cmake-build-system.scm | 4 +-
guix/build/download.scm | 92 +-
guix/build/glib-or-gtk-build-system.scm | 10 +-
guix/build/gnu-build-system.scm | 83 +-
guix/build/gnu-dist.scm | 10 +-
guix/build/gremlin.scm | 309 ++++
guix/build/haskell-build-system.scm | 214 +++
guix/build/perl-build-system.scm | 8 +-
guix/build/profiles.scm | 148 ++
guix/build/python-build-system.scm | 12 +-
guix/build/ruby-build-system.scm | 10 +-
guix/build/syscalls.scm | 32 +-
guix/build/utils.scm | 81 +-
guix/build/waf-build-system.scm | 8 +-
guix/cvs-download.scm | 2 +-
guix/derivations.scm | 60 +-
guix/download.scm | 7 +-
guix/elf.scm | 3 +-
guix/ftp-client.scm | 5 +-
guix/gexp.scm | 143 ++-
guix/git-download.scm | 4 +-
guix/gnu-maintenance.scm | 17 +-
guix/http-client.scm | 128 +-
guix/import/cpan.scm | 4 +-
guix/import/hackage.scm | 767 +++++++++
guix/monads.scm | 16 +-
guix/packages.scm | 317 ++--
guix/profiles.scm | 246 +++-
guix/records.scm | 190 ++--
guix/scripts/authenticate.scm | 8 +-
guix/scripts/build.scm | 59 +-
guix/scripts/environment.scm | 69 +-
guix/scripts/gc.scm | 10 +-
guix/scripts/import.scm | 2 +-
guix/scripts/import/hackage.scm | 106 ++
guix/scripts/lint.scm | 79 +-
guix/scripts/package.scm | 356 +++--
guix/scripts/publish.scm | 314 ++++
guix/scripts/refresh.scm | 17 +-
.../{substitute-binary.scm => substitute.scm} | 336 +++--
guix/scripts/system.scm | 38 +-
guix/search-paths.scm | 193 +++
guix/serialization.scm | 23 +-
guix/store.scm | 55 +-
guix/svn-download.scm | 2 +-
guix/tests.scm | 14 +-
guix/ui.scm | 89 +-
guix/utils.scm | 28 -
m4/guix.m4 | 39 +
nix/libstore/build.cc | 313 +++--
nix/libstore/gc.cc | 69 +-
nix/libstore/globals.cc | 92 +-
nix/libstore/globals.hh | 26 +-
nix/libstore/local-store.cc | 80 +-
nix/libstore/local-store.hh | 19 +-
nix/libstore/optimise-store.cc | 16 +
nix/libstore/remote-store.cc | 31 +-
nix/libstore/remote-store.hh | 5 +-
nix/libstore/store-api.hh | 4 +
nix/libstore/worker-protocol.hh | 2 +-
nix/libutil/archive.cc | 171 ++-
nix/libutil/archive.hh | 12 +-
nix/libutil/serialise.cc | 27 +
nix/libutil/serialise.hh | 11 +-
nix/libutil/types.hh | 17 +-
nix/libutil/util.cc | 176 ++-
nix/libutil/util.hh | 30 +-
nix/nix-daemon/guix-daemon.cc | 27 +-
nix/nix-daemon/nix-daemon.cc | 134 +-
nix/scripts/substitute-binary.in | 11 -
nix/scripts/substitute.in | 11 +
po/guix/LINGUAS | 1 +
po/guix/POTFILES.in | 4 +-
po/guix/da.po | 1667 ++++++++++++++++++++
po/packages/POTFILES.in | 30 +-
pre-inst-env.in | 2 +-
tests/derivations.scm | 14 +
tests/gexp.scm | 49 +
tests/gremlin.scm | 69 +
tests/guix-archive.sh | 3 +-
tests/guix-build.sh | 82 +
tests/guix-daemon.sh | 4 +-
tests/guix-package-net.sh | 178 +++
tests/guix-package.sh | 176 +--
tests/guix-system.sh | 2 +-
tests/hackage.scm | 134 ++
tests/lint.scm | 30 +-
tests/packages.scm | 93 +-
tests/profiles.scm | 113 ++-
tests/publish.scm | 114 ++
tests/store.scm | 22 +-
tests/{substitute-binary.scm => substitute.scm} | 58 +-
tests/syscalls.scm | 6 +-
tests/utils.scm | 3 +-
370 files changed, 27967 insertions(+), 4425 deletions(-)
- branch gtk-rebuild created (now 281c215), ???, 2015/05/22
- 01/09: gnu: gtk+-2: build gobject introspection typelib file., ???, 2015/05/22
- 02/09: Merge branch 'master' into gtk-rebuild,
??? <=
- 03/09: gnu: harfbuzz: Update to 0.9.40., ???, 2015/05/22
- 04/09: gnu: harfbuzz: Enable GObject integration., ???, 2015/05/22
- 05/09: gnu: gtk+-2: Update to 2.24.28., ???, 2015/05/22
- 06/09: gnu: gtk+: Update to 3.16.3., ???, 2015/05/22
- 07/09: gnu: gtk+: Add SVG support to 'gtk-encode-symbolic-svg'., ???, 2015/05/22
- 08/09: gnu: Add adwaita-icon-theme., ???, 2015/05/22
- 09/09: gnu: librsvg: Update to 2.40.9., ???, 2015/05/22