From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 14:04:25 2021 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 To: guix-patches@gnu.org Subject: [PATCH 0/3] Some Qt/qtbase improvements. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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(-) -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 14:08:35 2021 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 To: 49227@debbugs.gnu.org Subject: [PATCH 1/3] build: qt-build-system: Allow users to override/extend XDG_DATA_DIRS. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49227 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 14:08:53 2021 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 To: 49227@debbugs.gnu.org Subject: [PATCH 2/3] gnu: qtbase: Enable GTK support. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49227 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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) -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Jun 25 14:08:58 2021 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 To: 49227@debbugs.gnu.org Subject: [PATCH 3/3] gnu: qtbase: Specify configure flags via the #:configure-flags argument. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49227 Cc: Maxim Cournoyer X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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") -- 2.32.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jun 26 12:32:41 2021 Received: (at 49227) by debbugs.gnu.org; 26 Jun 2021 16:32:42 +0000 Received: from localhost ([127.0.0.1]:48565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxBEX-0005iZ-Ht for submit@debbugs.gnu.org; Sat, 26 Jun 2021 12:32:41 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:55258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lxBEU-0005iO-Jc for 49227@debbugs.gnu.org; Sat, 26 Jun 2021 12:32:40 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by xavier.telenet-ops.be with bizsmtp id MsYc2500X0mfAB401sYdVz; Sat, 26 Jun 2021 18:32:37 +0200 Message-ID: Subject: Re: [bug#49227] [PATCH 1/3] build: qt-build-system: Allow users to override/extend XDG_DATA_DIRS. From: Maxime Devos To: Maxim Cournoyer , 49227@debbugs.gnu.org Date: Sat, 26 Jun 2021 18:32:26 +0200 In-Reply-To: <20210625180823.10382-1-maxim.cournoyer@gmail.com> References: <20210625180414.10045-1-maxim.cournoyer@gmail.com> <20210625180823.10382-1-maxim.cournoyer@gmail.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-wtcbwULu1cZnsYrDsouN" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1624725157; bh=VcY2+DZ5YeLPSil0a5mL/YjlYtS0I5ZMsdbOrbKS5a4=; h=Subject:From:To:Date:In-Reply-To:References; b=VUHMLRiwI9jKlv+jgI6Uo16rJKRU5i399XjfE8O+hpDGA/HcQbh44xfclCCsjwoNV WnLT7IOwOWpnDwLeVzxfRWM4Z3Q2lphvJsMtzDdDBYK6E9ROsJGf+rJrCK1cb2v8vz zE5ToN269cWwJuy2Pd0az/mhZsVqb0UowQoGlI8TxQa/AnTn5mjB5U7DM+GFZA1xGO pLhbsITbRf8aHuORrwHbwudikElDuzUtNLM3tDeXW+4Au5c3r+54fVpma5e0JKBIDM L1uSeLcZa/W88K9sWjt4uRjQwAzZt9IWaVYBcn4VhRy/OpFE66sXl6hyod7iOQ6SOR yXhOwvUhFLFzA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 49227 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-wtcbwULu1cZnsYrDsouN Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Maxim Cournoyer schreef op vr 25-06-2021 om 14:08 [-0400]: > ;; 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" I'd recomend adding a comment here, explaining why 'suffix' is necessary and '=3D' is unsufficient, with a link to the bug and patches tracker, for clarity. Greetings, Maxime. --=-wtcbwULu1cZnsYrDsouN Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYNdWmhccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7gWQAQDgiBBqewvnLOnudZSmOx3rklF+ 6PMP/meK/zNWeVAqlwEA6N1Ba5gYVpE30lTOPp3n7kyL7Y3BzKTbJvrYNbzjIwc= =2EQo -----END PGP SIGNATURE----- --=-wtcbwULu1cZnsYrDsouN-- From debbugs-submit-bounces@debbugs.gnu.org Fri Jul 02 17:08:46 2021 Received: (at 49227-done) by debbugs.gnu.org; 2 Jul 2021 21:08:46 +0000 Received: from localhost ([127.0.0.1]:37223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzQP0-0001qT-9j for submit@debbugs.gnu.org; Fri, 02 Jul 2021 17:08:46 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:40779) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzQOx-0001qC-Hh for 49227-done@debbugs.gnu.org; Fri, 02 Jul 2021 17:08:45 -0400 Received: by mail-qt1-f174.google.com with SMTP id n9so7632204qtk.7 for <49227-done@debbugs.gnu.org>; Fri, 02 Jul 2021 14:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=pWMIMtmwXJoaCDL0J3hg+aM4LVjg15nVVzNu8Y6Q8Dw=; b=eTM7K1yICJaX4Y6BDM3gQZSLPf/E7vffHr7Ippyb0hJYI0deJdQeBUcTdXAKHgHKex uPf6kwQe2KMtT/TUPPA7I9hCmTSL1pcsKJzpCt8yTQI6sCzPXPYuJVQYoJrTqQYTG7kV WFq5/mURL52YKOd4pUHPhIg2yMhwtCI/GxAMZOqyt7gtr8hCJW0HjYJWcTZ769U53W2e peqvGiTZ1R4rux14c3PdEtirdvMN/8K8+zWsDs6NHDIEB2XA/hYufpdpu/8DuXe4O3KW z5ZoioL7Pk0BKpgzxApfeX8LmMo8uT1OgBnNyBHVft5s5enAJ+Y1LynHPSktLLxbjz6y ygbQ== 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:references:date:in-reply-to :message-id:user-agent:mime-version; bh=pWMIMtmwXJoaCDL0J3hg+aM4LVjg15nVVzNu8Y6Q8Dw=; b=DqMU6G5oRkxp9SYMRhheV7AlyH6LEz5REol/Yo2rykQ+PhYFMEiclJE7EwSjc3ygYt rodBJlJgQk3x1IVlBZ0Vn6eMWBvUra5XWUQXxGAyQiy7sRa5lRefsCCcH+uQZcqxZjlo Tl8RbyOxefHls+7roeZ+keo2ghBsalViIfCJN2FRK7qgBLh2yHHdX5v7k/58TdCRjQDA 7kIIe2vFuPA87Azo5PjoJoq9Kmkb1oLbCeJ9W0rASkS1TKc0p9fOVuR5brFEglKIqwe/ EpdPcCHLPVHITs1w0gC9NIRR3rOG4hX3dI2o0lr+HUYe8CuxlJp6LeBjgDYHrsGGvQOI B5Pg== X-Gm-Message-State: AOAM530en9FNvTPTynSmB/0CXlexd/fzthYNZkVqYBCyP82jObDa8nL/ Zw+RxRqkcPJUUSpFTfXLUOkTFceU0oX92A== X-Google-Smtp-Source: ABdhPJzDAOkZsBwWVo4mGLeMvVYucI1Gl0Rejbp97RTiNpi5HdUWWKSJI2Cy9mgBgCHS/q7T0fghbA== X-Received: by 2002:ac8:7098:: with SMTP id y24mr1648564qto.309.1625260117952; Fri, 02 Jul 2021 14:08:37 -0700 (PDT) Received: from hurd (dsl-10-132-56.b2b2c.ca. [72.10.132.56]) by smtp.gmail.com with ESMTPSA id x24sm1632985qtj.94.2021.07.02.14.08.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Jul 2021 14:08:37 -0700 (PDT) From: Maxim Cournoyer To: Maxime Devos Subject: Re: [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> <20210625180823.10382-1-maxim.cournoyer@gmail.com> Date: Fri, 02 Jul 2021 17:08:36 -0400 In-Reply-To: (Maxime Devos's message of "Sat, 26 Jun 2021 18:32:26 +0200") Message-ID: <87bl7k2zl7.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49227-done Cc: 49227-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxime, Maxime Devos writes: > Maxim Cournoyer schreef op vr 25-06-2021 om 14:08 [-0400]: >> ;; 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" > > I'd recomend adding a comment here, explaining why 'suffix' is necessary > and '=' is unsufficient, with a link to the bug and patches tracker, > for clarity. I realized that there had already been the same fix on staging. I had to spend some time to manually resolve "conflicts" (which were not immediately apparent due to code having changed place on core-updates). The conflict cherry-picked from core-updates which ended up fixing this was 30759c4aadf279e470e8d7f94de332a31c1b9f42. I rebased the commits that had been pushed to master on that and a few related others, and pushed as d5c9cc6d9d979bfca5f035429bcf510a0a2285a3, which contains extra comments. Thank you! Maxim From unknown Sun Jun 15 01:08:41 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 31 Jul 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator