From patchwork Tue Aug 8 04:14:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52648 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 1C10F27BBEA; Tue, 8 Aug 2023 05:18:29 +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_ADSP_CUSTOM_MED, 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 06D5B27BBE2 for ; Tue, 8 Aug 2023 05:18:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qTEAZ-0005tS-0P; Tue, 08 Aug 2023 00:18:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qTEAW-0005sp-7f for guix-patches@gnu.org; Tue, 08 Aug 2023 00:18:04 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qTEAV-0006nx-VH for guix-patches@gnu.org; Tue, 08 Aug 2023 00:18:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qTEAU-0004aX-1N; Tue, 08 Aug 2023 00:18:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65139] [PATCH 2/3] gnu: Add pyotherside-for-qt5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 08 Aug 2023 04:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65139 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65139@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65139-submit@debbugs.gnu.org id=B65139.169146825217582 (code B ref 65139); Tue, 08 Aug 2023 04:18:01 +0000 Received: (at 65139) by debbugs.gnu.org; 8 Aug 2023 04:17:32 +0000 Received: from localhost ([127.0.0.1]:34718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTEA0-0004ZW-5f for submit@debbugs.gnu.org; Tue, 08 Aug 2023 00:17:32 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:44226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qTE9y-0004ZH-24 for 65139@debbugs.gnu.org; Tue, 08 Aug 2023 00:17:30 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-63ce8bea776so29858566d6.0 for <65139@debbugs.gnu.org>; Mon, 07 Aug 2023 21:17:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691468244; x=1692073044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7H359A7UKVmviY/AL9pIAEHX+ePtKTdZQjUvlMDLE/w=; b=O3eh/fRqYw4lBCg9h/qFcpasN6FitZ5tb7VG/YzTCSFfSeAZ1TCyFJ89xm6GzlXW4J zvjf7Crf2//TE8ZaIU6/WaBiIoF00LE+YxOm2v+ITL1aHxGvwwzaYFfaF1Jc+mFKu6fP YqKuTft1rbXobHOlBygYu5jyxxeWJHEnMMDcSDxez1AioDg7i6BFlhTfAiv0OJgSoXqP YjJmqv3xfl0miULbvdl28qIw5O0tGsYOqsRPT0CVPn+ilV7ltt99ZDcpXZQIEQzKVH6Z 29mzw0R08uj6pVn+tbSaBvpOf0Iw2KpPfOPToyjznpLo+xCYjJfqQwaggN61HQxyljbC D02w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691468244; x=1692073044; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7H359A7UKVmviY/AL9pIAEHX+ePtKTdZQjUvlMDLE/w=; b=YcGHAB3EVYT0e7HlB9Bg4cMs3Y/YyCe0jQiQKPXnbktchJHR7p0G8Qxv87cuPMNNRW zDoO2MkxNYBBGXfFJGxq/ND3Zsx1c/npI3VyiO+QrV7PkVq+xfdJOKvPNrTyF6bzxFzH MIpfUtC4GoeBmETSo15L3vOibVCkYxVGUSz4CLrd+U7vvAdnztFftcQsF5H9xmw9RTRT 2EwPEK5dZIb+gpR1psj+CghgSUL+Ou/ZhQFBmhH/WLDDjBI/UXKqBrFi8z5kwTbrcXhi gGPovj8ocvX9hTHgp7FeOqpZwzrMaT+U2iQYTgItvliPNOia76pPG0k0Z/owigUiU3tX e8Mw== X-Gm-Message-State: AOJu0Yz1T/KW+0anaZvcptHAPwp2l7FyvzFtJRIXOiEsbqPOuoZQbPkT yGtajM7GnxD8z34N+gDiscw9VFUy1LnP2mXC X-Google-Smtp-Source: AGHT+IGh07sHAWbYJrAyuVb2d/hJEcyhAPL7PFjztykglQC9VQ6p+pWNtGOLpKPEoEx3dXQIzjWLbQ== X-Received: by 2002:a0c:ed43:0:b0:636:1aae:1bcc with SMTP id v3-20020a0ced43000000b006361aae1bccmr10325069qvq.39.1691468244351; Mon, 07 Aug 2023 21:17:24 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-170.b2b2c.ca. [205.236.230.170]) by smtp.gmail.com with ESMTPSA id a10-20020a0ce38a000000b00636291d04adsm3374039qvl.47.2023.08.07.21.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 21:17:23 -0700 (PDT) From: Maxim Cournoyer Date: Tue, 8 Aug 2023 00:14:05 -0400 Message-ID: <4db489d46ef60fcbf9bfe1ae580a99789e5f9c4d.1691468046.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/qt.scm (pyotherside-for-qt5): New variable. --- gnu/packages/qt.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 581df38eaa..1184a85938 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -3264,6 +3264,29 @@ (define-public pyotherside Python.") (license license:isc))) +(define-public pyotherside-for-qt5 + (package/inherit pyotherside + (name "pyotherside-for-qt5") + (arguments + (substitute-keyword-arguments (package-arguments pyotherside) + ((#:qtbase _ #f) + qtbase-5) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'fix-installation-prefix + (lambda _ + ;; The QT_INSTALL_QML property points to the qtbase + ;; installation prefix. + (substitute* "src/src.pro" + (("\\$\\$\\[QT_INSTALL_QML]") + (string-append #$output "/lib/qt" + #$(version-major (package-version qtbase-5)) + "/qml"))))))))) + (inputs (modify-inputs (package-inputs pyotherside) + (replace "qtdeclarative" qtdeclarative-5) + (replace "qtquickcontrols2" qtquickcontrols-5) + (replace "qtsvg" qtsvg-5))))) + (define-public python-sip (package (name "python-sip")