diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-10-04 12:56:45 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-10-04 23:04:26 +0200 |
| commit | 14bcc1e1cd85d38db59b6b6089d63d429fb76b57 (patch) | |
| tree | 2a95dc4445c42a6479a09f7489f32d0a3f49ea59 /gnu/packages/patches | |
| parent | 2b00a55064d2fbddb53209723cebc04710b33893 (diff) | |
| download | guix-14bcc1e1cd85d38db59b6b6089d63d429fb76b57.tar.gz guix-14bcc1e1cd85d38db59b6b6089d63d429fb76b57.zip | |
gnu: qt: Remove the sources of qtwebengine.
* gnu/packages/qt.scm (qt)[source]: Add snippet to remove the qtwebengine
code, which was already not built anymore, and drop one patch used
previously only for qtwebengine.
[arguments]: Drop the configuration flag "-skip qtwebengine", since
deleted modules cannot be skipped.
* gnu/packages/patches/qt5-runpath.patch: Delete file.
* gnu-system.am (dist_patch_DATA): Unregister patch.
Partially fixes <http://bugs.gnu.org/21288>.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qt5-runpath.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/gnu/packages/patches/qt5-runpath.patch b/gnu/packages/patches/qt5-runpath.patch deleted file mode 100644 index d045d39aaa..0000000000 --- a/gnu/packages/patches/qt5-runpath.patch +++ /dev/null @@ -1,27 +0,0 @@ -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"', { |