diff options
| author | Mark H Weaver <[email protected]> | 2015-04-17 22:06:05 -0400 |
|---|---|---|
| committer | Mark H Weaver <[email protected]> | 2015-04-17 22:06:05 -0400 |
| commit | 334345d9db53326fa062298e2372d6c33123949a (patch) | |
| tree | 50774c171f1a348bd7de8e9a447bad2a14a9dffb /gnu/packages/patches/qt4-ldflags.patch | |
| parent | 8d7dc5d9dbf009009d33e21598f92c4685965cd5 (diff) | |
| parent | 09dd019490e4a269b0a2d9512a07688f8ee657d3 (diff) | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/patches/qt4-ldflags.patch')
| -rw-r--r-- | gnu/packages/patches/qt4-ldflags.patch | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/gnu/packages/patches/qt4-ldflags.patch b/gnu/packages/patches/qt4-ldflags.patch new file mode 100644 index 0000000000..0d6398018a --- /dev/null +++ b/gnu/packages/patches/qt4-ldflags.patch @@ -0,0 +1,18 @@ +Explicitly link against libicui18n so that libQtCore.so always finds it. + +--- qt-everywhere-opensource-src-4.8.6/src/corelib/corelib.pro 2015-04-15 12:01:41.661862663 +0200 ++++ qt-everywhere-opensource-src-4.8.6/src/corelib/corelib.pro 2015-04-15 12:03:57.954586336 +0200 +@@ -19,6 +19,13 @@ include(codecs/codecs.pri) + include(statemachine/statemachine.pri) + include(xml/xml.pri) + ++# Explicitly link with icui18n, which is dlopened by libQtCore.so. ++# We cannot do this by setting LDFLAGS because that then overrides ++# other LDFLAGS: <https://bugreports.qt.io/browse/QTBUG-5471>. ++# XXX: According to the Nixpkgs recipe, this may be necessary for ++# further libraries (cups, gtk-x11-2.0, libgdk-x11-2.0). ++LIBS_PRIVATE += -licui18n ++ + !qpa:mac|darwin:LIBS_PRIVATE += -framework ApplicationServices + qpa:mac { + !ios { |