From patchwork Fri Jun 25 18:08:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 30714 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 D1DB327BC81; Fri, 25 Jun 2021 19:09:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8D23227BC78 for ; Fri, 25 Jun 2021 19:09:14 +0100 (BST) Received: from localhost ([::1]:42286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwqGP-0005G2-Ku for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 14:09:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwqGE-0005Cn-UA for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwqGE-0006eP-Lz for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwqGE-0003e6-GU for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49227] [PATCH 1/3] build: qt-build-system: Allow users to override/extend XDG_DATA_DIRS. References: <20210625180414.10045-1-maxim.cournoyer@gmail.com> In-Reply-To: <20210625180414.10045-1-maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 18:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49227@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 49227-submit@debbugs.gnu.org id=B49227.162464451513955 (code B ref 49227); Fri, 25 Jun 2021 18:09:02 +0000 Received: (at 49227) by debbugs.gnu.org; 25 Jun 2021 18:08:35 +0000 Received: from localhost ([127.0.0.1]:46773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqFn-0003d1-Gd for submit@debbugs.gnu.org; Fri, 25 Jun 2021 14:08:35 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:39923) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqFk-0003ck-4t for 49227@debbugs.gnu.org; Fri, 25 Jun 2021 14:08:34 -0400 Received: by mail-qt1-f178.google.com with SMTP id f13so1975834qtb.6 for <49227@debbugs.gnu.org>; Fri, 25 Jun 2021 11:08:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YuYr9M55pG5IH/fUfHD6sXrxVTTVRA4cj0WYwKF4Kmk=; b=SRWBRyql6+yheFrP+uqaG6ZTEy/uXKTvijvCY9eWlBT+vjNKiOzvY8vrhHAsf8jZEW JgFhTLic7lBJi15MoMNOw0P/IdwyKwIzaVv2YG530cYIprNfOJ3yod/JxeUIbF2u1XxV 5yiXt46PeodcqpeuNwAW8SrDMngG6McfCxhPixhtnj6TNBSO31OS9V3LUiOljFYs6KUb 701vjYWMVPJc/nha8Nolfo/RgidlR4kH3/i+2rxQhuzLZvR/asZdUjs2kFyLWSOLBOBn AMP+MJkIzVlX2rTqYDnvLRMpJcii7xIost4pCXgieRKylnnw6ewz6YJDzPcTrjvsCYwj Un3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YuYr9M55pG5IH/fUfHD6sXrxVTTVRA4cj0WYwKF4Kmk=; b=EkPIN/x0DygqDvPVA1f5OaStISN+qzx3qlambRvCH2YaOCIGPLo4XUtQqjqEokiIaC gn1AFjyuwV+7WxOu1DwKEzJrbxt3K1/M4Vy3sKefRcoxuhP9kGriGC+O8cXGOOgstW+R HHhJWi9h94jzb0mOQi+MIg1av0GlMqHduuGkfbKbH6wB1v2g6JPga1Y8NhJ+rGxGrja+ QK3B+uDuqjDL6Kf3HYtjexe5BdEVJvl0eqYUFFtNjt4zq7rAMZRLKr7JmYZqgRkqOMer X1kDDdCEluPqmw2OXobSuwIlE3GQrkcuIWIr4xCF5RlZ5ruGiIg7/pzhT6+IB+j3PgMe pGWg== X-Gm-Message-State: AOAM533ppJPhghh6F6uwkqJDzWa60uRQ7VYCw+qzosEmp2PKaVg5rvRJ w2HCk6Wf+JBPuWwo1wVP4CU7gy0JClVyVpjM X-Google-Smtp-Source: ABdhPJyT+P4Ly+QFf0H6py9uNTu7rrSlPwXJYCVEZTR9za3PxuP4TsKnJ8DPAfzHdPAja38Qql3eWA== X-Received: by 2002:ac8:5895:: with SMTP id t21mr10449803qta.353.1624644506550; Fri, 25 Jun 2021 11:08:26 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-111.b2b2c.ca. [72.10.149.111]) by smtp.gmail.com with ESMTPSA id v5sm5428036qkh.39.2021.06.25.11.08.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 11:08:26 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 25 Jun 2021 14:08:21 -0400 Message-Id: <20210625180823.10382-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Before this change, XDG_DATA_DIRS was wrapped using '=, which meant that it wouldn't pick up extra icons from the user's profile, for example. When enabling gtk+ theming support in qtbase, that led to crashes due to GTK not finding icons from even the hicolor icon theme fallback (which is assumed to exist). * guix/build/qt-build-system.scm (variables-for-wrapping): Specify an extra 'wrap-type' information per variable that gets passed to the wrap-program procedure. Set the XDG_DATA_DIRS variable wrapping type to 'suffix', which allows the user to both extend and override its value. --- guix/build/qt-build-system.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/guix/build/qt-build-system.scm b/guix/build/qt-build-system.scm index f59b0c420f..59242f5fab 100644 --- a/guix/build/qt-build-system.scm +++ b/guix/build/qt-build-system.scm @@ -73,17 +73,17 @@ (filter-map (match-lambda - ((variable file-type directory selectors ...) + ((variable wrap-type file-type directory selectors ...) (match (collect-sub-dirs base-directories file-type directory selectors) (() #f) (directories - `(,variable = ,directories))))) + `(,variable ,wrap-type ,directories))))) ;; These shall match the search-path-specification for Qt and KDE ;; libraries. - (list '("XDG_DATA_DIRS" directory "/share" + (list '("XDG_DATA_DIRS" suffix directory "/share" ;; These are "selectors": consider /share if and only if at least ;; one of these sub-directories exist. This avoids adding @@ -91,10 +91,10 @@ ;; /share sub-directory. "/glib-2.0/schemas" "/sounds" "/themes" "/cursors" "/wallpapers" "/icons" "/mime") - '("XDG_CONFIG_DIRS" directory "/etc/xdg") - '("QT_PLUGIN_PATH" directory "/lib/qt5/plugins") - '("QML2_IMPORT_PATH" directory "/lib/qt5/qml") - '("QTWEBENGINEPROCESS_PATH" regular + '("XDG_CONFIG_DIRS" = directory "/etc/xdg") + '("QT_PLUGIN_PATH" = directory "/lib/qt5/plugins") + '("QML2_IMPORT_PATH" = directory "/lib/qt5/qml") + '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) (define* (wrap-all-programs #:key inputs outputs From patchwork Fri Jun 25 18:08:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 30716 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 641A527BC81; Fri, 25 Jun 2021 19:10:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1097927BC86 for ; Fri, 25 Jun 2021 19:10:09 +0100 (BST) Received: from localhost ([::1]:44886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwqHI-0006zm-4f for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 14:10:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwqGF-0005DW-Bx for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35234) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwqGF-0006f9-4A for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwqGF-0003eE-0H for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49227] [PATCH 2/3] gnu: qtbase: Enable GTK support. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 18:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49227@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 49227-submit@debbugs.gnu.org id=B49227.162464453313987 (code B ref 49227); Fri, 25 Jun 2021 18:09:02 +0000 Received: (at 49227) by debbugs.gnu.org; 25 Jun 2021 18:08:53 +0000 Received: from localhost ([127.0.0.1]:46776 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqG4-0003dX-Pf for submit@debbugs.gnu.org; Fri, 25 Jun 2021 14:08:52 -0400 Received: from mail-qk1-f171.google.com ([209.85.222.171]:42658) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqG3-0003dJ-M9 for 49227@debbugs.gnu.org; Fri, 25 Jun 2021 14:08:51 -0400 Received: by mail-qk1-f171.google.com with SMTP id w21so19949634qkb.9 for <49227@debbugs.gnu.org>; Fri, 25 Jun 2021 11:08:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MkBIfk4E/2t+BfpLuVS74Rzg/oeUojwAkCVW31dTncY=; b=idK4G3r05L4aKSiE1rofwV58w1+NiLDYTzqLNgmwTa+Pdbx+OcoIU6G/OJwQwUlO57 66+oqlo8w2uILasZrXGRJ0PXBGRL5svbgVy/xPu1HoLr9ba4wRbBaG1omv5mtSn4Lr2N /Flfl7UxmB+DEoJ4KiHxGVlMTSX6Dw5Ej5aESJ26kMAZSVkHHhxj69K5FPV0yJ6RHaJR 8Th9qqtcZqAU1ugt1ctC5IvBuXyplltUX3UnHqYrMXz318IJ9DE+8mkzyqc63q9OTq/8 ynGOl2mTKjyZ2RSOuXPLC6/xgN7vLZgZEQ19kM2ANZLFUjL0syjMa4f6EdR7+Lwg3jGb zgJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MkBIfk4E/2t+BfpLuVS74Rzg/oeUojwAkCVW31dTncY=; b=bO+mVjcQrkU06FsLaeC6Of/lFdou9Sd8jgNZAXHqS0LeCgGL7RHi+QAn410RyPTODt /ErKOWsUdHDkAiwhCeQ2Z1+aW0NW3hg3Pz4J8EJ2bXl/wb3kwTItpo6sC62o2vVT0A2A yDGFPfloBey8PEqesT5ZdvpPkavdoinVJ1YVklEqvLIE9bYGpLQGROJejc+s9Nyf8bza 9PwqtiOSWx44gTpseegE7f/aHxSUOBjEjSPPDSbPCOAN5lsNx3C+8aMWIpAQeBGSlXgU rn6zurV8FnkG/iVwZJM9huH0/vTHRwE1BIfStpUFiGakRNCUkkoJFrw8Kf9kYJWtRWe9 9s3A== X-Gm-Message-State: AOAM532j8CFLXTEUuk62sNZrbGeRSew5WASHoutSd3Ty1HET7jUA7M50 NyucEiLFC2ZWSbqPpWbDSFI9kJ6vqlTiSNfk X-Google-Smtp-Source: ABdhPJzL7J5dSQ10Ko1KOvb+2Su0uUCOGerVD8ee8CaSUY6XsDKU7z5W8Xj+4ubre4xR4u00YNklSw== X-Received: by 2002:a05:620a:12bc:: with SMTP id x28mr12191538qki.453.1624644526211; Fri, 25 Jun 2021 11:08:46 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-111.b2b2c.ca. [72.10.149.111]) by smtp.gmail.com with ESMTPSA id v5sm5428036qkh.39.2021.06.25.11.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 11:08:45 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 25 Jun 2021 14:08:22 -0400 Message-Id: <20210625180823.10382-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210625180823.10382-1-maxim.cournoyer@gmail.com> References: <20210625180823.10382-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This allows Qt applications to use the GTK themes present on the system, providing a more integrated look and feel for many Qt applications used in the context of a GTK/GNOME environment. * gnu/packages/qt.scm (qtbase-5)[inputs]: Add gtk+. --- gnu/packages/qt.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 19fcc2f37e..dadfbfecb5 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -338,6 +338,7 @@ system, and the core design of Django is reused in Grantlee.") ("fontconfig" ,fontconfig) ("freetype" ,freetype) ("glib" ,glib) + ("gtk+" ,gtk+) ;for GTK theme support ("harfbuzz" ,harfbuzz) ("icu4c" ,icu4c) ("libinput" ,libinput-minimal) From patchwork Fri Jun 25 18:08:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 30715 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 82AFB27BC81; Fri, 25 Jun 2021 19:09:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E187B27BC78 for ; Fri, 25 Jun 2021 19:09:29 +0100 (BST) Received: from localhost ([::1]:43464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwqGe-00062S-Uj for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 14:09:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwqGF-0005EZ-R7 for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwqGF-0006fp-Hz for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwqGF-0003eL-Du for guix-patches@gnu.org; Fri, 25 Jun 2021 14:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49227] [PATCH 3/3] gnu: qtbase: Specify configure flags via the #:configure-flags argument. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 18:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49227@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 49227-submit@debbugs.gnu.org id=B49227.162464453814004 (code B ref 49227); Fri, 25 Jun 2021 18:09:03 +0000 Received: (at 49227) by debbugs.gnu.org; 25 Jun 2021 18:08:58 +0000 Received: from localhost ([127.0.0.1]:46779 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqGA-0003dn-0U for submit@debbugs.gnu.org; Fri, 25 Jun 2021 14:08:58 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:41855) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqG7-0003dP-Op for 49227@debbugs.gnu.org; Fri, 25 Jun 2021 14:08:56 -0400 Received: by mail-qk1-f177.google.com with SMTP id bl4so20026161qkb.8 for <49227@debbugs.gnu.org>; Fri, 25 Jun 2021 11:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xbc9+1Im2HgmXPnP4TO0QngXNMklPFcv0neaEwRXvp0=; b=XRvdAEl8mIDF1sRTyGYnen7pO1gm9YoV+JW3ytkGncDZx0jkWmPMM1ooelvWFIdn9b a80dU9/Ykf8xIzJl2bosGqTmHamVNMWXJ1lfAxEuXpduQ/H/M5iM9d/Y7BcLQ9/EeRyO 6ylILIwZH/0rY/UzJeHe2ZOtL/6IRnCk1g3ezsxCEHcvBUJNtfyEjBhAkShUUe4zRrtf P/PGUq7yHry7+HkmNM+PL70gV2mfGDuqlYKUOvo97elASdc9v+dU2pXUvWyU4qwxk04i zV/SIH7brCC3QmcbtzflMTseRwmbQuHxjDu/x5oA6m333UFL3NaX9UgNL875SoBnZijs vUdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xbc9+1Im2HgmXPnP4TO0QngXNMklPFcv0neaEwRXvp0=; b=KAyAHPCHh8Ug4LcMYPryqzIwSRO/44od2+COu7W2CRstqvWkALFCo7N3y5VZEXhAGj SNkwrk6WpiAPTK317NP1kTAs8SnjMgyCZuKaQTFflPs5SuyH97/2FhI5ydakQ+p2ELeG j5Vnvg1zc0gzZ/CiE1PslbI3lc9oD4XM4X1+KVXKYSXfGYPdZ3bLrHCMZM+4qKb7DSzP 0U+d5XH5WJHu4Jp4JknoyklaTnTupC9zwkh+ojI5M/MVdl6igk0fC++ByW5b+pfpHmBH ZHZfLFQLCpWuxu6hTRg1s6PE8Yor+6HN8JxRvw/2gRRym0Xjx/mNpSm1M1iSlA59Qs+n XykQ== X-Gm-Message-State: AOAM533NxJuUQN4R5DwJKAp8mRdFqT3E9PYP0aDhLX7kj1F5HpCpcX/R A7qttsDmwee621v7YIur5PurJOyNA+Xkgo7T X-Google-Smtp-Source: ABdhPJzsfWIJGNynVjTiVkD/S1Le2lzxRFx5gumGsPtFjvDcPHure/NelZ/08iJJgkd/tfowTHK/rw== X-Received: by 2002:a05:620a:ed3:: with SMTP id x19mr8816092qkm.296.1624644530237; Fri, 25 Jun 2021 11:08:50 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-111.b2b2c.ca. [72.10.149.111]) by smtp.gmail.com with ESMTPSA id v5sm5428036qkh.39.2021.06.25.11.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 11:08:50 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 25 Jun 2021 14:08:23 -0400 Message-Id: <20210625180823.10382-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210625180823.10382-1-maxim.cournoyer@gmail.com> References: <20210625180823.10382-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (qtbase): Delete trailing #t. [phases]{configure}: Print build directory and configure flags. Move configure flags to... [#:configure-flags]: ... this new argument. --- gnu/packages/qt.scm | 167 ++++++++++++++++++++++---------------------- 1 file changed, 82 insertions(+), 85 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index dadfbfecb5..0a9fdb965f 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -303,25 +303,24 @@ system, and the core design of Django is reused in Grantlee.") (name "qtbase") (version "5.15.2") (source (origin - (method url-fetch) - (uri (qt5-urls name version)) - (sha256 - (base32 - "1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh")) - ;; Use TZDIR to avoid depending on package "tzdata". - (patches (search-patches "qtbase-use-TZDIR.patch" - "qtbase-moc-ignore-gcc-macro.patch" - "qtbase-absolute-runpath.patch")) - (modules '((guix build utils))) - (snippet + (method url-fetch) + (uri (qt5-urls name version)) + (sha256 + (base32 + "1y70libf2x52lpbqvhz10lpk7nyl1ajjwzjxly9pjdpfj4jsv7wh")) + ;; Use TZDIR to avoid depending on package "tzdata". + (patches (search-patches "qtbase-use-TZDIR.patch" + "qtbase-moc-ignore-gcc-macro.patch" + "qtbase-absolute-runpath.patch")) + (modules '((guix build utils))) + (snippet ;; corelib uses bundled harfbuzz, md4, md5, sha3 - '(begin - (with-directory-excursion "src/3rdparty" - (for-each delete-file-recursively - (list "double-conversion" "freetype" "harfbuzz-ng" - "libpng" "libjpeg" "pcre2" "sqlite" "xcb" - "zlib")) - #t))))) + '(begin + (with-directory-excursion "src/3rdparty" + (for-each delete-file-recursively + (list "double-conversion" "freetype" "harfbuzz-ng" + "libpng" "libjpeg" "pcre2" "sqlite" "xcb" + "zlib"))))))) (build-system gnu-build-system) (outputs '("out" "debug")) (propagated-inputs @@ -383,7 +382,56 @@ system, and the core design of Django is reused in Grantlee.") ("vulkan-headers" ,vulkan-headers) ("ruby" ,ruby))) (arguments - `(#:phases + `(#:configure-flags + (let ((out (assoc-ref %outputs "out"))) + (list "-verbose" + "-prefix" out + "-docdir" (string-append out "/share/doc/qt5") + "-headerdir" (string-append out "/include/qt5") + "-archdatadir" (string-append out "/lib/qt5") + "-datadir" (string-append out "/share/qt5") + "-examplesdir" (string-append + out "/share/doc/qt5/examples") + "-opensource" + "-confirm-license" + + ;; Later stripped into the :debug output. + "-force-debug-info" + + ;; These features require higher versions of Linux than the + ;; minimum version of the glibc. See + ;; src/corelib/global/minimum-linux_p.h. By disabling these + ;; features Qt5 applications can be used on the oldest + ;; kernels that the glibc supports, including the RHEL6 + ;; (2.6.32) and RHEL7 (3.10) kernels. + "-no-feature-getentropy" ; requires Linux 3.17 + "-no-feature-renameat2" ; requires Linux 3.16 + + ;; Do not build examples; if desired, these could go + ;; into a separate output, but for the time being, we + ;; prefer to save the space and build time. + "-no-compile-examples" + ;; Most "-system-..." are automatic, but some use + ;; the bundled copy by default. + "-system-sqlite" + "-system-harfbuzz" + "-system-pcre" + ;; explicitly link with openssl instead of dlopening it + "-openssl-linked" + ;; explicitly link with dbus instead of dlopening it + "-dbus-linked" + ;; don't use the precompiled headers + "-no-pch" + ;; drop special machine instructions that do not have + ;; runtime detection + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '() + '("-no-sse2")) + "-no-mips_dsp" + "-no-mips_dspr2")) + #:phases (modify-phases %standard-phases (add-after 'configure 'patch-bin-sh (lambda _ @@ -391,18 +439,18 @@ system, and the core design of Django is reused in Grantlee.") "configure" "mkspecs/features/qt_functions.prf" "qmake/library/qmakebuiltins.cpp") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (add-after 'configure 'patch-xdg-open (lambda _ (substitute* '("src/platformsupport/services/genericunix/qgenericunixservices.cpp") - (("^.*const char \\*browsers.*$" all) - (string-append "*browser = QStringLiteral(\"" - (which "xdg-open") - "\"); return true; \n" all))) - #t)) + (("^.*const char \\*browsers.*$" all) + (string-append "*browser = QStringLiteral(\"" + (which "xdg-open") + "\"); return true; \n" all))))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + ;; Overridden to not pass "--enable-fast-install", which makes the + ;; configure process fail. + (lambda* (#:key outputs configure-flags #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* "configure" (("/bin/pwd") (which "pwd"))) @@ -415,57 +463,9 @@ system, and the core design of Django is reused in Grantlee.") ;; components can be installed in different places. (substitute* (find-files "." ".*\\.cmake") (("NO_DEFAULT_PATH") "")) - ;; do not pass "--enable-fast-install", which makes the - ;; configure process fail - (invoke - "./configure" - "-verbose" - "-prefix" out - "-docdir" (string-append out "/share/doc/qt5") - "-headerdir" (string-append out "/include/qt5") - "-archdatadir" (string-append out "/lib/qt5") - "-datadir" (string-append out "/share/qt5") - "-examplesdir" (string-append - out "/share/doc/qt5/examples") - "-opensource" - "-confirm-license" - - ;; Later stripped into the :debug output. - "-force-debug-info" - - ;; These features require higher versions of Linux than the - ;; minimum version of the glibc. See - ;; src/corelib/global/minimum-linux_p.h. By disabling these - ;; features Qt5 applications can be used on the oldest - ;; kernels that the glibc supports, including the RHEL6 - ;; (2.6.32) and RHEL7 (3.10) kernels. - "-no-feature-getentropy" ; requires Linux 3.17 - "-no-feature-renameat2" ; requires Linux 3.16 - - ;; Do not build examples; if desired, these could go - ;; into a separate output, but for the time being, we - ;; prefer to save the space and build time. - "-no-compile-examples" - ;; Most "-system-..." are automatic, but some use - ;; the bundled copy by default. - "-system-sqlite" - "-system-harfbuzz" - "-system-pcre" - ;; explicitly link with openssl instead of dlopening it - "-openssl-linked" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; don't use the precompiled headers - "-no-pch" - ;; drop special machine instructions that do not have - ;; runtime detection - ,@(if (string-prefix? "x86_64" - (or (%current-target-system) - (%current-system))) - '() - '("-no-sse2")) - "-no-mips_dsp" - "-no-mips_dspr2")))) + (format #t "build directory: ~s~%" (getcwd)) + (format #t "configure flags: ~s~%" configure-flags) + (apply invoke "./configure" configure-flags)))) (add-after 'install 'patch-mkspecs (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -497,8 +497,7 @@ system, and the core design of Django is reused in Grantlee.") '("device_config.prf" "moc.prf" "qt_build_config.prf" "qt_config.prf" "winrt/package_manifest.prf")) (("\\$\\$\\[QT_HOST_DATA/get\\]") archdata) - (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata)) - #t))) + (("\\$\\$\\[QT_HOST_DATA/src\\]") archdata))))) (add-after 'patch-mkspecs 'patch-prl-files (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) @@ -507,8 +506,7 @@ system, and the core design of Django is reused in Grantlee.") ;; on context. See (substitute* (find-files (string-append out "/lib") "\\.prl$") (("\\$\\$\\[QT_INSTALL_LIBS\\]") - (string-append out "/lib"))) - #t))) + (string-append out "/lib")))))) (add-after 'unpack 'patch-paths ;; Use the absolute paths for dynamically loaded libs, otherwise ;; the lib will be searched in LD_LIBRARY_PATH which typically is @@ -520,7 +518,7 @@ system, and the core design of Django is reused in Grantlee.") (substitute* '("src/network/kernel/qdnslookup_unix.cpp" "src/network/kernel/qhostinfo_unix.cpp") (("^\\s*(lib.setFileName\\(QLatin1String\\(\")(resolv\"\\)\\);)" _ a b) - (string-append a glibc "/lib/lib" b)))) + (string-append a glibc "/lib/lib" b)))) ;; libGL (substitute* "src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp" (("^\\s*(QLibrary lib\\(QLatin1String\\(\")(GL\"\\)\\);)" _ a b) @@ -530,8 +528,7 @@ system, and the core design of Django is reused in Grantlee.") (("^\\s*(QLibrary xcursorLib\\(QLatin1String\\(\")(Xcursor\"\\), 1\\);)" _ a b) (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)) (("^\\s*(xcursorLib.setFileName\\(QLatin1String\\(\")(Xcursor\"\\)\\);)" _ a b) - (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b))) - #t))))) + (string-append a (assoc-ref inputs "libxcursor") "/lib/lib" b)))))))) (native-search-paths (list (search-path-specification (variable "QMAKEPATH")