From patchwork Fri Jun 25 18:04:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 189 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 0FFD027BC81; Fri, 25 Jun 2021 19:05: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 91F2D27BC78 for ; Fri, 25 Jun 2021 19:05:10 +0100 (BST) Received: from localhost ([::1]:40470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lwqCT-0003qj-I3 for patchwork@mira.cbaines.net; Fri, 25 Jun 2021 14:05:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56286) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwqCM-0003qb-Nk for guix-patches@gnu.org; Fri, 25 Jun 2021 14:05:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35217) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwqCM-00045n-G3 for guix-patches@gnu.org; Fri, 25 Jun 2021 14:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lwqCM-0003XC-35 for guix-patches@gnu.org; Fri, 25 Jun 2021 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49227] [PATCH 0/3] Some Qt/qtbase improvements. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 25 Jun 2021 18:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49227 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49227@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162464426513482 (code B ref -1); Fri, 25 Jun 2021 18:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jun 2021 18:04:25 +0000 Received: from localhost ([127.0.0.1]:46763 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqBl-0003VO-7L for submit@debbugs.gnu.org; Fri, 25 Jun 2021 14:04:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:56184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lwqBg-0003VE-DV for submit@debbugs.gnu.org; Fri, 25 Jun 2021 14:04:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lwqBg-0003nw-7m for guix-patches@gnu.org; Fri, 25 Jun 2021 14:04:20 -0400 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]:44975) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lwqBe-0003de-4m for guix-patches@gnu.org; Fri, 25 Jun 2021 14:04:20 -0400 Received: by mail-qk1-x72a.google.com with SMTP id bj15so19973895qkb.11 for ; Fri, 25 Jun 2021 11:04:17 -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=P946PT1c4xppka0QS832HkazSdrKndIm/NECtNcLKf8=; b=LZ1RTMjKus7Unu67ia5kzHDMsqX7TZrAlJmkxpR7tzU7GrTtg/xoYNICl/awmLTp6x tP49nL+ipKIk9rdJngyUEEWJk2C8zuKsFSHo2Sxf7ttgH42EFBwKRHbnlrvgwS0ZB8d+ 4V8DvmHs30DDG+hYkTyCh229UnTi/vyk/aCylQJAIIR7TGfDCPrmBAVLvT6FM5DERx+d ssqs0VtPBYmBRlQLTUg49ETsh/YUH57sHTrU7CTHGgtGGWwkbvYd8Jnyt3Z//aMxgxWV Ga/M0MscRRAtwUb6hv7OwJFotODMD9OtaqUgFFgSkWHlKgNzg5OOVWY5U/DPHykLG1s6 R5QA== 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=P946PT1c4xppka0QS832HkazSdrKndIm/NECtNcLKf8=; b=TtzjP/1rY4sjv8NyMfxeo9HF0tM6OwaFkCTTZiZ3up4AHhiFrmgEpQ+gT58TIdP/j8 k95sm3mTPxdAWcH40aqqTJWRzxPfgjTvSyUS18DvJ112uhGtzI0Bd6sZfNWT6vkN6BUd rrjCG4l/31eUGIYcjCIeaPrsLy8dqoPn/yp7AsjS3YqfVbk/CE1rbXbkyL5VwI9Pn0/F XXSvH2IQGHsfEfo5v989ppf9hQJA2ytxoNRXyvzQlIcieq9vqGFTkWsjvgSBEz2MmOcD onDl1yoeZvumklA+mI+FNNoKeXJoNvI68iaPyx4FNEdwrEsoP9O8UQJPFMIE2rXqPTKi 2aOw== X-Gm-Message-State: AOAM533QCt9PVS7EPxfQkGU2oOQS4jLDG/fWOgxJpvWOuUzmGLPBtyXW m38yy2aDgOp9L5Tk4/oOzqk8zrdCo3Zm0Ndh X-Google-Smtp-Source: ABdhPJxdjPVh2ZTBxVRmQgq0R5jL/zrfx2TYK5CyuNZjqK7Cf8KEwKSkDHOmJR1R2bJ45nRkNwnp5Q== X-Received: by 2002:a05:620a:22b2:: with SMTP id p18mr9583929qkh.371.1624644257058; Fri, 25 Jun 2021 11:04:17 -0700 (PDT) Received: from localhost.localdomain (dsl-10-149-111.b2b2c.ca. [72.10.149.111]) by smtp.gmail.com with ESMTPSA id r195sm5504698qke.73.2021.06.25.11.04.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 11:04:16 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 25 Jun 2021 14:04:14 -0400 Message-Id: <20210625180414.10045-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::72a; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qk1-x72a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 Hello Guix! The following 3 patches are some minor improvements for Qt in Guix. They allow them to use GTK themes, which noticeably improve the look of things such as the file picker on systems using a GTK theme. Passing the configure flags via the #:configure-flags argument for qtbase allows package rewriting, for example, building a static version of it: --8<---------------cut here---------------start------------->8--- (use-modules (gnu packages qt) (guix packages) (guix transformations) (guix utils)) ;;; Adapted from static-package in (guix build-system gnu). (define* (static-package-qt p #:key (strip-all? #t)) "Return a statically-linked version of package P. If STRIP-ALL? is true, use `--strip-all' as the arguments to `strip'." (package (inherit p) (arguments (let ((a (default-keyword-arguments (package-arguments p) '(#:configure-flags '() #:strip-flags '("--strip-debug"))))) (substitute-keyword-arguments a ((#:configure-flags flags) `(cons* "--disable-shared" "-static" ,flags)) ((#:strip-flags flags) (if strip-all? ''("--strip-all") flags))))) (replacement (and=> (package-replacement p) static-package-qt)))) (define qtbase-static (static-package-qt qtbase)) (packages->manifest (cons qtbase-static)) --8<---------------cut here---------------end--------------->8--- Maxim Cournoyer (3): build: qt-build-system: Allow users to override/extend XDG_DATA_DIRS. gnu: qtbase: Enable GTK support. gnu: qtbase: Specify configure flags via the #:configure-flags argument. gnu/packages/qt.scm | 168 ++++++++++++++++----------------- guix/build/qt-build-system.scm | 14 +-- 2 files changed, 90 insertions(+), 92 deletions(-)