aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/fontutils.scm
Commit message (Collapse)AuthorAge
* gnu: fontconfig: Use invoke.Mark H Weaver2018-03-23
| | | | * gnu/packages/fontutils.scm (fontconfig): Use invoke in the install phase.
* Merge branch 'master' into core-updatesMark H Weaver2018-03-20
|\
| * Correct name and Email for ng0.ng02018-03-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * .mailmap: Correct name and Email for ng0. * Makefile.am, doc/guix.texi, etc/completion/fish/guix.fish gnu/packages/accessibility.scm, gnu/packages/admin.scm, gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/cinnamon.scm, gnu/packages/compression.scm, gnu/packages/crypto.scm, gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm, gnu/packages/emacs.scm, gnu/packages/enlightenment.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm, gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm, gnu/packages/guile.scm, gnu/packages/haskell-check.scm, gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm, gnu/packages/libcanberra.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm, gnu/packages/ncurses.scm, gnu/packages/networking.scm, gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm, gnu/packages/telephony.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm, gnu/services/desktop.scm, gnu/services/version-control.scm, gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Likewise. Signed-off-by: Tobias Geerinckx-Rice <me@tobias.gr>
* | gnu: fontconfig: Update to 2.13.0.Marius Bakke2018-03-20
| | | | | | | | | | | | | | | | * gnu/packages/patches/fontconfig-remove-debug-printf.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/fontutils.scm (fontconfig): Update to 2.13.0. [source](patches): Remove. [propagated-inputs]: Add UTIL-LINUX.
* | gnu: freetype: Update to 2.9.Marius Bakke2018-03-20
| | | | | | | | * gnu/packages/fontutils.scm (freetype): Update to 2.9.
* | gnu: freetype: Ungraft.Mark H Weaver2018-03-17
| | | | | | | | | | | | * gnu/packages/fontutils.scm (freetype)[replacement]: Remove field. [source]: Add patch from former replacement. (freetype/fixed): Remove variable.
* | Merge branch 'master' into core-updatesRicardo Wurmus2018-03-14
|\|
| * gnu: Use HTTPS for supported freedesktop.org home pages.Tobias Geerinckx-Rice2018-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/fontutils.scm (fontconfig)[home-page]: Use HTTPS. * gnu/packages/freedesktop.scm (python-pyxdg, accountsservice) (modem-manager, telepathy-mission-control, telepathy-mission-control) (colord-gtk, desktop-file-utils)[home-page]: Likewise. * gnu/packages/ghostscript.scm (libspectre)[home-page]: Likewise. * gnu/packages/glib.scm (dbus, dbus-glib, telepathy-glib)[home-page]: Likewise. * gnu/packages/gnome.scm (shared-mime-info, hicolor-icon-theme) (libxklavier, colord, upower)[home-page]: Likewise. * gnu/packages/gstreamer.scm (orc, python-gst)[home-page]: Likewise. * gnu/packages/libcanberra.scm (sound-theme-freedesktop)[home-page]: Likewise. * gnu/packages/libreoffice.scm (libexttextcat)[home-page]: Likewise. * gnu/packages/polkit.scm (polkit-gnome, polkit-gnome)[home-page]: Likewise. * gnu/packages/pulseaudio.scm (pavucontrol)[home-page]: Likewise. * gnu/packages/python.scm (python-dbus)[home-page]: Likewise. * gnu/packages/xdisorg.scm (startup-notification)[home-page]: Likewise.
* | build-system/gnu: Add 'bootstrap' phase.Ludovic Courtès2018-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This factorizes what has become a widespread idiom. * guix/build/gnu-build-system.scm (%bootstrap-scripts): New variable. (bootstrap): New procedure. (%standard-phases): Add it after 'unpack'. * guix/build/ant-build-system.scm (%standard-phases): Delete 'bootstrap. * guix/build/asdf-build-system.scm (%standard-phases/source) (%standard-phases): Likewise. * guix/build/cargo-build-system.scm (%standard-phases): Likewise. * guix/build/cmake-build-system.scm (%standard-phases): Likewise. * guix/build/dub-build-system.scm (%standard-phases): Likewise. * guix/build/emacs-build-system.scm (%standard-phases): Likewise. * guix/build/font-build-system.scm (%standard-phases): Likewise. * guix/build/go-build-system.scm (%standard-phases): Likewise. * guix/build/haskell-build-system.scm (%standard-phases): Likewise. * guix/build/minify-build-system.scm (%standard-phases): Likewise. * guix/build/ocaml-build-system.scm (%standard-phases): Likewise. * guix/build/perl-build-system.scm (%standard-phases): Likewise. * guix/build/python-build-system.scm (%standard-phases): Likewise. * guix/build/r-build-system.scm (%standard-phases): Likewise. * guix/build/ruby-build-system.scm (%standard-phases): Likewise. * guix/build/scons-build-system.scm (%standard-phases): Likewise. * guix/build/texlive-build-system.scm (%standard-phases): Likewise. * guix/build/waf-build-system.scm (%standard-phases): Likewise. * gnu/packages/audio.scm (faad2)[arguments]: Replace 'bootstrap. (soundtouch, cuetools, bluez-alsa): Remove 'arguments'. (cava)[arguments]: Replace 'bootstrap. * gnu/packages/backup.scm (rdup): Remove 'bootstrap. * gnu/packages/bioinformatics.scm (seek)[arguments]: Replace 'bootstrap. * gnu/packages/bioinformatics.scm (htslib-for-sambamba): Remove 'arguments'. * gnu/packages/ci.scm (hydra, cuirass): Remove 'bootstrap'. * gnu/packages/crypto.scm (libb2): Remove #:phases. * gnu/packages/databases.scm (guile-wiredtiger): Likewise. * gnu/packages/debug.scm (stress-make): Remove 'bootstrap'. * gnu/packages/documentation.scm (asciidoc): Likewise. * gnu/packages/fontutils.scm (libuninameslist): Remove 'arguments'. * gnu/packages/ftp.scm (weex): Remove 'arguments'. * gnu/packages/game-development.scm (ois): Remove 'arguments'. * gnu/packages/games.scm (pioneer): Remove 'bootstrap. * gnu/packages/gnome.scm (vte-ng, byzanz): Replace 'bootstrap. (arc-theme): Remove 'arguments'. (faba-icon-theme): Remove 'bootstrap. (arc-icon-theme): Remove 'arguments'. * gnu/packages/gnunet.scm (guile-gnunet): Likewise. * gnu/packages/gtk.scm (guile-rsvg): Likewise. * gnu/packages/guile.scm (mcron2): Remove 'bootstrap. (guile-bash): Remove #:phases. (guile-git): Remove 'bootstrap. (guile-syntax-highlight): Remove 'arguments'. (guile-sjson): Likewise. * gnu/packages/java.scm (classpath-devel): Remove 'bootstrap. * gnu/packages/kodi.scm (libdvdnav/kodi) (libdvdread/kodi, libdvdcss/kodi): Likewise. * gnu/packages/libreoffice.scm (hunspell): Remove 'arguments'. * gnu/packages/libusb.scm (hidapi): Likewise. * gnu/packages/linux.scm (bridge-utils): Rename 'bootstrap' to 'patch-stuff'; move it before 'bootstrap', without autoreconf invocation. (eudev): Rename 'bootstrap' to 'patch-file-names', without 'autogen.sh' invocation; move it before 'bootstrap. (gpm): Replace 'bootstrap'. (f2fs-tools): Remove 'arguments'. (rng-tools): Remove #:phases. * gnu/packages/messaging.scm (hexchat): Rename 'bootstrap' to 'copy-intltool-makefile'; remove "autoreconf" invocation and move before 'bootstrap'. (libmesode): Remove 'arguments'. (libstrophe): Likewise. * gnu/packages/microcom.scm (microcom): Likewise. * gnu/packages/networking.scm (libnet): Remove 'bootstrap. * gnu/packages/onc-rpc.scm (libnsl): Remove 'arguments'. * gnu/packages/package-management.scm (guix): Replace 'bootstrap. * gnu/packages/sawfish.scm (librep): Remove 'arguments'. * gnu/packages/version-control.scm (findnewest): Likewise. * gnu/packages/video.scm (liba52, handbrake, motion): Replace 'bootstrap. * gnu/packages/web.scm (fcgiwrap): Remove #:phases. (tidy): Replace 'bootstrap. (gumbo-parser): Remove #:phases. * gnu/packages/wget.scm (wget2): Replace 'bootstrap. * gnu/packages/wm.scm (i3lock-color): Remove #:phases. * gnu/packages/xdisorg.scm (xclip): Likewise. * gnu/packages/xml.scm (libxls): Replace 'bootstrap'. * gnu/packages/xorg.scm (xf86-video-freedreno) (xf86-video-intel): Remove #:phases. * gnu/packages/zile.scm (zile-on-guile): Replace 'bootstrap.
* | gnu: graphite2: Update to 1.3.11.Marius Bakke2018-03-08
|/ | | | | | | * gnu/packages/patches/graphite2-ffloat-store.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. * gnu/packages/fontutils.scm (graphite2): Update to 1.3.11. [source](patches): Remove.
* gnu: freetype: Fix CVE-2018-6942.Marius Bakke2018-02-20
| | | | | | | * gnu/packages/patches/freetype-CVE-2018-6942.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/fontutils.scm (freetype)[replacement]: New field. (freetype/fixed): New variable.
* Merge branch 'master' into core-updatesMark H Weaver2018-02-16
|\
| * gnu: Use HTTPS for supported nongnu.org home pages.Tobias Geerinckx-Rice2018-02-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gnu/packages/acl.scm (acl)[home-page]: Use HTTPS. * gnu/packages/admin.scm (dmidecode)[home-page]: Likewise. * gnu/packages/attr.scm (attr)[home-page]: Likewise. * gnu/packages/audio.scm (lash)[home-page]: Likewise. * gnu/packages/avr.scm (avr-libc)[home-page]: Likewise. * gnu/packages/backup.scm (rdiff-backup, libchop)[home-page]: Likewise. * gnu/packages/compression.scm (fastjar, lzip, lziprecover, atool) (lunzip, clzip, lzlib, plzip)[home-page]: Likewise. * gnu/packages/emacs.scm (geiser, bbdb, m17n-lib, m17n-lib)[home-page]: Likewise. * gnu/packages/flashing-tools.scm (avrdude)[home-page]: Likewise. * gnu/packages/fontutils.scm (libotf)[home-page]: Likewise. * gnu/packages/game-development.scm (gzochi)[home-page]: Likewise. * gnu/packages/games.scm (enigma)[home-page]: Likewise. * gnu/packages/gsasl.scm (libntlm)[home-page]: Likewise. * gnu/packages/gtk.scm (guile-cairo)[home-page]: Likewise. * gnu/packages/guile.scm (guile-reader, guile-lib, guile-json) (guile-redis, g-wrap)[home-page]: Likewise. * gnu/packages/libunwind.scm (libunwind)[home-page]: Likewise. * gnu/packages/lout.scm (lout)[home-page]: Likewise. * gnu/packages/mpd.scm (sonata)[home-page]: Likewise. * gnu/packages/networking.scm (quagga)[home-page]: Likewise. * gnu/packages/ratpoison.scm (ratpoison)[home-page]: Likewise. * gnu/packages/skribilo.scm (skribilo)[home-page]: Likewise. * gnu/packages/telephony.scm (exosip)[home-page]: Likewise. * gnu/packages/texinfo.scm (texi2html)[home-page]: Likewise. * gnu/packages/xdisorg.scm (xbindkeys)[home-page]: Likewise.
* | gnu: fontforge: Fix typo in comment.Ludovic Courtès2018-01-17
| | | | | | | | * gnu/packages/fontutils.scm (fontforge): Fix comment.
* | gnu: fontforge: Skip failing test.Ludovic Courtès2018-01-16
| | | | | | | | * gnu/packages/fontutils.scm (fontforge)[arguments]: Add #:make-flags.
* | gnu: potrace: Relax unit tests.Ludovic Courtès2018-01-06
| | | | | | | | | | | | * gnu/packages/patches/potrace-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/fontutils.scm (potrace)[source]: Use it.
* | gnu: libotf: Use pkg-config to determine freetype location.Marius Bakke2018-01-03
| | | | | | | | * gnu/packages/fontutils.scm (libotf)[native-inputs]: Add PKG-CONFIG.
* | Merge branch 'master' into core-updatesMarius Bakke2017-12-19
|\|
| * gnu: t1lib: Change how patched CVEs are listed.Efraim Flashner2017-12-10
| | | | | | | | | | | | | | | | * gnu/packages/fontutils.scm (t1lib)[source]: Change patch name. [properties]: New field, register patched CVEs. * gnu/packages/patches/CVE-2011-1552+CVE-2011-1553+CVE-2011-1554.patch: Rename to CVE-2011-1552+.patch. * gnu/local.mk (dist_patch_DATA): Change patch name.
* | gnu: fontconfig: Update to 2.12.6.Marius Bakke2017-12-12
| | | | | | | | | | | | | | | | | | | | Gperf is now a hard dependency. * gnu/packages/patches/fontconfig-remove-debug-printf.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/fontutils.scm (fontconfig): Update to 2.12.6. [source]: Add 'fontconfig-remove-debug-printf.patch'. [arguments]: Remove 'regenerate-fcobjshash' phase.
* | gnu: freetype: Update to 2.8.1.Marius Bakke2017-12-12
| | | | | | | | * gnu/packages/fontutils.scm (freetype): Update to 2.8.1.
* | Merge branch 'master' into core-updatesMarius Bakke2017-12-07
|\|
| * gnu: python2-ufolib: Update to 2.1.1.Tobias Geerinckx-Rice2017-12-07
| | | | | | | | * gnu/packages/fontutils.scm (python2-ufolib): Update to 2.1.1
| * gnu: python2-defcon: Update to 0.3.5.Tobias Geerinckx-Rice2017-12-07
| | | | | | | | * gnu/packages/fontutils.scm (python2-defcon): Update to 0.3.5
* | gnu: python-pytest: Change pytest@3.0 users to use regular pytest.Marius Bakke2017-12-05
|/ | | | | | | | * gnu/packages/fontutils.scm (python2-ufolib, python2-defcon)[native-inputs]: Change PYTHON2-PYTEST-3.0 to PYTHON2-PYTEST. * gnu/packages/python.scm (python2-booleanoperations)[native-inputs]: Likewise. (python-setuptools-scm-git-archive)[native-inputs]: Change PYTHON-PYTEST-3.0 to PYTHON-PYTEST.
* gnu: Add nototools.ng02017-11-28
| | | | | | * gnu/packages/fontutils.scm (nototools): New variable. Signed-off-by: Leo Famulari <leo@famulari.name>
* gnu: Add python2-defcon.ng02017-11-28
| | | | | | * gnu/packages/fontutils.scm (python2-defcon): New variable. Signed-off-by: Leo Famulari <leo@famulari.name>
* gnu: Add python2-ufolib.ng02017-11-28
| | | | | | * gnu/packages/fontutils.scm (python2-ufolib): New variable. Signed-off-by: Leo Famulari <leo@famulari.name>
* gnu: libuninameslist: Update to 20170807.Efraim Flashner2017-11-06
| | | | * gnu/packages/fontutils.scm (libuninameslist): Update to 20170807.
* Merge branch 'master' into stagingMarius Bakke2017-09-27
|\
| * gnu: potrace: Update to 1.15 [fixes CVE-2017-12067].Marius Bakke2017-09-27
| | | | | | | | * gnu/packages/fontutils.scm (potrace): Update to 1.15.
| * gnu: fontforge: Update to 20170731.Efraim Flashner2017-09-24
| | | | | | | | | | | | | | | | | | | | * gnu/packages/fontutils.scm (fontforge): Update to 20170731. [source]: Remove patch, remove snippet. [arguments]: Enable tests. Remove phase to build showttf. [inputs]: Use python-wrapper instead of python. [home-page]: Update to new home page. * gnu/packages/patches/fontforge-svg-modtime.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it.
* | gnu: teckit: Update to 2.5.7.Roel Janssen2017-09-24
|/ | | | | | * gnu/packages/fontutils.scm (teckit): Update to 2.5.7. Signed-off-by: Roel Janssen <roel@gnu.org>
* gnu: fontconfig: Update to 2.12.3.Marius Bakke2017-06-11
| | | | | | | | | | | * gnu/packages/fontutils.scm (fontconfig): Update to 2.12.3. [source]: Remove obsolete patches. [native-inputs]: Add GPERF. [arguments]<#:phases>: Remove obsolete 'fix-tests-for-freetype-2.7.1' phase. Add 'regenerate-fcobjshash'. * gnu/packages/patches/fontconfig-charwidth-symbol-conflict.patch, gnu/packages/patches/fontconfig-path-max.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them.
* Merge branch 'master' into core-updatesMark H Weaver2017-05-27
|\
| * gnu: graphite2/fixed: Update to 1.3.10.Mark H Weaver2017-05-27
| | | | | | | | | | | | | | | | | | | | | | * gnu/packages/fontutils.scm (graphite2/fixed): Update to 1.3.10. Remove patches that have been incorporated upstream. * gnu/packages/patches/graphite2-CVE-2017-5436.patch, gnu/packages/patches/graphite2-check-code-point-limit.patch, gnu/packages/patches/graphite2-fix-32-bit-wrap-arounds.patch, gnu/packages/patches/graphite2-non-linear-classes-even-number.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them.
* | Merge branch 'master' into core-updatesRicardo Wurmus2017-05-24
|\|
| * gnu: freetype: Fix CVE-2017-{8105,8287}.Leo Famulari2017-04-29
| | | | | | | | | | | | | | | | * gnu/packages/patches/freetype-CVE-2017-8105.patch, gnu/packages/patches/freetype-CVE-2017-8287.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/fontutils.scm (freetype)[replacement]: New field. (freetype/fixed): New variable.
| * gnu: graphite2: Add fixes for CVE-2017-5436 and other bugs.Mark H Weaver2017-04-21
| | | | | | | | | | | | | | | | | | | | | | * gnu/packages/fontutils.scm (graphite2)[replacement]: New field. (graphite2/fixed): New variable. * gnu/packages/patches/graphite2-CVE-2017-5436.patch, gnu/packages/patches/graphite2-check-code-point-limit.patch, gnu/packages/patches/graphite2-fix-32-bit-wrap-arounds.patch, gnu/packages/patches/graphite2-non-linear-classes-even-number.patch: New files. * gnu/local.mk (dist_patch_DATA): Add them.
* | gnu: freetype: Update to 2.8.Leo Famulari2017-05-15
|/ | | | * gnu/packages/fontutils.scm (freetype): Update to 2.8.
* gnu: graphite2: Fix test failure caused by rounding error on 32-bit CPUs.Leo Famulari2017-03-19
| | | | | | * gnu/packages/patches/graphite2-ffloat-store.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/fontutils.scm (graphite2): Use it.
* Merge branch 'master' into core-updatesLudovic Courtès2017-03-09
|\
| * gnu: potrace: Update to 1.14 [fixes CVE-2016-8685 and CVE-2016-8686].Marius Bakke2017-02-27
| | | | | | | | * gnu/packages/fontutils.scm (potrace): Update to 1.14.
* | gnu: fontconfig: Fix PATH_MAX for Hurd systems.Rene Saavedra2017-03-02
| | | | | | | | | | | | | | | | * gnu/packages/patches/fontconfig-path-max.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/fontutils.scm (fontconfig)[source]: Use it. Signed-off-by: Manolis Ragkousis <manolis837@gmail.com>
* | gnu: fontconfig: Fix test-suite for freetype update.Efraim Flashner2017-02-27
| | | | | | | | | | * gnu/packages/fontutils.scm (fontconfig)[arguments]: Add phase to fix the test-suite to have the input expected.
* | gnu: freetype: Update to 2.7.1.Efraim Flashner2017-02-26
| | | | | | | | * gnu/packages/fontutils.scm (freetype): Update to 2.7.1.
* | gnu: fontconfig: Fix build failure caused by symbol conflict with glibc@2.25.Leo Famulari2017-02-26
| | | | | | | | | | | | * gnu/packages/patches/fontconfig-charwidth-symbol-conflict.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/fontutils.scm (fontconfig)[source]: Use it.
* | gnu: graphite2: Update to 1.3.9.Marius Bakke2017-02-22
| | | | | | | | * gnu/packages/fontutils.scm (graphite2): Update to 1.3.9.
* | gnu: freetype: Update to 2.7.Marius Bakke2016-11-22
|/ | | | | * gnu/packages/fontutils.scm (freetype): Update to 2.7. [home-page]: Use HTTPS.
* Merge branch 'master' into core-updatesMark H Weaver2016-10-12
|\
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-23 20:57:59 +0000