From patchwork Wed Aug 3 02:00:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41117 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 5138827BBEA; Wed, 3 Aug 2022 03:06:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, T_PDS_PRO_TLD,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C7FE827BBE9 for ; Wed, 3 Aug 2022 03:06:12 +0100 (BST) Received: from localhost ([::1]:40580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oJ3lz-0001pJ-W8 for patchwork@mira.cbaines.net; Tue, 02 Aug 2022 22:06:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJ3lr-0001pB-6b for guix-patches@gnu.org; Tue, 02 Aug 2022 22:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oJ3lq-0000fu-S0 for guix-patches@gnu.org; Tue, 02 Aug 2022 22:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oJ3lq-0003hv-N7 for guix-patches@gnu.org; Tue, 02 Aug 2022 22:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56901] [PATCH] gnu: qt5ct: Fix build Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Aug 2022 02:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 56901 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56901@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165949234114222 (code B ref -1); Wed, 03 Aug 2022 02:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 3 Aug 2022 02:05:41 +0000 Received: from localhost ([127.0.0.1]:45579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJ3lU-0003hI-IH for submit@debbugs.gnu.org; Tue, 02 Aug 2022 22:05:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:56120) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oJ3lR-0003hA-UD for submit@debbugs.gnu.org; Tue, 02 Aug 2022 22:05:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43104) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJ3lP-0001ot-UE for guix-patches@gnu.org; Tue, 02 Aug 2022 22:05:36 -0400 Received: from mail-dm3nam02olkn2081f.outbound.protection.outlook.com ([2a01:111:f400:7e83::81f]:34657 helo=NAM02-DM3-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oJ3lN-0000eq-LS for guix-patches@gnu.org; Tue, 02 Aug 2022 22:05:35 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ljneToFNjyzOt9G9A+TkPR2xVkQIgC/4SRjqEYq6njtI4KsaXIwGGcz5GH4tf+8Sux0OnMmbNCZ3kLpKeB5K1P+/cK8rz8DRfuCDFI14v/98WoTqxEiceZf16vmtvA/cYtthnGOh+koHDUub4O8gAqSGfkSPqjA0kllsCBC4kzP+OB8lpee0Chea/G6YZjLCNmL6dSywrhZExyDztgY0pPObJjWF0QJjR+1ZjfDWA4i1aO8EK6qLQ/Fc6PN18060yqOwJ5OAibXyX2QpV3Tw3CQtrfumNnQhClpRbKXpAdGmZkNFU4OyyWGiBGiRW8AxkkwZllZTujpE6hZlf0LeGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jVzbxmF9o8hKRCyATtw2OiGnO2DBTyubU4Mqx8p1Lzo=; b=X+J10zqHsX+mNFCraE4ME0EbxgBct2JOmteDypDupoae0E0cxCNI2P3Birzgh+bwVNsrpoBoD2wLKgqDZMcRE/0L87y2WTk/Fxc2RDrNLXT4ijXKVAamYFnfiihfLh/hluc3YT2Zr3e7eYvHvQ7v7/Yq1SASqM2cp/Nw0tK5zmwINAB3SyFMSoCAqK19uls+6vyA3lAkSxJn93KTThFlklZO6SZuIRZNTiC4Mu0qjlc+qsEyXxgHHIUkdN8GPJujPpaVhfWKKaTcUS/ygt//eACoEM9Earl5XzC6GCNF6cr3Qa/tili9d6wVxMhmqLg8qccOl+Jfptg3Fu19TFvePQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jVzbxmF9o8hKRCyATtw2OiGnO2DBTyubU4Mqx8p1Lzo=; b=H70ZM5/CcGn8sbhxAfIL1Js1n7ryK91KdfxU9mNPQMwcOhlxbUhKgxyOy/1RmqYOT23eEl3bkq1RI5ddqB/4rT1iqUVxfXaPIJqw9cYJ9xOV8sqmXDyH8W8cPU9vR56qRPcBDLLeqe3rpJiM26AtmxCdgpyuaSdKpQ8Y/F7CI/ez0a6+BB0E4j0OUGrnLz4X/x1mKHHT754DFPBEiqFI5ob3Glv2wzGXIlHql4Xeb2N/wyasCu7TwV0CTL7ulgnkbwnfbiCLH/+MajfaeZ9UnkOJrsdswNWx5p0SLKR0wonD6o0+J5A7LF1Wf3audQ6bOPvxnYu9QTFE/FQJh5ZdnQ== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by PH0PR03MB5767.namprd03.prod.outlook.com (2603:10b6:510:42::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.11; Wed, 3 Aug 2022 02:00:27 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::7531:a347:9a4b:5d9a]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::7531:a347:9a4b:5d9a%7]) with mapi id 15.20.5482.016; Wed, 3 Aug 2022 02:00:27 +0000 From: Morgan.J.Smith@outlook.com Date: Tue, 2 Aug 2022 22:00:02 -0400 Message-ID: X-Mailer: git-send-email 2.37.1 X-TMN: [r+vo8UwgiJ1ScIPeVXq2dyauwgE/Wcvb] X-ClientProxiedBy: YT1PR01CA0076.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:2d::15) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20220803020001.9563-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ebf1a79d-076c-43d2-1dbb-08da74f3eefe X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8lkqDIaiSa7Fcun1bzb+ve2k6DLisxy3oVGCWClJGAU7zhP5zesQY+EEdBV4SfsZjoRRkUWobTsIyP/T3gGKjCk2fNmKAJm4ArwgPheuCZRd30HR18WA5gHCfvZLY9j28gj8z1HPxWVwDDkGurCQLfn6NOrxSSyHwvf1fGzGOes6/u9CkUbNmHd2lst1m9Jc6+N3175Rwk9RQZfNzH6yILGQVowqCpNYhq0MjPVxMGSjN3ivQFZJ/nS9ZBvZrsJ2OvVf+FwxDZeO6+8S2Himn5T6LcQNiO4o3tNtzZyY+iHWpX653qLjfQbIDlX3BV29hZmO2X1g1GVICCDW0M8ToxcD6r++MvFDUgCrIp3tj2LRmgOfecvAXMRhJvPAKlj6C8ceJhXwnVgsL/BSF5chPeD+0x0yh67NaC0iJgFvS6JWivLjyacu+vYSOBCYJhbdtaBSNevWRCP8K+eRdOVj2gwcEfGzs/TNFN6UkEiRb90txDWbH/lW+ejF6vOAUAEpXVWbbIclw0HC2Yzd6mTmMvRRQ+cAL7QGYwfTUQD8cX3gfLLiaQSYAp8abUtxGiJ8ozOns4zRWKGsdxDFVeIEp3+NS6Vjg7rIAStHfso0igX32Wdf7mwAts56vHQVEInJXzfIfpwWu/DsIJ9Jk9BPtpogYoXJzdUAbcQHjZzsKgBCg== X-MS-TrafficTypeDiagnostic: PH0PR03MB5767:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pnnQwFOfjvd9nF1LzrZSmn1jfhjBTGrtykAF9gqFsu2iM/RWwUdcWh5Gy0YMdzvUzO8vr2VFV2IIenlO9nUy5tQUDcvFxqUElsMtdAfPVHFzZvqcyar7oO+3uiCCBjOkeeLcDrieiuuRd3OM8fp8BigNPdxpF7IIt3Y73oK7uLpH2NBGZXAeEl+G1zINOSkO10CaGsnY9GUyBJgBE+49VDWxl003Ny8o0y76UG2rRj6Zrp2d8FyO3pkXjA/EHxSxKtr5/elo2hpRdguoKbvCiHfC5yuJfo6cn2X5WG0PF6fEB14cJSPtAwEZR4gTR6eEtw8vCKSW2NGANfP25l6ObtsKubtPpVlXHMIPnrpQFF9fErNWgSkOfHu0od17KCQCEXyUCbuAAP0pK0Goks+su+ugkuvhhgxpQMU/cozxzxZp9uzBbnotiDgtr6oojKmmEB9F2ltj+qZBX5Jd7lSk++jWcn4PCEY1rpTCGB51bCzw9xA5B2BbRWdcs/WJ6r5G4vJHHjOafhPP9VkTalKeYXqGR5Ubrt6U1EUX3TocKipuqcttTt4Ylvu+Mz8QmXpoxr0sRo4nQUsnsTxI2UMVlvs121PfSaI/79Hd20gTQWt8vC0OVBZsjY6bQsCcqFYc57rZUPs3eiCRf7RJNwIDVw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 47RkUrDuzr6/lEAv3vq4GXzbjPENHIjeSjHlB0Z0dmeyctqY23Cv1BWwmbxFvPthnRsV/znrQPpNymbZUnGrj+hpQPpT/WLcjkFLUmMk0r14L9raQs31Q07Te6XrrHIQy5GLxWSMqTvTHGFa4cdpDb787OpgrXMh+bfLm3bPt4ypNx6WoacY89g6xWbDkLZh87khS52RcciiWvcZUCV8RBI2qsp0B7b/Z7JrzuCWnYLVjelP5vN+wNdq2XU0OFBg2nasw9o1NMhZvYPzhYf8NfMU4UqEKad7Tcb0WvpIgN5423Xr1TiFH3ePL8X5fj2vFOZANEgpF1uxuRFTrM6qU0iphDT/qzvHCXi+ZcnuiQtd6kGM4tK4eOBa8wV8+AcnZeWkZuJ5xax2kUgmbNs1mHVIPCMo4qTMKjX/Ld3yupcmR7vnsREdJ2vUXQENQzSxbEjRe2Iy7OW4imx6muoKV5bbVJijmfJnFTNsLPlHUDH5V5VpgKFzd7ouNbmXLMFB1mmRdzrSA80EpR23MVj1cIxYlrHZfxyiGRYLJ8Y5slpP6Cl8CliKGB4y/oXGCyPhWzBrFD2GyiaxrxsumZfkIIo6t4H2M3f5QBJkE12+96x/RA6r9gNpHWGf0p0+9gbr/wCWhbM6osFGaIVawoFN7gcIuNK8DYg0tJK2G9khYQCxsVDwQu80hoUAGc5PPQdthSTOYgChdD88+MP3bU7hh1FcHD3w+zIqbmGQvkj6w0H75nbR14KI6YFBvHH+Ald7eO5kfTh/y69BS+kXjICyXecEEayR4ofshm/d7H0PMzzHPKl+YClcG3V/InmYwaUIB77/b2gFsL5t/pnAaGzImEGGpdJpnK44tjExrT0iJiCSVjYpy5bCPd2X9EnvasFTf20lB2MYP5KFb5CaMWvxjETdRVuh1UiIWIJgSFOWaA82iBvyP7E7OKCtxmEIukyxFezDXLeE/udkuVJMJdURF/eEHi8X9osi3K6khxG0lsV/tuc5Su15YTa1c5/+bRWO/p45tK4B7YaIfws8RNu3LiTwS7q2Yq5EftdmEoa1N1/oH46kJESsKmZF3ATGHIhrWUesX/4ORJrsAEt3NriQqAnGoko4FfKPqhLai49zQt2XRvVujANAcFkZyOq/ZPjnk/K7Ii7B16UzXO4dBxitsOOiOi5rDcyO08x+t2rRYemZLyG5JCtUJuWoCm9NrcJOtx5ofo09MFhgLvc5SETa3I3oDpAwRAIOQI7oHXqFn8ZPXWRBXjrt5NmC7TtyWziq/5c85nmkfuTSoepfKNLItC3FT9AtyuLfjMFuOa1TCQ8= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebf1a79d-076c-43d2-1dbb-08da74f3eefe X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2022 02:00:27.4820 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB5767 Received-SPF: pass client-ip=2a01:111:f400:7e83::81f; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM02-DM3-obe.outbound.protection.outlook.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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_PDS_PRO_TLD=0.01, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Morgan Smith * gnu/packages/qt.scm (qt5ct) [build-system]: Change to qt-build-system [phases]: Replace [inputs]: Remove qtbase-5 [modules]: Removed [impoorted-modules]: Removed --- gnu/packages/qt.scm | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f74f84f2ac..86f5d11714 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -159,37 +159,22 @@ (define-public qt5ct (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) (sha256 (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn")))) - (build-system gnu-build-system) + (build-system qt-build-system) (arguments - `(#:tests? #f ; No target - #:imported-modules - (,@%qt-build-system-modules) - #:modules - ((guix build gnu-build-system) - ((guix build qt-build-system) - #:prefix qt:) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "qt5ct.pro" - (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease") - (search-input-file inputs "/bin/lrelease"))))) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (invoke "qmake" - (string-append "PREFIX=" out) - (string-append "BINDIR=" out "/bin") - (string-append "DATADIR=" out "/share") - (string-append "PLUGINDIR=" out "/lib/qt5/plugins"))))) - (add-after 'install 'qt-wrap - (assoc-ref qt:%standard-phases 'qt-wrap))))) + (list + #:tests? #f ; No target + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* '("src/qt5ct-qtplugin/CMakeLists.txt" + "src/qt5ct-style/CMakeLists.txt") + (("\\$\\{PLUGINDIR\\}") + (string-append #$output "/lib/qt5/plugins")))))))) (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtsvg-5)) + (list qtsvg-5)) (synopsis "Qt5 Configuration Tool") (description "Qt5CT is a program that allows users to configure Qt5 settings (such as icons, themes, and fonts) in desktop environments or