From patchwork Sun Mar 10 07:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 61585 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 E75A627BBEA; Sun, 10 Mar 2024 07:29:01 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 150B527BBE2 for ; Sun, 10 Mar 2024 07:29:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjDbo-0004iP-2z; Sun, 10 Mar 2024 03:28:36 -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 1rjDbl-0004hg-TB for guix-patches@gnu.org; Sun, 10 Mar 2024 03:28:33 -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 1rjDbl-0005hZ-Ky for guix-patches@gnu.org; Sun, 10 Mar 2024 03:28:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rjDcE-0001MV-95; Sun, 10 Mar 2024 03:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH v3 1/2] gnu: qtscxml: Update to 6.5.2. References: In-Reply-To: Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 10 Mar 2024 07: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 moreinfo To: 68500@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Sergey Trofimov , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 68500-submit@debbugs.gnu.org id=B68500.17100557065179 (code B ref 68500); Sun, 10 Mar 2024 07:29:02 +0000 Received: (at 68500) by debbugs.gnu.org; 10 Mar 2024 07:28:26 +0000 Received: from localhost ([127.0.0.1]:35330 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjDbd-0001LT-Gu for submit@debbugs.gnu.org; Sun, 10 Mar 2024 03:28:26 -0400 Received: from mail-wr1-f52.google.com ([209.85.221.52]:56810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjDbY-0001LC-S8 for 68500@debbugs.gnu.org; Sun, 10 Mar 2024 03:28:24 -0400 Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-33e709ea80fso1694221f8f.1 for <68500@debbugs.gnu.org>; Sat, 09 Mar 2024 23:27:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1710055602; x=1710660402; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vwrElU52qCxyC5spwFzYDyw59xaGILb6RF4WhNMDwnI=; b=e5z0xpKzqdRfGNpmjH2QJqUvoScL4Am/EyYnz6So9jdxzjp/31ixws7xLa90KD5gSh 5ovuLBctr2oZe1VzxrzPAKmrsiiizRrlmIdCCwaMKWXYoK1o1s6QG4M3Z2doDzV729e0 Si661BTOd8vulIJeVFu/5fISONu0mxG9i8RXQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710055602; x=1710660402; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vwrElU52qCxyC5spwFzYDyw59xaGILb6RF4WhNMDwnI=; b=p+244Iwj4dkBtyS7qjzHsMOU+6qxvKkBnaHYeV1YsS7qg5GFNXDZIXhaIGhQgZhjV5 jA5sVuohxcMiZjKlfxFAXNz6C/JrH3btbts2ie0tb1YLJQgoFPq4qQJLvc2VMCVPzGoo KhzXPMWHWqywDU4cPCE2vgZGaNjAsNnc8Ftv8iqRxPdJpF+CFX+VY4hYq3yJ4YIzVDE3 e48aLtbQmmmG0Bs+OqIT7W0tJU2aNXuUiUaBmJ+75kX100l6Gnzt480IXP5JW3kI1MNw Wwahxmwxwd22itbKx+s1zfUQAzFnVhsg9V6VMwfZQ+nZjTPBfNE2pOlF/BLEAr6/IEMR omTQ== X-Gm-Message-State: AOJu0YxIHP0WjHG1NWexzHGqjLTXFe5hnEfh9ULSzOS2VUNExvB0Kny1 nYpM8rMMDeHMBFUT1MlKjv6wNqGjeGYlWg3Kcn34OMIz+Py106PhEDODGKewdPbNXs9mLdoYdXm p X-Google-Smtp-Source: AGHT+IF8DVtytUDMK4sQTyVJGzZJoQ2wW7sa86nqB3mX5gcATrm/FMm+Zlj9zoACe4s40VoXudUwKQ== X-Received: by 2002:a5d:4144:0:b0:33e:8a1f:ff19 with SMTP id c4-20020a5d4144000000b0033e8a1fff19mr1322598wrq.2.1710055601494; Sat, 09 Mar 2024 23:26:41 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:3f1e:a87:ccd2:4aec]) by smtp.gmail.com with ESMTPSA id q25-20020adfab19000000b0033e45930f35sm3495712wrc.6.2024.03.09.23.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Mar 2024 23:26:41 -0800 (PST) From: Sergey Trofimov Date: Sun, 10 Mar 2024 08:26:16 +0100 Message-ID: <1d2ee6c41a236ebd33dc353afafac21778a10efb.1710055531.git.sarg@sarg.org.ru> X-Mailer: git-send-email 2.41.0 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 | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) base-commit: 7758e63f7a89f53fbb7c7a265ae472af0a8dfab0 prerequisite-patch-id: 4b5032a22b70bff803b7bbd0693b00984f53a25e prerequisite-patch-id: 68eb78a4650b2e0880ad3735fbd1f0296adc7de7 prerequisite-patch-id: bb61e272c86d80072ad9dc79c17ecde91127999b prerequisite-patch-id: 7f3cf0da78d3a019888053ba63cd03c3abd6bf2e prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3 prerequisite-patch-id: aba438a3c32ef44149bbc749c1e0b89d00006b3e prerequisite-patch-id: 51199b8d0dc0c9fd45bca2f8743d83565255ea80 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9df49d7fb3..5866d33394 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2360,7 +2360,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") @@ -2388,6 +2388,45 @@ (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 + #:phases + #~(modify-phases %standard-phases + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'check-setup + (lambda _ + (setenv "ARGS" "-E tst_scion") + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "QML2_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML2_IMPORT_PATH")))))))) + (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") @@ -4497,7 +4536,7 @@ (define-public python-pyside-2 qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5 From patchwork Sun Mar 10 07:26:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 61584 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 8096B27BBEA; Sun, 10 Mar 2024 07:28:54 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 0375527BBE2 for ; Sun, 10 Mar 2024 07:28:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjDbn-0004hx-9k; Sun, 10 Mar 2024 03:28:35 -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 1rjDbk-0004hX-03 for guix-patches@gnu.org; Sun, 10 Mar 2024 03:28:32 -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 1rjDbj-0005hM-Nb for guix-patches@gnu.org; Sun, 10 Mar 2024 03:28:31 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rjDcE-0001Mb-Ol; Sun, 10 Mar 2024 03:29:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH v3 2/2] gnu: ausweisapp: Update to 2.1.0. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: sarg@sarg.org.ru, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 10 Mar 2024 07: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 moreinfo To: 68500@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov , Maxim Cournoyer X-Debbugs-Original-Xcc: Sergey Trofimov , Maxim Cournoyer Received: via spool by 68500-submit@debbugs.gnu.org id=B68500.17100557095195 (code B ref 68500); Sun, 10 Mar 2024 07:29:02 +0000 Received: (at 68500) by debbugs.gnu.org; 10 Mar 2024 07:28:29 +0000 Received: from localhost ([127.0.0.1]:35332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjDbh-0001Li-2e for submit@debbugs.gnu.org; Sun, 10 Mar 2024 03:28:29 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:58461) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjDbb-0001LG-Ps for 68500@debbugs.gnu.org; Sun, 10 Mar 2024 03:28:27 -0400 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4132869c4b7so489275e9.0 for <68500@debbugs.gnu.org>; Sat, 09 Mar 2024 23:27:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1710055604; x=1710660404; 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=8qzE03pQ1cWNEyzwD5QE7K1C23ghstCuP8eC8XJXUdo=; b=l7ZtviLBRnkxV8Hyu3Umg2A2AsDBbwXK72kZB6wEIKUPVkoTtNl6E3lil/+K4HROpx HHzI0H/XV/KBWwiUI26k9oLL9J2EgduJt7xPUYuznymsO0/zBegK15vo0P9r7MpDIpZP Us7n93tXZIGCUNytjbxW7C7yI673KbjNESG0M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710055604; x=1710660404; 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=8qzE03pQ1cWNEyzwD5QE7K1C23ghstCuP8eC8XJXUdo=; b=clo84Idp8NL00X3pyEMOKBTQviQegBsBGItX0jmQvBIMts69uC5q4KVKn3gXZLpNmd AL6HeU/cwvJVEnmPGAcM/UWXQ7UfsktAfPFIuqNb14e445ruWPKS4BbwtSQx2tXwqfPT /D0D/sYvtsuMYJ1X1Mcl9co7p4w9mDG7SpgQR6DdydxFpxC9H/1vDTslLO6U2hDHi3wE Ib7Cl/9cdb6obSMr4mmgnC690qLKVapHfu1tMaNcLpseaJo3ZoaLKg32QcKPu3tuB2R/ 4UhAqqa/AJl+bFYRubFRPNoSf9GrW5oBuMvRvKj8BQIIFzWwyFArEdry67Br6OOgk0jD 1mjQ== X-Gm-Message-State: AOJu0Yxw7WSJikktSyeQj/0bREzCmaY/OJKjrwHLVXHz1eKRLXJlBZjZ Hi2HZgcfMS+tdwd+krLiNncJBX740KkzuYnnMQY8WZq+c8eP9Xz6tpyruxNfToWsrxQF/X4QNjd / X-Google-Smtp-Source: AGHT+IFhpIFe8mGwny3plesPixgBm/c4P6jzF421FywisDfe4mG1vrnWClUZYhgs6KPwwxZkJyboCw== X-Received: by 2002:a05:600c:34c2:b0:413:271a:d1c7 with SMTP id d2-20020a05600c34c200b00413271ad1c7mr630661wmq.21.1710055604404; Sat, 09 Mar 2024 23:26:44 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:3f1e:a87:ccd2:4aec]) by smtp.gmail.com with ESMTPSA id j27-20020a05600c1c1b00b00412f83e0c11sm11422555wms.22.2024.03.09.23.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Mar 2024 23:26:44 -0800 (PST) From: Sergey Trofimov Date: Sun, 10 Mar 2024 08:26:17 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <1d2ee6c41a236ebd33dc353afafac21778a10efb.1710055531.git.sarg@sarg.org.ru> References: <1d2ee6c41a236ebd33dc353afafac21778a10efb.1710055531.git.sarg@sarg.org.ru> 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 (ausweisapp2): Deprecate and rename to... (ausweisapp): ... this. Update to 2.1.0. [build-system]: Switch to qt-build-system. [inputs]: Update dependencies to Qt6. [native-inputs]: Replace qttools-5 with qttools. --- gnu/packages/security-token.scm | 49 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index a1fc058db8..8fe9039f20 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -41,6 +41,7 @@ (define-module (gnu packages security-token) #:use-module (gnu packages) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix utils) @@ -950,43 +951,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.1.0") (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")))) + "1jzxfybjrc3byw42bqjvn1nsn7vbgcl8y94sywjy6vaj3a58hy36")))) - (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 @@ -996,6 +996,9 @@ (define-public ausweisapp2 phone is required.") (license license:eupl1.2))) +(define-deprecated/public ausweisapp2 ausweisapp + (deprecated-package "ausweisapp2" ausweisapp)) + (define-public libfido2 (package (name "libfido2")