summaryrefslogtreecommitdiff
path: root/gnu-system.am
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-07-25 16:02:38 +0200
committerAndreas Enge <andreas@enge.fr>2015-07-27 09:41:16 +0200
commitf7fb0ccb6980de7e54eabe008c0c7b73241b3494 (patch)
tree94e86d3fd93e40b700d7fd8f028acfde05872f10 /gnu-system.am
parentb8050e7183e423a3d167bfe9c7f6f373318d7878 (diff)
gnu: qt: Update to 5.5.0.
* 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.
Diffstat (limited to 'gnu-system.am')
-rw-r--r--gnu-system.am1
1 files changed, 0 insertions, 1 deletions
diff --git a/gnu-system.am b/gnu-system.am
index ae0ad372c8..015ac769b5 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -603,7 +603,6 @@ dist_patch_DATA = \
gnu/packages/patches/qemu-CVE-2015-4106-pt8.patch \
gnu/packages/patches/qt4-ldflags.patch \
gnu/packages/patches/qt4-tests.patch \
- gnu/packages/patches/qt5-conflicting-typedefs.patch \
gnu/packages/patches/qt5-runpath.patch \
gnu/packages/patches/ratpoison-shell.patch \
gnu/packages/patches/readline-link-ncurses.patch \