From patchwork Tue Jan 16 10:28:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 58933 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 2CA9927BBE9; Tue, 16 Jan 2024 10:29:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 D994727BBE2 for ; Tue, 16 Jan 2024 10:29:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPggu-0007DN-5x; Tue, 16 Jan 2024 05:29:08 -0500 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 1rPggs-0007DE-Qi for guix-patches@gnu.org; Tue, 16 Jan 2024 05:29:06 -0500 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 1rPggs-0003q4-JP for guix-patches@gnu.org; Tue, 16 Jan 2024 05:29:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPggn-0006yA-WD; Tue, 16 Jan 2024 05:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH 1/2] gnu: qtscxml: Update to 6.5.2. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Tue, 16 Jan 2024 10:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68500 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68500@debbugs.gnu.org Cc: Sergey Trofimov , Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 68500-submit@debbugs.gnu.org id=B68500.170540093026756 (code B ref 68500); Tue, 16 Jan 2024 10:29:01 +0000 Received: (at 68500) by debbugs.gnu.org; 16 Jan 2024 10:28:50 +0000 Received: from localhost ([127.0.0.1]:47837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPggb-0006xU-UF for submit@debbugs.gnu.org; Tue, 16 Jan 2024 05:28:50 -0500 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:60884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPggZ-0006x9-QO for 68500@debbugs.gnu.org; Tue, 16 Jan 2024 05:28:49 -0500 Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-559bf1a3eaeso39126a12.1 for <68500@debbugs.gnu.org>; Tue, 16 Jan 2024 02:28:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1705400921; x=1706005721; darn=debbugs.gnu.org; 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=nKlpAPVx3BwxktQnviAeegY/aIBsEPtTFcV1YRtK9f4=; b=YLtphWm4Il9AmyL8K8CkXoTNBMi7j72TtnLMXJVaY/5EiNssKm01CwKDXSn481d5Uw vGqXJEC7uy1/41X6c4r3ypOzZpEM2ddDbQAOvLYabKMEJRbJ2Yz4Ow3bctQY3Qt9/YwE vcxVfy+hlRUTHmFsyap0tK0lE25DBAOX0xmAo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705400921; x=1706005721; 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=nKlpAPVx3BwxktQnviAeegY/aIBsEPtTFcV1YRtK9f4=; b=rW6g9wvSS7zAee+gFSYb3Yad/vfuBmif7p1SVsKMZv51+BSBfDO9LfhfDRbjG3c88r EK7v5Soss3xecz70cX2WJGeLPr8edK3WogorWSTFe5Srp803bOpCXKSKatirr8lGmjDj zJg/9uNey7YCXgvUCM0UlHMSDAcKwY2oZbIMKqLzRlr2o8yl1nOnSqPzsRK/PTGsswCK 4iBB4aSvZKb8JZEN7JVD0aOTLmZcIq62Y4FaaBzV1pHpE4K9F5URNlvQDayHip8L3CdE Gk8IwedscR9FuDuMohaN2m5iPm2QZnMNslBqctCdTKOW9C+g1/XjpJgsVoCl3waBjD2Z 768g== X-Gm-Message-State: AOJu0YyC5S/lB6iHJ4y/IdKT448+i024IbyfawpU3e/2kguSVImghXc0 9xztA2+nzk3k2afMiD5aKUjcQsEuzXLS+/oqxLsBblPxayMcEM5k X-Google-Smtp-Source: AGHT+IFH9sqkoFwojeEWQvtQhF+8HJnM2LtzCnMu/6Aa2cobJ+1U44HpyUfS9QdvPQUJTuLygbbX3g== X-Received: by 2002:a17:907:c307:b0:a2d:d8f0:d987 with SMTP id tl7-20020a170907c30700b00a2dd8f0d987mr2284880ejc.33.1705400921148; Tue, 16 Jan 2024 02:28:41 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id a13-20020a170906274d00b00a2b608ad048sm6309885ejd.28.2024.01.16.02.28.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 02:28:41 -0800 (PST) From: Sergey Trofimov Date: Tue, 16 Jan 2024 11:28:21 +0100 Message-ID: <4e99bf1440047a056e1026df92bdacb782f11362.1705400531.git.sarg@sarg.org.ru> 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 (qtscxml): Update to 6.5.2. (qtscxml-5): Add qt5 variant. (python-pyside-2)[inputs]: Use qtscxml-5. --- gnu/packages/qt.scm | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2b89e7e738..25821584ee 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2316,7 +2316,7 @@ (define-public qtgamepad primary target audience are embedded devices with fullscreen user interfaces, and mobile applications targeting TV-like form factors."))) -(define-public qtscxml +(define-public qtscxml-5 (package (inherit qtsvg-5) (name "qtscxml") @@ -2344,6 +2344,32 @@ (define-public qtscxml generating a C++ file that has a class implementing the state machine. It also contains functionality to support data models and executable content."))) +(define-public qtscxml + (package + (name "qtscxml") + (version "6.5.2") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1jxx9p7zi40r990ky991xd43mv6i8hdpnj2fhl7sf4q9fpng4c58")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "tests/3rdparty"))))) + (arguments (list #:tests? #f)) ; TODO: Enable the tests + (build-system cmake-build-system) + (inputs (list qtbase qtdeclarative libxkbcommon)) + (synopsis "Qt SCXML module") + (description "The Qt SCXML module provides functionality to create state +machines from SCXML files. This includes both dynamically creating state +machines (loading the SCXML file and instantiating states and transitions) and +generating a C++ file that has a class implementing the state machine. It +also contains functionality to support data models and executable content.") + (home-page (package-home-page qtbase)) + (license (package-license qtbase)))) + (define-public qtpositioning (package (name "qtpositioning") @@ -4453,7 +4479,7 @@ (define-public python-pyside-2 qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5 From patchwork Tue Jan 16 10:28:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 58934 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 D17AE27BBEA; Tue, 16 Jan 2024 10:29:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A autolearn=ham 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 B5D0727BBE2 for ; Tue, 16 Jan 2024 10:29:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPggq-0007Cx-PP; Tue, 16 Jan 2024 05:29:04 -0500 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 1rPggp-0007Cj-2Y for guix-patches@gnu.org; Tue, 16 Jan 2024 05:29:03 -0500 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 1rPggo-0003pt-4F for guix-patches@gnu.org; Tue, 16 Jan 2024 05:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPggo-0006yG-Bv for guix-patches@gnu.org; Tue, 16 Jan 2024 05:29:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH 2/2] gnu: ausweisapp: Update to 2.0.2. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jan 2024 10:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68500 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68500@debbugs.gnu.org Cc: Sergey Trofimov Received: via spool by 68500-submit@debbugs.gnu.org id=B68500.170540093326772 (code B ref 68500); Tue, 16 Jan 2024 10:29:02 +0000 Received: (at 68500) by debbugs.gnu.org; 16 Jan 2024 10:28:53 +0000 Received: from localhost ([127.0.0.1]:47840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPggf-0006xj-7V for submit@debbugs.gnu.org; Tue, 16 Jan 2024 05:28:53 -0500 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]:60446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPggd-0006xK-VX for 68500@debbugs.gnu.org; Tue, 16 Jan 2024 05:28:52 -0500 Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-50e67e37661so13302288e87.0 for <68500@debbugs.gnu.org>; Tue, 16 Jan 2024 02:28:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1705400925; x=1706005725; darn=debbugs.gnu.org; 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=dDRkH0P98AXuT+VATPTJqX2uQB1mgnN0vvhXCADS/Zc=; b=EYCrCUsWmst6Qs4Nl1os6C6joXmf/YJ5xz4Z5tEtTdJRbSwcZY0zTqZkryZyaZoKSO nr+6DCD4YX82u5a3mCPTO0YB5wMNQREKdfsM7G9DvzOAotlz4KaTbWYC1YLpHPlXyIHx fEQeVa7ht/H7jSxOZNZZ1aADuiMH7FcKtFNaI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705400925; x=1706005725; 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=dDRkH0P98AXuT+VATPTJqX2uQB1mgnN0vvhXCADS/Zc=; b=qZrrlXdm10b+73f1ouvcSTybV/SW5IuFC8cOGfGo3g89wdcRd65zxckG69r/KjOCbC G2zgf2Juwj1nS/NVViBNMPdlEvhOqojoy++NYocJO5VsbTJST8RrGBJ+JxFuSO2SQ1b8 nBEudyXVEigw0H97jciufbS7BR4AJ9mkaD2Idj8nUxOH35zvH1fcAiFwFRbuB0JtmE8p fy3eCKFujSfWkczaVjE0+hxHd/NIPPa+AJSXKabZXMA6WYqfuxZHmxT3iDuRkiGFt4P1 ssWf2UbHmviNKzNLiM7+gQNFDicq7cWoT3x2+5EACRqva7IClM1wx9ZmI3Z5s6iEVKDB +eCQ== X-Gm-Message-State: AOJu0YwUmRk0Gih400Vys2mo4E4p2/FUWCAAYOqn66EL8wFUrUXC+kAg Iknm0pS/KSr5LmXqZw6f8qyyHkuWr2r986x0TJFAoYn8Qz5cwOHg X-Google-Smtp-Source: AGHT+IGrfZZ2sjqHI5Us2MTnK4E6IyOMKCEc2arCxgeAdiQ8WAEE1fa6uMdC+s6IOvPDnEwCY/krzA== X-Received: by 2002:a05:6512:3990:b0:50e:7f5c:8955 with SMTP id j16-20020a056512399000b0050e7f5c8955mr3694437lfu.95.1705400924849; Tue, 16 Jan 2024 02:28:44 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:a64e:31ff:fe38:fd6c]) by smtp.gmail.com with ESMTPSA id el12-20020a056402360c00b0055894c2864fsm6575234edb.3.2024.01.16.02.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 02:28:44 -0800 (PST) From: Sergey Trofimov Date: Tue, 16 Jan 2024 11:28:22 +0100 Message-ID: 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/security-token.scm (ausweisapp): Update to 2.0.2. (ausweisapp2): Rename to ausweisapp. --- gnu/packages/security-token.scm | 45 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index a1fc058db8..34ae6ea215 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -950,43 +950,42 @@ (define-public nitrocli devices.") (license license:gpl3+))) -(define-public ausweisapp2 +(define-public ausweisapp (package - (name "ausweisapp2") - (version "1.22.2") + (name "ausweisapp") + (version "2.0.2") (source (origin (method url-fetch) - (uri (string-append "https://github.com/Governikus/AusweisApp2/releases" - "/download/" version "/AusweisApp2-" version ".tar.gz")) + (uri (string-append "https://github.com/Governikus/AusweisApp/releases" + "/download/" version "/AusweisApp-" version ".tar.gz")) (sha256 (base32 - "1qh1m057va7njs3yk0s31kwsvv44fjlsdac6lhiw5npcwssgjn8l")))) + "1y0bnp8ry9x7nmf6akx9gfpx91p3x15jh72yrzpfpll6zmppcx3b")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs - (list pkg-config qttools-5)) + (list pkg-config qttools)) (inputs - (list qtbase-5 - qtsvg-5 - qtdeclarative-5 - qtwebsockets-5 + (list qtbase + qtsvg + qtscxml + qtdeclarative + qtshadertools + qtwebsockets qtgraphicaleffects - qtquickcontrols2-5 pcsc-lite openssl)) (arguments - `(#:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) + `(#:qtbase ,qtbase #:phases (modify-phases %standard-phases - (add-after 'install 'wrap-qt - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program "AusweisApp2" #:output out #:inputs inputs))))))) - (home-page "https://github.com/Governikus/AusweisApp2") + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (when tests? (invoke "ctest" "--output-on-failure" "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")))))))) + (home-page "https://github.com/Governikus/AusweisApp") (synopsis "Authentication program for German ID cards and residence permits") (description