Commit Graph

21072 Commits

Author SHA1 Message Date
Nikolay Amiantov
e17b483669 glslang, spirv-tools, vulkan-loader: add metainformation 2017-01-04 12:57:22 +03:00
Domen Kožar
4bba954e13 rocksdb: properly fix #21215 2017-01-03 23:10:24 +01:00
Domen Kožar
4ce88d8674 rocksdb: build without debug 2017-01-03 23:10:24 +01:00
Domen Kožar
8b6b0aea72 Revert "rocksdb-haskell: just compile rocksdb statically to fix #21215"
This reverts commit 5e5df0fea2.
2017-01-03 23:10:24 +01:00
Pascal Wittmann
c4175a071b Merge pull request #21617 from mguentner/subsurface_beta
subsurface 4.5.6 -> 4.5.97
2017-01-03 17:30:38 +01:00
Maximilian Güntner
67d73657a9
Revert "libgit2: reinit at 0.23.2"
This reverts commit 2e15a8f2dd.
libgit2 v0.23.2 is no longer necessary due to
edbe73dc13e6090269f0d8b2bb759c7957a83ec1

Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 16:06:50 +01:00
Maximilian Güntner
7e87be4055
libdivecomputer: add subsurface version
Signed-off-by: Maximilian Güntner <code@klandest.in>
2017-01-03 15:43:51 +01:00
Thomas Tuegel
0723aa8108 Merge pull request #21466 from abbradar/kde-wrapper
Flatten nested kdeWrappers
2017-01-03 08:21:39 -06:00
Peter Hoeg
22dbb82129 qscintilla: 2.9 -> 2.9.4 2017-01-03 17:20:29 +08:00
Peter Hoeg
9452abe684 qscintilla: support qt5 2017-01-03 13:33:42 +08:00
Daiderd Jordan
ade7cc16eb
czmqpp: enable on darwin 2017-01-03 01:37:16 +01:00
Nikolay Amiantov
e908442693 kdeWrapper: allow wrapping several packages 2017-01-03 02:33:15 +03:00
Michael Raskin
50e20b566f libmwaw: 0.3.8 -> 0.3.9 2017-01-02 20:18:53 +01:00
Michael Raskin
29dfbca634 eigen3_3: init at 3.3.1; not compatible enough with 3.2.5 to switch the default immediately 2017-01-02 20:18:53 +01:00
Michael Raskin
0af8ddb2f8 libpng: 1.6.26 -> 1.6.27; a security update; @grahamc should this be ported to stable immediately or together with some other mass-rebuild change 2017-01-02 20:18:47 +01:00
Michael Raskin
a541999d77 libgphoto2: 2.5.10 -> 2.5.11 2017-01-02 20:18:45 +01:00
Herwig Hochleitner
3fa6209439 webkitgtk: 2.14.1 -> 2.14.2
Add dependencies
2017-01-02 13:37:06 +01:00
Brandon Dimcheff
cf9e1a03f7
add introspection to gmime
This was necessary for astroid to work with gmime, and I thought it
would be generally useful.
2017-01-01 22:38:12 +01:00
Pascal Wittmann
3b754e525f
xylib: 1.4 -> 1.5 2017-01-01 18:19:39 +01:00
Jörg Thalheim
84a50084c3 Merge pull request #21444 from league/fix/gphoto2-udev
gphoto2: nixos programs module to configure udev
2017-01-01 11:16:28 +01:00
Daiderd Jordan
da34b32bb4 Merge pull request #21539 from mdaiter/wxGTK30Mac
wxGTK30: added Darwin support
2016-12-31 14:11:58 +01:00
Michael Raskin
b4cab20691 Merge pull request #21511 from peterhoeg/u/kirigami
kirigami: add pre-release v2
2016-12-31 11:36:49 +00:00
Peter Hoeg
2dcbb8e81f kirigami: add pre-release v2
It requires qt5.7
2016-12-31 19:30:02 +08:00
Vladimír Čunát
5f1ebf8ff4
rivet: fixup sandboxed build after update
There's no /bin/bash.  http://hydra.nixos.org/build/45754059
2016-12-31 11:11:23 +01:00
Graham Christensen
1fd97f6293 Merge pull request #21528 from veprbl/kak2
update rivet, kakoune, add fastnlo, sherpa, mcgrid
2016-12-30 22:36:53 -05:00
Matthew Daiter
5776e6c99b wxGTK30: added Darwin support 2016-12-31 03:03:51 +01:00
Vladimír Čunát
c2752f8228
Merge #21526: unbound 1.5.10 -> 1.6.0 2016-12-30 23:17:58 +01:00
Michael Raskin
8f961e8b14 Merge pull request #21474 from mimadrid/update/openbabel-2.4.1
openbabel: 2.3.2 -> 2.4.1
2016-12-30 22:12:45 +00:00
Michael Raskin
9e1ec537eb Merge pull request #21456 from rycee/fix/clblas-cuda
clblas-cuda: use system gtest library
2016-12-30 22:03:56 +00:00
Vladimír Čunát
20c2b45ee6
Merge branch 'staging' 2016-12-30 22:40:41 +01:00
Michael Weiss
b1ac86db87 libmd: init at 0.0.0 2016-12-30 21:45:23 +01:00
Daiderd Jordan
96aca6ccbf Merge pull request #21527 from mdaiter/wxGTK29Darwin
wxGTK29: fixed Darwin build
2016-12-30 21:39:59 +01:00
Dmitry Kalinkin
2dd8aea4bb
mcgrid: init at 2.0.2 2016-12-30 14:27:56 -05:00
Dmitry Kalinkin
3c3e2dfd0a
fastnlo: init at 2.3.1pre-2212 2016-12-30 14:27:55 -05:00
Matthew Daiter
10836bdd36 wxGTK29: fixed Darwin build 2016-12-30 19:16:20 +01:00
Dmitry Kalinkin
456cf826e0
rivet: 2.5.2 -> 2.5.3 2016-12-30 12:21:58 -05:00
Benno Fünfstück
087c244c06 fix #21521 2016-12-30 16:18:28 +01:00
Vladimír Čunát
ee3fb421b8
Merge branch 'master' into staging
... mainly to fixup the go problems.
2016-12-30 15:48:36 +01:00
risicle
6d455dd1f8 opencv 3.1.0: add patch fixing python use of FlannBasedMatcher.add (#21086)
Patch is from https://github.com/opencv/opencv/pull/6009. Upstream doesn't
seem particularly enthusiastic about a 3.1.x point release, so who knows
when this fix would otherwise see the light of day.
2016-12-29 17:23:29 +01:00
Eelco Dolstra
3e84523ed7
aws-sdk-cpp: 1.0.43 -> 1.0.48 2016-12-29 16:25:58 +01:00
Vladimír Čunát
9d09bc6728
Merge branch 'master' into staging 2016-12-29 13:56:16 +01:00
Graham Christensen
f5ca9a4212
Merge branch 'roundup-15' 2016-12-28 21:04:51 -05:00
Graham Christensen
8f4098f087
cryptopp: 5.6.4 -> 5.6.5
for CVE-2016-7420: CVE-2016-7420
2016-12-28 21:03:28 -05:00
Franz Pletz
655f7043b8
libmilter: 8.14.8 -> 8.15.2 2016-12-29 02:12:51 +01:00
Franz Pletz
8837b4a1c6
libivykis: 0.39 -> 0.40 2016-12-29 01:54:09 +01:00
Franz Pletz
63f7d53572
libgig: Configure script warns about missing libuuid 2016-12-29 01:51:46 +01:00
Vladimír Čunát
421a7f37fa
gdk-pixbuf: security 2.36.0 -> 2.36.2
/cc #21457.  The rebuild impact is probably only a few thousand.
The new utility is put into $out/bin/.
2016-12-28 20:32:57 +01:00
mimadrid
86d55f0380
openbabel: 2.3.2 -> 2.4.1 2016-12-28 20:06:14 +01:00
Aristid Breitkreuz
e4f23bc8af ncurses: fix bug with libtinfo symlink that caused vim to fail 2016-12-28 16:02:11 +01:00
Michael Raskin
21d4d54a38 botan: 1.11.32 -> 1.11.34 2016-12-28 13:47:01 +01:00
Michael Raskin
c12613c111 botan: 1.10.13 -> 1.10.14, enforce c++11 2016-12-28 13:47:01 +01:00
Robert Helgesson
2990cd8aea
clblas-cuda: use system gtest library
Without this the build attempts to download the library.
2016-12-28 12:21:07 +01:00
Michael Raskin
3d9c3a94d4 Merge pull request #21438 from flosse/libstrophe
libstrophe: 0.8.8 -> 0.9.1
2016-12-28 10:59:31 +00:00
Michael Raskin
e65cccb776 Merge pull request #21221 from rardiol/gplates
gplates: init at 2.0.0
2016-12-28 10:21:23 +00:00
Spiros Boosalis
ca3f41d44b pocketsphinx: 0.8 -> 5prealpha 2016-12-28 03:28:07 +00:00
Christopher League
6eead52e12 gphoto2: nixos programs module to configure udev
Closes #21420.
2016-12-27 17:47:38 -05:00
Daiderd Jordan
7d4e04c795 Merge pull request #21400 from johbo/darwin-xournal
Xournal: Darwin support
2016-12-27 20:23:18 +01:00
Johannes Bornhold
febab15b01 gtk2: Enable xinput for Darwin 2016-12-27 14:19:26 +01:00
Markus Kohlhase
28d6aee371 libstrophe: 0.8.8 -> 0.9.1 2016-12-26 22:27:18 +01:00
Vladimír Čunát
3829d1c17f
Merge branch 'master' into staging
There's been a mass rebuild on master due to python2 update.
2016-12-26 08:42:19 +01:00
Nikolay Amiantov
921bdb7ad3 Merge pull request #21368 from spacekitteh/patch-23
ncurses: Create ABI-version'd libtinfo
2016-12-26 01:54:59 +03:00
Linus Heckemann
da70d3da0f SDL2: split derivation 2016-12-26 01:35:43 +03:00
Michael Raskin
6b2ead98cb libwacom: 0.19 -> 0.22 2016-12-25 22:56:32 +01:00
Moritz Ulrich
bdc880e49d
flightgear: 3.4.0 -> 2016.4.3. 2016-12-24 22:57:25 +01:00
Vladimír Čunát
6cb2f76529
Merge #21328: libssh2: 1.7.0 -> 1.8.0 2016-12-24 11:53:24 +01:00
Vladimír Čunát
65830800bd
Revert "libssh2: 1.7.0 -> 1.8.0"
This reverts commit 324a115747.
Moving to staging.  I'm sorry, I pushed this by accident.
2016-12-24 11:52:25 +01:00
Vladimír Čunát
c655399126
Merge branch 'staging' 2016-12-24 10:50:49 +01:00
Sophie Taylor
324a115747 libssh2: 1.7.0 -> 1.8.0 2016-12-24 10:50:44 +01:00
mimadrid
25c984f940
htslib: 1.3.1 -> 1.3.2 2016-12-23 19:31:44 -05:00
Lancelot SIX
f381232a96 libgcrypt: 1.7.3 -> 1.7.5
See http://lists.gnu.org/archive/html/info-gnu/2016-12/msg00007.html
for release announcement.
2016-12-23 14:09:43 +01:00
Sophie Taylor
c826ec6090 ncurses: Fix libtinfo for crossplatform 2016-12-23 13:18:58 +10:00
Sophie Taylor
41652f8ce5 ncurses: Create ABI-version'd libtinfo 2016-12-23 10:33:45 +10:00
aszlig
603dbfc5a9
Merge pull request #21236 (Update mediainfo)
This pulls updates from @devhell for libmediainfo, mediainfo,
mediainfo-gui and libzen to their latest upstream versions.

Tested by building all of these packages plus "ums" and "sonarr" (both
depend on one or more of these updated packages) on x86_64-linux.
2016-12-22 18:44:14 +01:00
Eelco Dolstra
215b1e519b
aws-sdk-cpp: 1.0.34 -> 1.0.43
Since this drops the problematic libuuid dependency, enable on Darwin.
2016-12-22 17:18:20 +01:00
Thomas Tuegel
af2ecc27fc
kde5.kdeWrapper: use small symlink farms
This partially addresses #21345, but we may need to reduce disk usage
further.
2016-12-22 07:58:57 -06:00
Peter Simons
96c8e19828 libtecla: update to version 1.6.3
Also dropped the slightly overzealous -O3 flag for the compiler. I doubt this
library benefits from crazy optimizations.
2016-12-22 12:28:35 +01:00
Vladimír Čunát
39e4d93649
libuv: disable tests broken on Hydra
They were broken by nix starting to use user namespaces.
2016-12-22 11:30:39 +01:00
Vladimír Čunát
2b883c6f56
Revert "Revert "Merge pull request #21350 from spacekitteh/patch-23""
This reverts commit 0c1382085b.
Moved to staging.
2016-12-22 11:29:39 +01:00
Vladimír Čunát
2e03ae274d Merge branch 'master' into staging 2016-12-22 11:28:56 +01:00
Vladimír Čunát
0c1382085b
Revert "Merge pull request #21350 from spacekitteh/patch-23"
This reverts commit 81f2e4f378, reversing
changes made to ebe19f5db0.
Moving to staging.
2016-12-22 11:28:25 +01:00
Sophie Taylor
70424e1209 ncurses: Create libtinfo symlink
Some applications expect libtinfo to be a separate library to libncurses; this fixes that.
2016-12-22 14:35:45 +10:00
Sophie Taylor
fc3b8665cf libssh2: 1.7.0 -> 1.8.0 2016-12-22 09:02:34 +10:00
Graham Christensen
41f55691a9
zlib: patch for CVE-2016-9840, CVE-2016-9841, CVE-9842, CVE-9843 2016-12-21 17:15:52 -05:00
Graham Christensen
c7a2073323
openjpeg2: patch for CVE-2016-9580, and CVE-2016-9581 2016-12-21 14:37:47 -05:00
Daiderd Jordan
0d3f0f05e2
libupnp: 1.6.20 -> 1.6.21 for CVE-2016-8863
Switching to git tags means we don't get pre-generated configure
scripts. Thusly, run bootstrap ourselves.

For https://github.com/NixOS/nixpkgs/issues/21289
For CVE-2016-8863 (remote code execution)
2016-12-21 14:37:47 -05:00
Eelco Dolstra
5d4740fded Merge pull request #20929 from nathan7/boehm-7.6.0
boehm-gc: 7.2g -> 7.6.0
2016-12-21 11:19:27 +01:00
Nikolay Amiantov
f84344ed41 libkrb5: 1.14.3 -> 1.15 2016-12-20 21:29:59 +03:00
Nikolay Amiantov
a60500ce70 cyrus_sasl: 2.1.26 -> 2.5.10 2016-12-20 21:29:59 +03:00
Thomas Tuegel
b9d3898995
qt57: 5.7.0 -> 5.7.1 2016-12-20 07:40:53 -06:00
Aristid Breitkreuz
bb18e10ba0 Merge remote-tracking branch 'origin/master' into staging 2016-12-20 14:05:30 +01:00
Alexander Kjeldaas
6b4a41a360 libfaketime: make the build reproducible
A rebased version of cb8bd05a01
Note: we no longer apply the spurious lrt patch.

This allows `nix-build --check -A libfaketime` to succeed.
2016-12-20 12:54:23 +01:00
aszlig
f805209a78
poppler: Add support for gobject-introspection
This optionally adds support for GI, because it's needed for
paperwork-backend. The new poppler_gi attribute is also marked as
lowPrio so that users won't accidentally install it.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @ttuegel
2016-12-19 22:25:34 +01:00
Thomas Tuegel
30f717ec5f Merge pull request #21228 from mimadrid/update/poppler-0.50.0
poppler: 0.49.0 -> 0.50.0
2016-12-19 11:47:45 -06:00
Aristid Breitkreuz
cc30f5dd5e boost: add 1.62.0 (not default yet) 2016-12-19 16:00:46 +01:00
Rickard Nilsson
b02e6cc70d libvirt and pythonPackages.libvirt: 2.2.0 -> 2.5.0 2016-12-19 11:52:02 +01:00
Domen Kožar
5e5df0fea2 rocksdb-haskell: just compile rocksdb statically to fix #21215 2016-12-18 22:17:37 +01:00
Thomas Tuegel
dd7dc94725 Merge pull request #21057 from gnidorah/master3
qtstyleplugins: init at 2016-12-01, kdecoration-viewer: init at 2015-08-20
2016-12-18 13:13:58 -06:00
Thomas Tuegel
3f206e34f2
kde5.kpackage: 5.29.0 -> 5.29.1 2016-12-18 08:33:22 -06:00
Thomas Tuegel
0d296076b4
qt5.grantlee: 5.0.0 -> 5.1.0
The source location has been updated to reflect that upstream
development has moved to GitHub.
2016-12-18 08:33:21 -06:00
Vladimír Čunát
1aaedd33f1
liborc: remove the duplicate package
Now it's unused.  Close #21238.
2016-12-18 13:23:51 +01:00
Nikolay Amiantov
1cb3831f1c Merge pull request #21231 from abbradar/no-fmod
Update DOOM forks, remove top-level fmod
2016-12-18 00:29:46 +03:00
Vladimír Čunát
86e4c9ed46
Merge branch 'master' into staging 2016-12-17 20:29:25 +01:00
devhell
dda462922e libmesode: init at 0.9.1
This library is a fork of ``libstrophe'' and is needed if the
``profanity'' XMPP client is to have TLS support. TLS support has been
added to ``profanity'' since version 5.0.
2016-12-17 18:13:24 +01:00
devhell
c39e36f766 {lib}mediainfo{-gui},libzen: 0.7.87 -> 0.7.91, 0.4.33 -> 0.4.34
Unfortunately I've not been able to keep this updated on a regular basis
at the moment, therefore some versions have been skipped. I'm therefore
going to just add the link for the changelog:

https://mediaarea.net/MediaInfo/ChangeLog
2016-12-17 12:57:27 +00:00
Nikolay Amiantov
18d42e1aa5 fmod: remove 2016-12-17 15:47:38 +03:00
mimadrid
32becd8ddf
poppler: 0.49.0 -> 0.50.0 2016-12-17 12:40:14 +01:00
Ricardo Ardissone
1c3c59ebd6 qwt6_qt4: init at 6.1.2 2016-12-16 22:29:46 -02:00
Nikolay Amiantov
664cc49b19 gbenchmark: init at 1.1.0 2016-12-16 17:44:21 +03:00
Domen Kožar
8b9ced0181 rocksdb: build also static lib for rocksdb-haskell 2016-12-16 12:01:14 +01:00
Graham Christensen
4fa5237984
libgsf: 1.14.36 -> 1.14.41 for CVE-2016-9888 2016-12-15 17:17:57 -05:00
Graham Christensen
ca6463ef90
sqlite: 3.15.0 -> 3.15.2 for null pointer dereference
https://sqlite.org/releaselog/3_15_2.html
2016-12-15 17:17:57 -05:00
Graham Christensen
eb7ea181f1
jasper: 1.900.28 -> 2.0.6 2016-12-15 17:17:57 -05:00
Daiderd Jordan
0e64be20b7
Revert "aws-sdk-cpp: Enable on Darwin systems"
This reverts commit 8a43550e90.
2016-12-15 21:10:25 +01:00
Domen Kožar
d5f92a319a rocksdb: compile as shared lib 2016-12-15 20:19:03 +01:00
Domen Kožar
77adcfb59f rocksdb: 4.1 -> 4.13 2016-12-15 18:05:25 +01:00
Daiderd Jordan
8a43550e90
aws-sdk-cpp: Enable on Darwin systems
This (re)reverts commit ef65353c73.
2016-12-15 15:35:34 +01:00
Daiderd Jordan
ef65353c73
Revert "aws-sdk-cpp: Enable on Darwin systems"
This reverts commit 5b2e289c0a.
2016-12-15 15:34:06 +01:00
Jörg Thalheim
0db13ac05e Merge pull request #21066 from gdeest/fix/isl-update
isl: add 0.17.1
2016-12-15 12:02:42 +01:00
Eelco Dolstra
3ae905aafc Merge pull request #21165 from matthewbauer/master
aws-sdk-cpp: Enable on Darwin systems
2016-12-15 09:40:39 +01:00
Nathan Zadoks
e38fc7a736 boehm-gc: 7.2g -> 7.6.0
fix #20753
2016-12-15 01:16:31 -05:00
Matthew Bauer
5b2e289c0a
aws-sdk-cpp: Enable on Darwin systems
libuuid can be provided by libossp_uuid.
2016-12-14 23:32:53 -06:00
Daniel Peebles
d77db89c3f Merge pull request #21048 from LnL7/darwin-wxmac
wxmac: fix build with clang-3.8
2016-12-14 18:04:25 -05:00
Jörg Thalheim
c3edaab52d Merge pull request #21130 from tohl/master
small fixes
2016-12-14 14:35:05 +01:00
Thomas Tuegel
b8d31bebd4
Merge branch 'kde-frameworks-5.29' 2016-12-14 07:06:59 -06:00
Thomas Tuegel
321987a1b8
kpackage: patch for package name collisions 2016-12-14 07:06:19 -06:00
Thomas Tuegel
8faa589a90
kde5.frameworks: 5.28 -> 5.29 2016-12-13 17:53:43 -06:00
Tomas Hlavaty
20f138c3d7 ffmpeg: respect sdlSupport option 2016-12-13 22:37:06 +01:00
Pascal Wittmann
00f5ed6e4c
libfilezilla: 0.8.0 -> 0.9.0 2016-12-13 22:00:00 +01:00
Matthew Daiter
d6f1081314 opencv3: pull patches only if necessary 2016-12-13 11:26:56 +01:00
Jaka Hudoklin
76a791b61c Merge pull request #21081 from Mic92/libxslt
libxslt: add option to enable crypto support
2016-12-12 01:43:04 +01:00
Thomas Tuegel
99bc7f1ea3 Merge pull request #21055 from ttuegel/openblas
openblas: refactor and set TARGET always
2016-12-11 17:16:49 -06:00
Pascal Wittmann
cf1ec8ed33
pugixml: 1.7 -> 1.8.1 2016-12-11 21:15:48 +01:00
Alex Ivanov
0c9e7151ac qtstyleplugins: init at 2016-12-01 2016-12-11 23:08:37 +03:00
Frederik Rietdijk
1626b1b652 json_glib: use multiple outputs 2016-12-11 19:34:07 +01:00
Jörg Thalheim
50d63e1e3f
libxslt: add option to enable crypto support 2016-12-11 19:22:34 +01:00
Vladimír Čunát
105fead2aa
nghttp2 cleanup: unneeded patching, unused inputs
Suggested on
https://github.com/NixOS/nixpkgs/pull/21029#issuecomment-266290756
2016-12-11 17:51:47 +01:00
Gaël Deest
2fb4874453 isl: 0.15 -> 0.17.1
Oups.
2016-12-11 14:04:59 +01:00
Lancelot SIX
db36c44f1b gsl: 2.2 -> 2.3 (#21058)
See https://lists.gnu.org/archive/html/info-gnu/2016-12/msg00005.html
for release announcement
2016-12-11 14:03:28 +01:00
Alexei Boronine
63dbcdbdb9 mbedtls: 2.3.0 -> 2.4.0 2016-12-11 14:58:53 +08:00
Thomas Tuegel
bed668c051
openblas: refactor and set TARGET always 2016-12-10 16:49:45 -06:00
Daiderd Jordan
a3dbada107
wxmac: fix build with clang-3.8 2016-12-10 19:10:54 +01:00
Alexei Boronine
9243703c5c mbedtls: fix build for Darwin (#20940)
mbedtls: fix build for darwin
2016-12-10 17:29:50 +01:00
Vladimír Čunát
c3d20b2e43
gtk3: maintenance 3.22.4 -> 3.22.5 2016-12-10 15:28:51 +01:00
Vladimír Čunát
af220f2a7a
cairo: maintenance 1.14.6 -> 1.14.8 2016-12-10 15:22:52 +01:00
Frederik Rietdijk
badd367e32 Merge pull request #21034 from acowley/ignition-math-2.6.0
ignition-math: 2.3.0 -> 2.6.0
2016-12-10 14:24:43 +01:00
Anthony Cowley
6bc52926fe ignition-math: 2.3.0 -> 2.6.0 2016-12-09 21:40:36 -05:00
Vladimír Čunát
0fa8ead76c
Merge #21029: nghttp2: 1.16.1 -> 1.17.0 2016-12-10 00:52:26 +01:00
c0bw3b
10d9845a1a nghttp2: 1.16.1 -> 1.17.0
See release notes :
https://github.com/nghttp2/nghttp2/releases/tag/v1.17.0
2016-12-10 00:36:28 +01:00
Vladimír Čunát
b05b120779
Merge branch 'master' into staging 2016-12-09 19:11:05 +01:00
Vladimír Čunát
ff62e8a72e
glib: avoid runtime reference from gtk3
Fixes #21022.  Related: #15931.
2016-12-09 18:53:39 +01:00