From patchwork Mon Mar 4 18:03:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 61333 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 E135F27BBE9; Mon, 4 Mar 2024 18:06:13 +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=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 CE6C427BBE2 for ; Mon, 4 Mar 2024 18:06:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhCh2-0002MN-D7; Mon, 04 Mar 2024 13:05:40 -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 1rhCgz-0002Lm-2u for guix-patches@gnu.org; Mon, 04 Mar 2024 13:05:38 -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 1rhCgy-00076A-RF for guix-patches@gnu.org; Mon, 04 Mar 2024 13:05:36 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhChN-0005XO-LM; Mon, 04 Mar 2024 13:06:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH v2 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, andreas@enge.fr, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2024 18:06: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 moreinfo To: 68500@debbugs.gnu.org Cc: Sergey Trofimov , Sergey Trofimov , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Sergey Trofimov , Maxim Cournoyer , Andreas Enge , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 68500-submit@debbugs.gnu.org id=B68500.170957552021225 (code B ref 68500); Mon, 04 Mar 2024 18:06:01 +0000 Received: (at 68500) by debbugs.gnu.org; 4 Mar 2024 18:05:20 +0000 Received: from localhost ([127.0.0.1]:44843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhCgi-0005WG-0Q for submit@debbugs.gnu.org; Mon, 04 Mar 2024 13:05:20 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:57512) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhCgf-0005W1-8d for 68500@debbugs.gnu.org; Mon, 04 Mar 2024 13:05:19 -0500 Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-412e4426e32so8350485e9.2 for <68500@debbugs.gnu.org>; Mon, 04 Mar 2024 10:04:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1709575421; x=1710180221; 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=Ox+6b3dgqCqIQucGosOEVuA+j/SBcSSG+a8KI2zjUWE=; b=hcCBSW4TutAxDutqBbOfvIlRV9RyKNMYrVmsBxAaI5KS/rnWM1vCRSjNuQAE6M1HaV 7Q96HHvUxPpLEolz40poKpkqYoJyAK+5P3VlBzhVhtxE7zEOqV2V5X0eygq1/Qoqxul5 e/1FqTylHMEzem+bVirtX+0ScT53xdR2Pah+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709575421; x=1710180221; 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=Ox+6b3dgqCqIQucGosOEVuA+j/SBcSSG+a8KI2zjUWE=; b=TRr+SYBySexzY3j7T99p8DerumP8nIPI0KjGCXnV5Vj9iMviDlTBiaLLk4p3xvh7LG uT6sBdqMwddSmm67gI+XfnmE/jKcTq5ju+Y/uip8FQTfOYjthWH9UMNt4E9eXZ6aBMET IPQsMuJ+ABGHpYnwDOJKYCLc+v7QcDp5EYWtS9znCr0gCB7k/QnjaWKXe2cd5p3/cFJd uuAtHzbLSmbd0egM+sg+Fe2MnIfVulpzDVYjlFKZ/0+d4MlX6UXKaS7GAIhe5GTqeHwP 1tF33Zs0BTcJ3RuFjHdz/NrhriDFZaawQ9phiiwLFCiEpw5tzYAMcIAPtuCV5fyO9YmW wtnw== X-Gm-Message-State: AOJu0YxOTpHPT0OVfxJmyIbIyxDxSTYWYwgsuduMjGhsM+lbS7kVwRdf fzeZURDyTrm9xJKFdc95/YwPusdmLs8FsK39WneSL8UFPVQXNT5UyX2rdqRkv34xd6bNU6DJl4w N X-Google-Smtp-Source: AGHT+IEXekBiUlPBC1zfYE41pkXDJ72r9WooPHYFM6ViLJhz6w5d8wKLyCMwX1VYII0ZFQR5buzvBw== X-Received: by 2002:a5d:6b82:0:b0:33d:3695:5880 with SMTP id n2-20020a5d6b82000000b0033d36955880mr5942106wrx.48.1709575421395; Mon, 04 Mar 2024 10:03:41 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:3f1e:a87:ccd2:4aec]) by smtp.gmail.com with ESMTPSA id cr11-20020a05600004eb00b0033dd2c3131fsm12652642wrb.65.2024.03.04.10.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 10:03:40 -0800 (PST) From: Sergey Trofimov Date: Mon, 4 Mar 2024 19:03:30 +0100 Message-ID: <5bfa707ec1a839e9329c1320a0f152eee8abff30.1709575388.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. Reviewed-by: Maxim Cournoyer --- gnu/packages/qt.scm | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) base-commit: 3da49b1472919a62df1fe399638f23a246aa325d 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 761d12e31f..8a521be3c0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2349,7 +2349,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") @@ -2377,6 +2377,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") @@ -4486,7 +4525,7 @@ (define-public python-pyside-2 qtquickcontrols-5 qtquickcontrols2-5 qtscript - qtscxml + qtscxml-5 qtsensors qtspeech qtsvg-5 From patchwork Mon Mar 4 18:03:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 61334 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 E1AA027BBEA; Mon, 4 Mar 2024 18:06:44 +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 16F5227BBE2 for ; Mon, 4 Mar 2024 18:06:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhChv-00035s-HQ; Mon, 04 Mar 2024 13:06:35 -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 1rhCht-00035e-DB for guix-patches@gnu.org; Mon, 04 Mar 2024 13:06:33 -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 1rhCht-0007AU-4s for guix-patches@gnu.org; Mon, 04 Mar 2024 13:06:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhCiM-0005ZL-4q; Mon, 04 Mar 2024 13:07:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68500] [PATCH v2 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: Mon, 04 Mar 2024 18:07: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.170957559321361 (code B ref 68500); Mon, 04 Mar 2024 18:07:02 +0000 Received: (at 68500) by debbugs.gnu.org; 4 Mar 2024 18:06:33 +0000 Received: from localhost ([127.0.0.1]:44852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhChs-0005YS-K2 for submit@debbugs.gnu.org; Mon, 04 Mar 2024 13:06:32 -0500 Received: from mail-wr1-f41.google.com ([209.85.221.41]:58639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhChq-0005YE-D6 for 68500@debbugs.gnu.org; Mon, 04 Mar 2024 13:06:31 -0500 Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-33d36736d4eso2977709f8f.1 for <68500@debbugs.gnu.org>; Mon, 04 Mar 2024 10:06:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1709575494; x=1710180294; 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=zos8mMB1SJmr6eCkIlXKnrJA/QTfBoNn8UduDTKdl/A=; b=ISQ+f9UG39pPIcYAWh9cl+sOVQ/VvflrioxOPoF8jqiArW0MJmwYxEpg9NftpNshVA pivzEi1nSJkq7XS5MwI7meu35Ij5aRuI7ZOwQisj/qBZcrP2hXF4uakszwy9E7XUZlpj P3NR6UKMTl2GRbgjrw+MpXe6DintT80lsgGUM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709575494; x=1710180294; 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=zos8mMB1SJmr6eCkIlXKnrJA/QTfBoNn8UduDTKdl/A=; b=DODlfjc2CRFpnhCpbsQvALjvDp2Wf02rXxX9edzjAanOT78lby0poipjAfAKppEYSe vx2/RJNmy6/5vo/4gGqejPRRZoKsJztpOLldi2e9gktdNHvCVgYH6Q1kMVSRl/Z9l+Df c8TCPKZrfVblTN+l/jUaBcGwSpC8fXerT0022+HX8D0fo3+ClfAmudyQly0Tl47ctcX5 /G7+wmb5vFsT+whhUMCnuk0Pa5xooGCtxxoRHUHBtBM8L5u6VZGL4CsyIHs7653LGxki 1xgtMKurWuwKWCqSy6Xf7UYgDV4VXxHMlw0limHewBKPOGUwdrZ6mJbphbNLug3larm4 NjlA== X-Gm-Message-State: AOJu0Yw5NLNDU0GTxI6VK/KekTeJ6XUVpoCt6Cw9jNp+eaVLmux5dvjs 1VdA6vidED2Ld/nW6Y93kJrxNC5XYXn3NFVRHevlM+dygQVJkJT/GhZ+xG6WER4rKbT6nHfAz8e E X-Google-Smtp-Source: AGHT+IETF9nkiARtR8crzzYVW2UB7q1b8n1ka02yBl91TFt8e2BPRdQ9D/WIvSP5k3UTUEFOcyxbbQ== X-Received: by 2002:a05:6000:1e97:b0:33e:172f:5709 with SMTP id dd23-20020a0560001e9700b0033e172f5709mr8186736wrb.8.1709575494280; Mon, 04 Mar 2024 10:04:54 -0800 (PST) Received: from localhost ([2a02:2454:a09d:d000:3f1e:a87:ccd2:4aec]) by smtp.gmail.com with ESMTPSA id bx5-20020a5d5b05000000b0033e103eaf5bsm12747063wrb.115.2024.03.04.10.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 10:04:46 -0800 (PST) From: Sergey Trofimov Date: Mon, 4 Mar 2024 19:03:31 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5bfa707ec1a839e9329c1320a0f152eee8abff30.1709575388.git.sarg@sarg.org.ru> References: <5bfa707ec1a839e9329c1320a0f152eee8abff30.1709575388.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 (ausweisapp): Update to 2.1.0. (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..3e46e318c3 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.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