From patchwork Thu Nov 15 04:17:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Bavier X-Patchwork-Id: 207 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7AD4E1680E; Thu, 15 Nov 2018 04:18:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,MIME_QP_LONG_LINE, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 1A1B91680B for ; Thu, 15 Nov 2018 04:18:22 +0000 (GMT) Received: from localhost ([::1]:36014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN96j-00041J-CF for patchwork@mira.cbaines.net; Wed, 14 Nov 2018 23:18:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49620) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN96U-0003vj-1y for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96Q-000895-Ra for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:05 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:48548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gN96Q-000891-OU for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gN96Q-0006r9-JX for guix-patches@gnu.org; Wed, 14 Nov 2018 23:18:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33390] [PATCH 1/4] qtwebkit: Fix pri install directory. Resent-From: ericbavier@centurylink.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Nov 2018 04:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33390 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33390@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154225548126326 (code B ref -1); Thu, 15 Nov 2018 04:18:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Nov 2018 04:18:01 +0000 Received: from localhost ([127.0.0.1]:52800 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96K-0006qO-JD for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:18:01 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39959) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gN96I-0006pr-8b for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN96B-000813-CC for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:49 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:55788) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN96A-00080b-Eh for submit@debbugs.gnu.org; Wed, 14 Nov 2018 23:17:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gN969-0003uf-7h for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gN965-0007wZ-El for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:45 -0500 Received: from mail.onyx.syn-alias.com ([206.152.134.66]:19913 helo=smtp.centurylink.net) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gN963-0007uZ-En for guix-patches@gnu.org; Wed, 14 Nov 2018 23:17:41 -0500 DKIM-Signature: v=1; a=rsa-sha1; d=centurylink.net; s=ctl201402; c=relaxed/simple; q=dns/txt; i=@centurylink.net; t=1542255453; h=From:Subject:Date:To:MIME-Version:Content-Type; bh=AVZ8ouCBQwHadA5350gN/PrhTNw=; b=j7pfA+4tZwmFLkK5Kjqn6jhfDfBM/4iybNLkhwypJBlpNHoqlyO600huh86b0DqE qJO2GzjH0wfJGcSC12tpNqJoF9MDCpnRa+jd0TeVK04pi+3KU0+AuQ5IJ20geMK6 Y/tUx42lRWsWWlhKe0TLZ7uf24CEI5dseNZ0+AqnnNjzESgUwH68J0/EmlFIOlxG 47nnAkewfQQ/mVUoWEb9W8yyBHr0EtDPE5gAUQqgszbErRS5pTzlEXrqkw81QQoP jgG1H3lM+Om3Xt2kmhmRuBbuRCvGsZ0f0uj/o0P9ric5KzpbYjk2uqRPzr5EbY0Z lr1lLLZl9sx2JhLvvOjQfQ==; X_CMAE_Category: , , X-CNFS-Analysis: v=2.2 cv=X+wQEybe c=1 sm=1 tr=0 a=Bk8UOtVc4jldDOnqC3PU2w==:117 a=Bk8UOtVc4jldDOnqC3PU2w==:17 a=KGjhK52YXX0A:10 a=IkcTkHD0fZMA:10 a=JHtHm7312UAA:10 a=zSv6zi-ZgakA:10 a=inoG4m36AAAA:8 a=TzMppCOWAAAA:8 a=Q1sTgoEvAAAA:8 a=zGsBNCykNUDjBY_J4_8A:9 a=QEXdDO2ut3YA:10 a=_Qgj-RFg6mImvLaOgLPg:22 a=ovI62r0dVwRwEkuYY2kh:22 a=FkGh3qDytyf094M0uOEt:22 X-CM-Score: 0 X-Scanned-by: Cloudmark Authority Engine X-Authed-Username: ZXJpY2JhdmllckBjZW50dXJ5bGluay5uZXQ= Authentication-Results: smtp01.onyx.dfw.sync.lan smtp.user=ericbavier@centurylink.net; auth=pass (LOGIN) Received: from [97.116.109.182] ([97.116.109.182:50166] helo=localhost.localdomain) by smtp.centurylink.net (envelope-from ) (ecelerity 3.6.25.56547 r(Core:3.6.25.0)) with ESMTPSA (cipher=DHE-RSA-AES128-GCM-SHA256) id FA/19-31529-D53FCEB5; Wed, 14 Nov 2018 23:17:33 -0500 From: ericbavier@centurylink.net Date: Wed, 14 Nov 2018 22:17:12 -0600 Message-Id: <20181115041715.15993-2-ericbavier@centurylink.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115041715.15993-1-ericbavier@centurylink.net> References: <20181115041715.15993-1-ericbavier@centurylink.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eric Bavier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Eric Bavier This lets qmake find qtwebkit components, allowing packages like python-pyqt to find qtwebkit and enable support. * gnu/packages/qt.scm (qtwebkit)[arguments]: Add "ECM_MKSPECS_INSTALL_DIR" to #:configure-flags. Link with "--no-keep-memory". --- gnu/packages/qt.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index d48769982..36f8aef69 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nicolas Goaziou ;;; Copyright © 2018 Hartmut Goebel +;;; Copyright © 2018 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -2171,7 +2172,15 @@ different kinds of sliders, and much more.") #:configure-flags (list ;"-DENABLE_API_TESTS=TRUE" "-DPORT=Qt" "-DUSE_LIBHYPHEN=OFF" - "-DUSE_SYSTEM_MALLOC=ON"))) + "-DUSE_SYSTEM_MALLOC=ON" + ;; XXX: relative dir installs to build dir? + (string-append "-DECM_MKSPECS_INSTALL_DIR=" + %output "/lib/qt5/mkspecs/modules") + ;; Sacrifice a little speed in order to link + ;; libraries and test executables in a + ;; reasonable amount of memory. + "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--no-keep-memory" + "-DCMAKE_EXE_LINKER_FLAGS=-Wl,--no-keep-memory"))) (home-page "https://www.webkit.org") (synopsis "Web browser engine and classes to render and interact with web content")