diff options
| author | Andreas Enge <andreas@enge.fr> | 2013-10-12 14:48:52 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2013-10-12 14:50:14 +0200 |
| commit | 1e9ed0e3dcbdb19f18741a0ef811a4491ffbbea5 (patch) | |
| tree | 106ba297fcf1dacab0e51460cd10e6c03800cc70 /gnu/packages/patches | |
| parent | 5151c2e1f472bb27fdf5f68256d0ccc7707316cd (diff) | |
| download | guix-1e9ed0e3dcbdb19f18741a0ef811a4491ffbbea5.tar.gz guix-1e9ed0e3dcbdb19f18741a0ef811a4491ffbbea5.zip | |
gnu: Add Qt 4.8.5.
* gnu/packages/qt.scm (qt-4): New variable.
* gnu/packages/patches/qt4-tests.patch: New file, patch dropping tests
requiring a running X server.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/qt4-tests.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/gnu/packages/patches/qt4-tests.patch b/gnu/packages/patches/qt4-tests.patch new file mode 100644 index 0000000000..eb499ec76a --- /dev/null +++ b/gnu/packages/patches/qt4-tests.patch @@ -0,0 +1,22 @@ +Drop tests requiring a running X server, but not starting any. + +diff -ru qt-everywhere-opensource-src-4.8.5.orig/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro +--- qt-everywhere-opensource-src-4.8.5.orig/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro 2013-10-12 13:15:47.000000000 +0200 ++++ qt-everywhere-opensource-src-4.8.5/src/3rdparty/webkit/Source/WebKit/qt/tests/tests.pro 2013-10-12 13:20:15.000000000 +0200 +@@ -1,15 +1,4 @@ + + TEMPLATE = subdirs +-SUBDIRS = qwebframe qwebpage qwebelement qgraphicswebview qwebhistoryinterface qwebview qwebhistory qwebinspector hybridPixmap ++SUBDIRS = + +-linux-* { +- # This test bypasses the library and links the tested code's object itself. +- # This stresses the build system in some corners so we only run it on linux. +- SUBDIRS += MIMESniffing +-} +- +-contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativewebview +-SUBDIRS += benchmarks/painting benchmarks/loading +-contains(DEFINES, ENABLE_WEBGL=1) { +- SUBDIRS += benchmarks/webgl +-} |