diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 21:38:19 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 21:38:19 -0400 |
| commit | 49b350fafc2c3ea1db66461b73d4e304cd13ec92 (patch) | |
| tree | 9b9b1a4a383b5175241ae6b91b83de0590f13983 /gnu/packages/patches/qt4-ldflags.patch | |
| parent | 03b5668a035ba96c9690476078c5ee1d5793f3e2 (diff) | |
| parent | e584a093f943be216fdc93895281fde835836b8d (diff) | |
Merge branch 'master' into staging.
Diffstat (limited to 'gnu/packages/patches/qt4-ldflags.patch')
| -rw-r--r-- | gnu/packages/patches/qt4-ldflags.patch | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/gnu/packages/patches/qt4-ldflags.patch b/gnu/packages/patches/qt4-ldflags.patch deleted file mode 100644 index 0d6398018a..0000000000 --- a/gnu/packages/patches/qt4-ldflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 { |