Subject: [PATCH] gnu: remmina: Update to 1.4.29.

From: TakeV <[email-masked]>
Date: Tue, 21 Mar 2023 18:12:25 -0700

Hello there,

I ran into a weird bug with remmina, where it was getting different 
libsoup symbols and being unable to start. Found the exact issue here: 
https://gitlab.com/Remmina/Remmina/-/issues/2756

Upgrading remmina (via guix refresh) as they suggested worked like a 
charm, though it did require adding a minimal python input, since there 
is a new plugin that remmina includes. I also ran it through guix style.

Sending in a patch so anyone else affected can get the fix! :)

- TakeV
From d2f235c5ce67f876324837c3bf035ed5735e1028 Mon Sep 17 00:00:00 2001
Message-Id: <[email-masked]>
From: TakeV <[email-masked]>
Date: Tue, 21 Mar 2023 16:11:45 -0700
Subject: [PATCH] gnu: remmina: Update to 1.4.29.

* gnu/packages/vnc.scm (remmina): Update to 1.4.29.
---
 gnu/packages/vnc.scm | 168 +++++++++++++++++++++----------------------
 1 file changed, 84 insertions(+), 84 deletions(-)

diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index fc272ae621..8008be5081 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2021, 2022 Tobias Geerinckx-Rice <[email-masked]>
 ;;; Copyright © 2022 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2022 Mehmet Tekman <[email-masked]>
+;;; Copyright © 2023 TakeV <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -72,94 +73,93 @@ (define-module (gnu packages vnc)
 (define-public remmina
   (package
     (name "remmina")
-    (version "1.4.23")
-    (source
-     (origin
-       (method git-fetch)
-       (uri
-        (git-reference
-         (url "https://gitlab.com/Remmina/Remmina")
-         (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1j0fiz76z4y08w136vs8igqxxg42hx61r5hf6sylcr0c424sc9rk"))))
+    (version "1.4.29")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.com/Remmina/Remmina")
+                    (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "098f33v5qq6p7zjynj1pdllpmbxvqhfvwgvl9fjqyqfflsp7s7gh"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:tests? #f                      ; No target
-       #:configure-flags
-       (list
-        ;; Disable online version checking.
-        "-DWITH_NEWS=OFF")
-       #:imported-modules
-       ((guix build glib-or-gtk-build-system)
-        ,@%cmake-build-system-modules)
-       #:modules
-       (((guix build glib-or-gtk-build-system)
-         #:prefix glib-or-gtk:)
-        (guix build cmake-build-system)
-        (guix build utils))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'glib-or-gtk-compile-schemas
-           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
-         (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
-           (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
-         (add-after 'glib-or-gtk-wrap 'wrap-typelibs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let ((out (assoc-ref outputs "out")))
-               (for-each
-                (lambda (name)
-                  (let ((file (string-append out "/bin/" name))
-                        (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
-                    (wrap-program file
-                      `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
-                '("remmina" "remmina-file-wrapper"))))))))
-    (native-inputs
-     (list gettext-minimal
-           `(,glib "bin")
-           gobject-introspection
-           `(,gtk+ "bin")
-           intltool
-           pkg-config))
-    (inputs
-     (list libappindicator
-           atk
-           avahi
-           cairo
-           cups
-           ffmpeg
-           freerdp                      ; for rdp plugin
-           libgcrypt
-           librsvg
-           glib
-           gnome-keyring
-           gsettings-desktop-schemas
-           gtk+
-           harfbuzz
-           json-glib
-           libsecret                    ; for secret plugin
-           libsoup-minimal-2
-           libssh                       ; for ssh plugin
-           libvnc                       ; for vnc plugin
-           openssl
-           pango
-           pcre2                        ; for exec plugin
-           shared-mime-info
-           libsodium
-           spice-gtk                    ; for spice plugin
-           telepathy-glib
-           vte                          ; for st plugin
-           wayland
-           webkitgtk                    ; for www plugin
-           libx11
-           libxext                      ; for xdmcp plugin
-           xdg-utils
-           libxkbfile))                 ; for nx plugin
-    (propagated-inputs
-     (list dconf))
+     `(#:tests? #f ;No target
+       #:configure-flags (list
+                          ;; Disable online version checking.
+                          "-DWITH_NEWS=OFF")
+       #:imported-modules ((guix build glib-or-gtk-build-system)
+                           ,@%cmake-build-system-modules)
+       #:modules (((guix build glib-or-gtk-build-system)
+                   #:prefix glib-or-gtk:)
+                  (guix build cmake-build-system)
+                  (guix build utils))
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'glib-or-gtk-compile-schemas
+                    (assoc-ref glib-or-gtk:%standard-phases
+                               'glib-or-gtk-compile-schemas))
+                  (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
+                    (assoc-ref glib-or-gtk:%standard-phases
+                               'glib-or-gtk-wrap))
+                  (add-after 'glib-or-gtk-wrap 'wrap-typelibs
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      (let ((out (assoc-ref outputs "out")))
+                        (for-each (lambda (name)
+                                    (let ((file (string-append out "/bin/"
+                                                               name))
+                                          (gi-typelib-path (getenv
+                                                            "GI_TYPELIB_PATH")))
+                                      (wrap-program file
+                                                    `("GI_TYPELIB_PATH" ":"
+                                                      prefix
+                                                      (,gi-typelib-path)))))
+                                  '("remmina" "remmina-file-wrapper"))))))))
+    (native-inputs (list gettext-minimal
+                         `(,glib "bin")
+                         gobject-introspection
+                         `(,gtk+ "bin")
+                         intltool
+                         pkg-config))
+    (inputs (list libappindicator
+                  atk
+                  avahi
+                  cairo
+                  cups
+                  ffmpeg
+                  freerdp ;for rdp plugin
+                  libgcrypt
+                  librsvg
+                  glib
+                  gnome-keyring
+                  gsettings-desktop-schemas
+                  gtk+
+                  harfbuzz
+                  json-glib
+                  libsecret ;for secret plugin
+                  libsoup-minimal-2
+                  libssh ;for ssh plugin
+                  libvnc ;for vnc plugin
+                  openssl
+                  pango
+                  pcre2 ;for exec plugin
+                  python-minimal-wrapper ;for python wrapper plugin
+                  shared-mime-info
+                  libsodium
+                  spice-gtk ;for spice plugin
+                  telepathy-glib
+                  vte ;for st plugin
+                  wayland
+                  webkitgtk ;for www plugin
+                  libx11
+                  libxext ;for xdmcp plugin
+                  xdg-utils
+                  libxkbfile)) ;for nx plugin
+    (propagated-inputs (list dconf))
     (home-page "https://remmina.org/")
     (synopsis "Remote Desktop Client")
-    (description "Remmina is a client to use other desktops remotely.
+    (description
+     "Remmina is a client to use other desktops remotely.
 RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
     (license license:gpl2+)))
 
-- 
2.39.2