f7fb0ccb69
* gnu/packages/qt.scm (qt): Update to 5.5.0. Update download location. Drop patch and snippet. [arguments]: Add configure flag to drop qtwebengine module bundling chromium. [native-inputs]: Drop ninja, needed only for qtwebengine. [inputs]: Add harfbuzz to avoid use of bundled copy. (qt-4)[inputs]: Remove inherited harfbuzz again. * gnu/packages/patches/qt5-conflicting-typedefs.patch: Delete file. * gnu-system.am (dist_patch_DATA): Unregister patch. * gnu/packages/patches/qt5-runpath.patch: Adapt patch.
28 lines
1.5 KiB
Diff
28 lines
1.5 KiB
Diff
Allow the use of DT_RUNPATH. This fixes a bug whereby libQt5WebEngineCore.so
|
|
ends up having an empty RUNPATH.
|
|
|
|
|
|
diff -u -r qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/src/3rdparty/chromium/build/common.gypi qt-everywhere-opensource-src-5.5.0/qtwebengine/src/3rdparty/chromium/build/common.gypi
|
|
--- qt-everywhere-opensource-src-5.5.0.orig/qtwebengine/src/3rdparty/chromium/build/common.gypi 2015-06-29 22:09:36.000000000 +0200
|
|
+++ qt-everywhere-opensource-src-5.5.0/qtwebengine/src/3rdparty/chromium/build/common.gypi 2015-07-25 15:32:57.999411191 +0200
|
|
@@ -4448,19 +4448,6 @@
|
|
'-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
|
|
],
|
|
}],
|
|
- # Some binutils 2.23 releases may or may not have new dtags enabled,
|
|
- # but they are all compatible with --disable-new-dtags,
|
|
- # because the new dynamic tags are not created by default.
|
|
- ['binutils_version>=223', {
|
|
- # Newer binutils don't set DT_RPATH unless you disable "new" dtags
|
|
- # and the new DT_RUNPATH doesn't work without --no-as-needed flag.
|
|
- # FIXME(mithro): Figure out the --as-needed/--no-as-needed flags
|
|
- # inside this file to allow usage of --no-as-needed and removal of
|
|
- # this flag.
|
|
- 'ldflags': [
|
|
- '-Wl,--disable-new-dtags',
|
|
- ],
|
|
- }],
|
|
['gcc_version>=47 and clang==0', {
|
|
'target_conditions': [
|
|
['_toolset=="target"', {
|