01/01: gnu: Qt@4: Build with GCC 5 and OpenSSL 1.0.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 86b995dcce534363ef56ae4335e402f77740ae24
Author: Marius Bakke <address@hidden>
Date:   Tue Jul 16 17:11:03 2019 +0200

    gnu: Qt@4: Build with GCC 5 and OpenSSL 1.0.
    
    * gnu/packages/qt.scm (qt-4)[inputs]: Replace OPENSSL with OPENSSL-1.0.
    [native-inputs]: Add GCC-5.
---
 gnu/packages/qt.scm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index afc4d8d..e5fc40b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2018 Nicolas Goaziou <address@hidden>
 ;;; Copyright © 2018 Hartmut Goebel <address@hidden>
 ;;; Copyright © 2018 Eric Bavier <address@hidden>
+;;; Copyright © 2019 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -46,6 +47,7 @@
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gperf)
@@ -423,11 +425,16 @@ system, and the core design of Django is reused in 
Grantlee.")
     (inputs
      `(,@(fold alist-delete
                (package-inputs qt)
-               '("harfbuzz" "libjpeg"))
+               '("harfbuzz" "libjpeg" "openssl"))
        ("libjpeg" ,libjpeg-8)
-       ("libsm" ,libsm)))
+       ("libsm" ,libsm)
+       ("openssl" ,openssl-1.0)))
     (native-inputs
-     `(,@(fold alist-delete
+     `(;; XXX: The JavaScriptCore engine does not build with the C++11 
standard.
+       ;; We could build it with -std=gnu++98, but then we'll get in trouble 
with
+       ;; ICU later.  Just keep using GCC 5 for now.
+       ("gcc" ,gcc-5)
+       ,@(fold alist-delete
                (package-native-inputs qt)
                '("vulkan-headers"))))