unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Sergey Trofimov <sarg@sarg.org.ru>
To: 68500@debbugs.gnu.org
Cc: Sergey Trofimov <sarg@sarg.org.ru>,
	Sergey Trofimov <sarg@sarg.org.ru>,
	Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#68500] [PATCH v3 2/2] gnu: ausweisapp: Update to 2.1.0.
Date: Sun, 10 Mar 2024 08:26:17 +0100	[thread overview]
Message-ID: <aa97abf359747f1e370dc838465f42e4c763cc98.1710055531.git.sarg@sarg.org.ru> (raw)
In-Reply-To: <1d2ee6c41a236ebd33dc353afafac21778a10efb.1710055531.git.sarg@sarg.org.ru>

* 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")
-- 
2.41.0





  reply	other threads:[~2024-03-10  7:28 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-16 10:24 [bug#68500] [PATCH 0/2] gnu: ausweisapp: Update to 2.0.2 Sergey Trofimov
2024-01-16 10:28 ` [bug#68500] [PATCH 1/2] gnu: qtscxml: Update to 6.5.2 Sergey Trofimov
2024-01-17 14:02   ` Maxim Cournoyer
2024-01-16 10:28 ` [bug#68500] [PATCH 2/2] gnu: ausweisapp: Update to 2.0.2 Sergey Trofimov
2024-01-17 20:36 ` [bug#68500] [PATCH v1 0/2] " Sergey Trofimov
2024-01-17 20:36   ` [bug#68500] [PATCH v1 1/2] gnu: qtscxml: Update to 6.5.2 Sergey Trofimov
2024-01-17 20:36   ` [bug#68500] [PATCH v1 2/2] gnu: ausweisapp: Update to 2.0.2 Sergey Trofimov
2024-03-04 18:03 ` [bug#68500] [PATCH v2 1/2] gnu: qtscxml: Update to 6.5.2 Sergey Trofimov
2024-03-04 18:03   ` [bug#68500] [PATCH v2 2/2] gnu: ausweisapp: Update to 2.1.0 Sergey Trofimov
2024-03-10  1:28     ` Maxim Cournoyer
2024-03-10  1:21   ` [bug#68500] [PATCH v2 1/2] gnu: qtscxml: Update to 6.5.2 Maxim Cournoyer
2024-03-10  7:26 ` [bug#68500] [PATCH v3 " Sergey Trofimov
2024-03-10  7:26   ` Sergey Trofimov [this message]
2024-03-19  7:45     ` bug#68500: [PATCH v3 2/2] gnu: ausweisapp: Update to 2.1.0 Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=aa97abf359747f1e370dc838465f42e4c763cc98.1710055531.git.sarg@sarg.org.ru \
    --to=sarg@sarg.org.ru \
    --cc=68500@debbugs.gnu.org \
    --cc=maxim.cournoyer@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).