02/02: gnu: qt-4: Remove reference from "out" to "doc".

[Ludovic Courtès]

civodul pushed a commit to branch wip-diet
in repository guix.

commit 2ab6a4887031269414542f1999e7a7f2db0cdbdc
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jun 26 17:52:45 2015 +0200

    gnu: qt-4: Remove reference from "out" to "doc".
    
    That way, users no longer have to install the 289 MiB of doc.
    
    * gnu/packages/patches/qt4-documentation-path.patch: New file.
    * gnu/packages/qt.scm (qt-4)[source]: Use it.
    * gnu-system.am (dist_patch_DATA): Add it.
---
 gnu-system.am                                     |    1 +
 gnu/packages/patches/qt4-documentation-path.patch |   15 +++++++++++++++
 gnu/packages/qt.scm                               |    3 ++-
 3 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/gnu-system.am b/gnu-system.am
index a420d71..96251cc 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -574,6 +574,7 @@ dist_patch_DATA =                                           
\
   gnu/packages/patches/qemu-CVE-2015-4106-pt6.patch            \
   gnu/packages/patches/qemu-CVE-2015-4106-pt7.patch            \
   gnu/packages/patches/qemu-CVE-2015-4106-pt8.patch            \
+  gnu/packages/patches/qt4-documentation-path.patch            \
   gnu/packages/patches/qt4-ldflags.patch                       \
   gnu/packages/patches/qt4-tests.patch                         \
   gnu/packages/patches/qt5-conflicting-typedefs.patch          \
diff --git a/gnu/packages/patches/qt4-documentation-path.patch 
b/gnu/packages/patches/qt4-documentation-path.patch
new file mode 100644
index 0000000..21feba0
--- /dev/null
+++ b/gnu/packages/patches/qt4-documentation-path.patch
@@ -0,0 +1,15 @@
+By default libQtCore.so and qmake embed the name of the documentation
+directory, which means that "out" depends on the "doc" output.
+This hack allows us to get rid of this dependency.
+
+--- qt-everywhere-opensource-src-4.8.7/src/corelib/global/qlibraryinfo.cpp    
2015-06-26 17:26:07.546156448 +0200
++++ qt-everywhere-opensource-src-4.8.7/src/corelib/global/qlibraryinfo.cpp    
2015-06-26 17:26:14.450156316 +0200
+@@ -247,7 +247,7 @@
+             path = QT_CONFIGURE_PREFIX_PATH;
+             break;
+ #endif
+-#ifdef QT_CONFIGURE_DOCUMENTATION_PATH
++#if 0
+         case DocumentationPath:
+             path = QT_CONFIGURE_DOCUMENTATION_PATH;
+             break;
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1cf72e1..886874c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -239,7 +239,8 @@ developers using C++ or QML, a CSS & JavaScript like 
language.")
               (base32
                "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"))
              (patches (map search-patch
-                           '("qt4-ldflags.patch" "qt4-tests.patch")))))
+                           '("qt4-ldflags.patch" "qt4-tests.patch"
+                             "qt4-documentation-path.patch")))))
     (inputs `(,@(alist-delete "libjpeg" (package-inputs qt))
               ("libjepg" ,libjpeg-8)
               ("libsm" ,libsm)))