Package: guix-patches;
Reported by: Vivien Kraus <vivien <at> planete-kraus.eu>
Date: Mon, 20 Nov 2023 19:33:02 UTC
Severity: normal
Tags: patch
Done: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 67309 in the body.
You can then email your comments to 67309 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 20 Nov 2023 19:33:02 GMT) Full text and rfc822 format available.Vivien Kraus <vivien <at> planete-kraus.eu>:guix-patches <at> gnu.org.
(Mon, 20 Nov 2023 19:33:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: guix-patches <at> gnu.org Cc: rg <at> raghavgururajan.name, liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team 0/2] Add gnome-connections Date: Mon, 20 Nov 2023 20:28:25 +0100
Dear guix, GNOME now has a RDP/VNC viewer, named “Connections”. Here it is. The set-up page looks like an advertisement for non-free operating systems to me. I tried to make it a bit more neutral. I made a similar UI change for the connection menu. I’m not sure it is needed. What do you think? Best regards, Vivien Vivien Kraus (2): gnu: Add gtk-frdp. gnu: Add gnome-connections. gnu/packages/gnome.scm | 88 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) base-commit: 1cc3b7e80f60a2a5a6a1400ed0b025efeae7a523 -- 2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 20 Nov 2023 19:36:01 GMT) Full text and rfc822 format available.Message #8 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: 67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team 2/2] gnu: Add gnome-connections. Date: Mon, 20 Nov 2023 20:25:45 +0100
* gnu/packages/gnome.scm (gnome-connections): New variable.
Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a
---
gnu/packages/gnome.scm | 58 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6ace6d2f90..90090b11bc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13621,3 +13621,61 @@ (define-public gtk-frdp
This library provides a widget to view @acronym{RDP,Remote Desktop Protocol}
sessions.")
(license license:gpl3+)))
+
+(define-public gnome-connections
+ (package
+ (name "gnome-connections")
+ (version "44.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (delete-file-recursively "subprojects")))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-meson
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")
+ (("update_desktop_database: true")
+ "update_desktop_database: false"))))
+ (add-after 'unpack 'disable-nonfree-advertisement
+ (lambda _
+ (substitute* "src/ui/assistant.ui"
+ (("\\(standard for connecting to Windows\\)")
+ "")
+ (("\\(standard for connecting to Linux\\)")
+ "(standard for connecting to GNU/Linux)"))
+ (substitute* "src/ui/onboarding-dialog.ui"
+ (("Access Linux, Mac, and Windows")
+ "Access many different")
+ (("multiplatform.svg")
+ "welcome.svg")))))))
+ (inputs
+ (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin")
+ itstool
+ pkg-config
+ vala))
+ (home-page "https://apps.gnome.org/Connections")
+ (synopsis "View and use other desktops")
+ (description "\
+Connections allows the user to connect to different machines or virtual
+machines. It can be used to provide support to users who might need help. It
+can use @acronym{VNC,Virtual Network Computing} and @acronym{RDP,Remote
+Desktop Protocol}.")
+ (license license:gpl3+)))
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 20 Nov 2023 19:36:02 GMT) Full text and rfc822 format available.Message #11 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: 67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, liliana.prikler <at> gmail.com, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team 1/2] gnu: Add gtk-frdp. Date: Mon, 20 Nov 2023 20:25:28 +0100
* gnu/packages/gnome.scm (gtk-frdp): New variable.
Change-Id: I8ce190ca80245eff48af08e005e90e396e498e91
---
gnu/packages/gnome.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ab485cffb1..6ace6d2f90 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13591,3 +13591,33 @@ (define-public calls
backends, such as ModemManager for phones and @acronym{SIP, Session Initiation
Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.")
(license license:gpl3+)))
+
+(define-public gtk-frdp
+ (package
+ (name "gtk-frdp")
+ ;; The latest published tag is 3.37.1, but it is very old:
+ ;; https://gitlab.gnome.org/GNOME/gtk-frdp/-/issues/39
+ (version "3.37.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.gnome.org/GNOME/gtk-frdp")
+ (commit "62fc62c5ccb7634f0bc87c57a4673877c24c94ed")))
+ (file-name (git-file-name "gtk-frdp" version))
+ (sha256
+ (base32
+ "0msw7qpsyf9hkyq9ddhvl4g4vk1fnyi7g0bddca9x6p9d0arprqz"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:glib-or-gtk? #t))
+ (inputs
+ (list freerdp fuse gtk+))
+ (native-inputs
+ (list `(,glib "bin") gobject-introspection pkg-config vala))
+ (home-page "https://gitlab.gnome.org/GNOME/gtk-frdp")
+ (synopsis "RDP viewer widget for Gtk")
+ (description "\
+This library provides a widget to view @acronym{RDP,Remote Desktop Protocol}
+sessions.")
+ (license license:gpl3+)))
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 20 Nov 2023 19:56:02 GMT) Full text and rfc822 format available.Message #14 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu>, 67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: Re: [PATCH gnome-team 2/2] gnu: Add gnome-connections. Date: Mon, 20 Nov 2023 20:55:05 +0100
Am Montag, dem 20.11.2023 um 20:25 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (gnome-connections): New variable.
>
> Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a
> ---
> gnu/packages/gnome.scm | 58
> ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 58 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 6ace6d2f90..90090b11bc 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -13621,3 +13621,61 @@ (define-public gtk-frdp
> This library provides a widget to view @acronym{RDP,Remote Desktop
> Protocol}
> sessions.")
> (license license:gpl3+)))
> +
> +(define-public gnome-connections
> + (package
> + (name "gnome-connections")
> + (version "44.1")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "mirror://gnome/sources/" name "/"
> + (version-major version) "/"
> + name "-" version ".tar.xz"))
> + (sha256
> + (base32
> +
> "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
> + (snippet
> + #~(begin
> + (use-modules (guix build utils))
> + (delete-file-recursively "subprojects")))))
> + (build-system meson-build-system)
> + (arguments
> + (list
> + #:glib-or-gtk? #t
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'patch-meson
> + (lambda _
> + (substitute* "meson.build"
> + (("gtk_update_icon_cache: true")
> + "gtk_update_icon_cache: false")
> + (("update_desktop_database: true")
> + "update_desktop_database: false"))))
> + (add-after 'unpack 'disable-nonfree-advertisement
> + (lambda _
> + (substitute* "src/ui/assistant.ui"
> + (("\\(standard for connecting to Windows\\)")
> + "")
I'm not sure whether deleting this makes sense. We have a similar
information/warning in the disk formatter regarding NTFS :)
> + (("\\(standard for connecting to Linux\\)")
> + "(standard for connecting to GNU/Linux)"))
> + (substitute* "src/ui/onboarding-dialog.ui"
> + (("Access Linux, Mac, and Windows")
> + "Access many different")
Use a regexp here.
> + (("multiplatform.svg")
> + "welcome.svg")))))))
What's the visual diff between the two?
> + (inputs
> + (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2))
> + (native-inputs
> + (list gettext-minimal
> + `(,glib "bin")
> + itstool
> + pkg-config
> + vala))
> + (home-page "https://apps.gnome.org/Connections")
> + (synopsis "View and use other desktops")
> + (description "\
> +Connections allows the user to connect to different machines or
> virtual
If possible, don't use these "smart" non-line-breaks. Just write your
description as is.
> +machines.
"Machines or virtual machines" reads a little weird imho.
> It can be used to provide support to users who might need help.
This sentence is a bit gratutious imho. Deleting it also allows you to
merge the previous and the next with an appropriate connector.
> It
> +can use @acronym{VNC,Virtual Network Computing} and
> @acronym{RDP,Remote
> +Desktop Protocol}.")
> + (license license:gpl3+)))
Cheers
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Tue, 21 Nov 2023 20:34:03 GMT) Full text and rfc822 format available.Message #17 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team v2 2/2] gnu: Add gnome-connections. Date: Mon, 20 Nov 2023 20:25:45 +0100
* gnu/packages/gnome.scm (gnome-connections): New variable.
Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a
---
I kept the support-related sentence in the description because I think it is
important to put this application in the search results for “support” and
“help”. But feel free to kill the last sentence if you don’t think so.
gnu/packages/gnome.scm | 58 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6ace6d2f90..441eab6f4d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13621,3 +13621,61 @@ (define-public gtk-frdp
This library provides a widget to view @acronym{RDP,Remote Desktop Protocol}
sessions.")
(license license:gpl3+)))
+
+(define-public gnome-connections
+ (package
+ (name "gnome-connections")
+ (version "44.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (delete-file-recursively "subprojects")))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-meson
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")
+ (("update_desktop_database: true")
+ "update_desktop_database: false"))))
+ (add-after 'unpack 'disable-nonfree-advertisement
+ (lambda _
+ (substitute* "src/ui/assistant.ui"
+ (("\\(standard for connecting to Linux\\)")
+ "(standard for connecting to GNU/Linux)"))
+ (substitute* "src/ui/onboarding-dialog.ui"
+ (("Access [a-zA-Z ,]* desktops")
+ "Access desktops with different operating systems")
+ ;; Replace the logos of non-free operating systems with the
+ ;; default image: the project metaphor for connecting to a
+ ;; remote desktop.
+ (("multiplatform.svg")
+ "welcome.svg")))))))
+ (inputs
+ (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin")
+ itstool
+ pkg-config
+ vala))
+ (home-page "https://apps.gnome.org/Connections")
+ (synopsis "View and use other desktops")
+ (description "Connections allows the user to connect to different
+real or virtual machines, using @acronym{VNC,Virtual Network Computing}
+or @acronym{RDP,Remote Desktop Protocol}. It can be used to provide support
+for other users who need help.")
+ (license license:gpl3+)))
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Tue, 21 Nov 2023 20:34:03 GMT) Full text and rfc822 format available.Message #20 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team v2 1/2] gnu: Add gtk-frdp. Date: Mon, 20 Nov 2023 20:25:28 +0100
* gnu/packages/gnome.scm (gtk-frdp): New variable.
Change-Id: I8ce190ca80245eff48af08e005e90e396e498e91
---
gnu/packages/gnome.scm | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ab485cffb1..6ace6d2f90 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13591,3 +13591,33 @@ (define-public calls
backends, such as ModemManager for phones and @acronym{SIP, Session Initiation
Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.")
(license license:gpl3+)))
+
+(define-public gtk-frdp
+ (package
+ (name "gtk-frdp")
+ ;; The latest published tag is 3.37.1, but it is very old:
+ ;; https://gitlab.gnome.org/GNOME/gtk-frdp/-/issues/39
+ (version "3.37.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.gnome.org/GNOME/gtk-frdp")
+ (commit "62fc62c5ccb7634f0bc87c57a4673877c24c94ed")))
+ (file-name (git-file-name "gtk-frdp" version))
+ (sha256
+ (base32
+ "0msw7qpsyf9hkyq9ddhvl4g4vk1fnyi7g0bddca9x6p9d0arprqz"))))
+ (build-system meson-build-system)
+ (arguments
+ (list #:glib-or-gtk? #t))
+ (inputs
+ (list freerdp fuse gtk+))
+ (native-inputs
+ (list `(,glib "bin") gobject-introspection pkg-config vala))
+ (home-page "https://gitlab.gnome.org/GNOME/gtk-frdp")
+ (synopsis "RDP viewer widget for Gtk")
+ (description "\
+This library provides a widget to view @acronym{RDP,Remote Desktop Protocol}
+sessions.")
+ (license license:gpl3+)))
base-commit: 1cc3b7e80f60a2a5a6a1400ed0b025efeae7a523
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Tue, 21 Nov 2023 20:58:02 GMT) Full text and rfc822 format available.Message #23 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu>, 67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: Re: [PATCH gnome-team v2 2/2] gnu: Add gnome-connections. Date: Tue, 21 Nov 2023 21:57:05 +0100
Am Montag, dem 20.11.2023 um 20:25 +0100 schrieb Vivien Kraus: > * gnu/packages/gnome.scm (gnome-connections): New variable. > > Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a > --- > I kept the support-related sentence in the description because I > think it is important to put this application in the search results > for “support” and “help”. But feel free to kill the last sentence if > you don’t think so. I don't think "support" or "help" are good search terms to look for when you need remote desktop software and vice versa. Yes, you can help others through remote desktop software, but you should be very aware of the implications of doing so. Needless to say, descriptions are not likely to capture that nuance. Cheers
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Fri, 24 Nov 2023 22:27:01 GMT) Full text and rfc822 format available.Message #26 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: 67309 <at> debbugs.gnu.org,Liliana Marie Prikler <liliana.prikler <at> gmail.com> Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team v3] gnu: Add gnome-connections. Date: Mon, 20 Nov 2023 20:25:45 +0100
* gnu/packages/gnome.scm (gnome-connections): New variable.
Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a
---
gnu/packages/gnome.scm | 57 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 194a443484..a9ff217380 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13624,3 +13624,60 @@ (define-public calls
backends, such as ModemManager for phones and @acronym{SIP, Session Initiation
Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.")
(license license:gpl3+)))
+
+(define-public gnome-connections
+ (package
+ (name "gnome-connections")
+ (version "44.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (delete-file-recursively "subprojects")))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-meson
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")
+ (("update_desktop_database: true")
+ "update_desktop_database: false"))))
+ (add-after 'unpack 'disable-nonfree-advertisement
+ (lambda _
+ (substitute* "src/ui/assistant.ui"
+ (("\\(standard for connecting to Linux\\)")
+ "(standard for connecting to GNU/Linux)"))
+ (substitute* "src/ui/onboarding-dialog.ui"
+ (("Access [a-zA-Z ,]* desktops")
+ "Access desktops with different operating systems")
+ ;; Replace the logos of non-free operating systems with the
+ ;; default image: the project metaphor for connecting to a
+ ;; remote desktop.
+ (("multiplatform.svg")
+ "welcome.svg")))))))
+ (inputs
+ (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin")
+ itstool
+ pkg-config
+ vala))
+ (home-page "https://apps.gnome.org/Connections")
+ (synopsis "View and use other desktops")
+ (description "Connections allows the user to connect to different
+real or virtual machines, using @acronym{VNC,Virtual Network Computing}
+or @acronym{RDP,Remote Desktop Protocol}.")
+ (license license:gpl3+)))
base-commit: 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Fri, 24 Nov 2023 23:11:02 GMT) Full text and rfc822 format available.Message #29 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu>, 67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: Re: [PATCH gnome-team v3] gnu: Add gnome-connections. Date: Sat, 25 Nov 2023 00:09:51 +0100
Am Montag, dem 20.11.2023 um 20:25 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (gnome-connections): New variable.
>
> Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a
> ---
> gnu/packages/gnome.scm | 57
> ++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 57 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 194a443484..a9ff217380 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -13624,3 +13624,60 @@ (define-public calls
> backends, such as ModemManager for phones and @acronym{SIP, Session
> Initiation
> Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet
> Protocol}}.")
> (license license:gpl3+)))
> +
> +(define-public gnome-connections
> + (package
> + (name "gnome-connections")
> + (version "44.1")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "mirror://gnome/sources/" name "/"
> + (version-major version) "/"
> + name "-" version ".tar.xz"))
> + (sha256
> + (base32
> +
> "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
> + (snippet
> + #~(begin
> + (use-modules (guix build utils))
> + (delete-file-recursively "subprojects")))))
> + (build-system meson-build-system)
> + (arguments
> + (list
> + #:glib-or-gtk? #t
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'patch-meson
> + (lambda _
> + (substitute* "meson.build"
> + (("gtk_update_icon_cache: true")
> + "gtk_update_icon_cache: false")
> + (("update_desktop_database: true")
> + "update_desktop_database: false"))))
> + (add-after 'unpack 'disable-nonfree-advertisement
> + (lambda _
> + (substitute* "src/ui/assistant.ui"
> + (("\\(standard for connecting to Linux\\)")
> + "(standard for connecting to GNU/Linux)"))
> + (substitute* "src/ui/onboarding-dialog.ui"
> + (("Access [a-zA-Z ,]* desktops")
> + "Access desktops with different operating systems")
> + ;; Replace the logos of non-free operating systems
> with the
> + ;; default image: the project metaphor for
> connecting to a
> + ;; remote desktop.
> + (("multiplatform.svg")
> + "welcome.svg")))))))
Finally had the time to test this, and I'm afraid it breaks
localization. Try skipping the page entirely instead :)
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Sun, 26 Nov 2023 18:51:02 GMT) Full text and rfc822 format available.Message #32 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team v4] gnu: Add gnome-connections. Date: Mon, 20 Nov 2023 20:25:45 +0100
* gnu/packages/gnome.scm (gnome-connections): New variable.
Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a
* gnu/packages/patches/gnome-connections-disable-nonfree-desktop-page.patch:
New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
Change-Id: If88a6e4c4f640a1175a8c98d13986f7520fe77b7
---
gnu/local.mk | 1 +
gnu/packages/gnome.scm | 51 ++++++++++++++++++
...ections-disable-nonfree-desktop-page.patch | 52 +++++++++++++++++++
3 files changed, 104 insertions(+)
create mode 100644 gnu/packages/patches/gnome-connections-disable-nonfree-desktop-page.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 5cb9874d9f..6ae7e9b577 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1332,6 +1332,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnome-2048-fix-positional-argument.patch \
%D%/packages/patches/gnome-control-center-firmware-security.patch \
%D%/packages/patches/gnome-control-center-libexecdir.patch \
+ %D%/packages/patches/gnome-connections-disable-nonfree-desktop-page.patch \
%D%/packages/patches/gnome-dictionary-meson-i18n.patch \
%D%/packages/patches/gnome-online-miners-tracker-3.patch \
%D%/packages/patches/gnome-settings-daemon-gc.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d354327497..f2ed075172 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13623,3 +13623,54 @@ (define-public calls
backends, such as ModemManager for phones and @acronym{SIP, Session Initiation
Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.")
(license license:gpl3+)))
+
+(define-public gnome-connections
+ (package
+ (name "gnome-connections")
+ (version "44.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (delete-file-recursively "subprojects")))
+ (patches
+ (search-patches "gnome-connections-disable-nonfree-desktop-page.patch"))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-meson
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")
+ (("update_desktop_database: true")
+ "update_desktop_database: false"))))
+ (add-after 'unpack 'say-gnu/linux
+ (lambda _
+ (substitute* "src/ui/assistant.ui"
+ (("\\(standard for connecting to Linux\\)")
+ "(standard for connecting to GNU/Linux)")))))))
+ (inputs
+ (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin")
+ itstool
+ pkg-config
+ vala))
+ (home-page "https://apps.gnome.org/Connections")
+ (synopsis "View and use other desktops")
+ (description "Connections allows the user to connect to different
+real or virtual machines, using @acronym{VNC,Virtual Network Computing}
+or @acronym{RDP,Remote Desktop Protocol}.")
+ (license license:gpl3+)))
diff --git a/gnu/packages/patches/gnome-connections-disable-nonfree-desktop-page.patch b/gnu/packages/patches/gnome-connections-disable-nonfree-desktop-page.patch
new file mode 100644
index 0000000000..10ff421864
--- /dev/null
+++ b/gnu/packages/patches/gnome-connections-disable-nonfree-desktop-page.patch
@@ -0,0 +1,52 @@
+From d6841278e27ee560c080867ec128add9e1faab8c Mon Sep 17 00:00:00 2001
+Message-ID: <d6841278e27ee560c080867ec128add9e1faab8c.1701024334.git.vivien <at> planete-kraus.eu>
+From: Vivien Kraus <vivien <at> planete-kraus.eu>
+Date: Sun, 26 Nov 2023 19:23:43 +0100
+Subject: [PATCH] =?UTF-8?q?Onboarding:=20Remove=20the=20=E2=80=9CDifferent?=
+ =?UTF-8?q?=20operating=20systems=E2=80=9D=20page.?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This page may be used to push users to use non-free software on a
+remote computer.
+---
+Discussion: https://gitlab.gnome.org/GNOME/connections/-/issues/144
+
+ src/ui/onboarding-dialog.ui | 8 --------
+ src/ui/onboarding/multiplatform.svg | 1 -
+ 2 files changed, 9 deletions(-)
+ delete mode 100644 src/ui/onboarding/multiplatform.svg
+
+diff --git a/src/ui/onboarding-dialog.ui b/src/ui/onboarding-dialog.ui
+index 3ab8a1d..80d6a64 100644
+--- a/src/ui/onboarding-dialog.ui
++++ b/src/ui/onboarding-dialog.ui
+@@ -53,14 +53,6 @@
+ </object>
+ </child>
+
+- <child>
+- <object class="ConnectionsOnboardingDialogPage">
+- <property name="title" translatable="yes">Connect to different operating systems</property>
+- <property name="description" translatable="yes">Access Linux, Mac, and Windows desktops using Connections.</property>
+- <property name="image">/org/gnome/Connections/ui/onboarding/multiplatform.svg</property>
+- </object>
+- </child>
+-
+ <child>
+ <object class="ConnectionsOnboardingDialogPage">
+ <property name="title" translatable="yes">Enable remote desktop before connecting</property>
+diff --git a/src/ui/onboarding/multiplatform.svg b/src/ui/onboarding/multiplatform.svg
+deleted file mode 100644
+index 5b3e6a1..0000000
+--- a/src/ui/onboarding/multiplatform.svg
++++ /dev/null
+@@ -1 +0,0 @@
+-<svg height="600" width="800" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><linearGradient id="c"><stop style="stop-color:#8ff0a4;stop-opacity:1" offset="0"/><stop style="stop-color:#99c1f1;stop-opacity:1" offset="1"/></linearGradient><linearGradient id="b"><stop style="stop-color:#c5dbf7;stop-opacity:1" offset="0"/><stop style="stop-color:#1b6fd4;stop-opacity:1" offset=".08"/><stop style="stop-color:#175fb6;stop-opacity:1" offset=".798"/><stop style="stop-color:#438de7;stop-opacity:1" offset=".932"/><stop style="stop-color:#175caf;stop-opacity:1" offset="1"/></linearGradient><linearGradient xlink:href="#a" id="d" x1="-46.029" y1="119.025" x2="139.157" y2="119.025" gradientUnits="userSpaceOnUse"/><linearGradient id="a"><stop style="stop-color:#4a86cf;stop-opacity:1" offset="0"/><stop style="stop-color:#33d17a;stop-opacity:1" offset=".144"/><stop style="stop-color:#f6d32d;stop-opacity:1" offset=".322"/><stop style="stop-color:#ff7800;stop-opacity:1" offset=".499"/><stop style="stop-color:#e01b24;stop-opacity:1" offset=".681"/><stop style="stop-color:#9141ac;stop-opacity:1" offset=".853"/><stop style="stop-color:#613583;stop-opacity:1" offset="1"/></linearGradient><linearGradient xlink:href="#b" id="f" x1="526.469" y1="262.426" x2="731.547" y2="262.426" gradientUnits="userSpaceOnUse"/><linearGradient xlink:href="#b" id="g" gradientUnits="userSpaceOnUse" x1="73.23" y1="262.426" x2="263.805" y2="262.426"/><linearGradient xlink:href="#c" id="e" x1="403.101" y1="232.449" x2="341.082" y2="463.905" gradientUnits="userSpaceOnUse"/><clipPath clipPathUnits="userSpaceOnUse" id="h"><rect style="fill:#e01b24;stroke-width:6;stop-color:#000" width="192.919" height="192.919" x="70.218" y="71.496" rx="23.687" ry="23.687"/></clipPath></defs><g transform="translate(-1536.865 -208.68) scale(3.8216)" style="display:inline"><rect style="opacity:1;vector-effect:none;fill:#000;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="95.25" height="58.208" x="47.625" y="84.667" rx="2.884" ry="2.884"/><rect ry="2.884" rx="2.884" y="145.256" x="47.625" height="58.208" width="95.25" style="opacity:1;vector-effect:none;fill:#000;fill-opacity:.102362;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="95.25" height="58.208" x="47.625" y="144.198" rx="2.884" ry="2.884"/><rect ry="2.884" rx="2.884" y="142.875" x="47.625" height="58.208" width="95.25" style="opacity:1;vector-effect:none;fill:#f6f5f4;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#c0bfbc;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="84.667" height="29.104" x="52.917" y="148.167" rx="1.958" ry="1.958"/><rect ry="1.958" rx="1.958" y="148.696" x="52.917" height="29.104" width="84.667" style="opacity:1;vector-effect:none;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect ry=".826" rx=".826" y="137.583" x="63.5" height="7.408" width="63.5" style="opacity:1;vector-effect:none;fill:#000;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect ry="2.884" rx="2.884" y="179.917" x="82.021" height="15.875" width="26.458" style="opacity:1;vector-effect:none;fill:#deddda;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="46.302" height="5.292" x="74.083" y="170.656" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="170.656" x="121.708" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="129.646" y="170.656" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="125.677" height="5.292" width="5.292" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="117.74" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="109.802" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="101.865" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="93.927" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="85.99" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="78.052" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="70.115" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="62.177" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="121.708" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="113.771" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="105.833" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="97.896" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="89.958" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="82.021" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="74.083" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="66.146" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="10.583" height="5.292" x="54.24" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="125.677" height="5.292" width="10.583" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="117.74" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="109.802" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="101.865" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="93.927" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="85.99" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="78.052" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="70.115" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="62.177" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="54.24" y="150.813" rx="1.013" ry="1.013"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="54.24" y="164.042" rx="1.013" ry="1.013"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="66.146" y="170.656" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="170.656" x="54.24" height="5.292" width="10.583" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect ry="1.013" rx="1.013" y="157.427" x="129.646" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="3.969" height="11.906" x="132.292" y="157.427" rx="1.013" ry="1.013"/></g><g transform="translate(-1160.927 -208.68) scale(3.8216)" style="display:inline"><rect style="opacity:1;vector-effect:none;fill:#000;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="95.25" height="58.208" x="47.625" y="84.667" rx="2.884" ry="2.884"/><rect ry="2.884" rx="2.884" y="145.256" x="47.625" height="58.208" width="95.25" style="opacity:1;vector-effect:none;fill:#000;fill-opacity:.102362;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="95.25" height="58.208" x="47.625" y="144.198" rx="2.884" ry="2.884"/><rect ry="2.884" rx="2.884" y="142.875" x="47.625" height="58.208" width="95.25" style="opacity:1;vector-effect:none;fill:#77767b;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#3d3846;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="84.667" height="29.104" x="52.917" y="148.167" rx="1.958" ry="1.958"/><rect ry="1.958" rx="1.958" y="148.696" x="52.917" height="29.104" width="84.667" style="opacity:1;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect ry=".826" rx=".826" y="137.583" x="63.5" height="7.408" width="63.5" style="opacity:1;vector-effect:none;fill:#000;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect ry="2.884" rx="2.884" y="179.917" x="82.021" height="15.875" width="26.458" style="opacity:1;vector-effect:none;fill:#5e5c64;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><path style="opacity:1;vector-effect:none;fill:url(#d);fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" d="M50.733 86.284h89.034a1.57 1.57 0 0 1 1.575 1.574v51.826a1.57 1.57 0 0 1-1.575 1.574H50.733a1.57 1.57 0 0 1-1.575-1.574V87.858a1.57 1.57 0 0 1 1.575-1.574zm-98.372 0h89.035a1.57 1.57 0 0 1 1.574 1.574v51.826a1.57 1.57 0 0 1-1.574 1.574H-47.64a1.57 1.57 0 0 1-1.574-1.574V87.858a1.57 1.57 0 0 1 1.574-1.574z"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="46.302" height="5.292" x="74.083" y="170.656" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="170.656" x="121.708" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="129.646" y="170.656" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="125.677" height="5.292" width="5.292" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="117.74" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="109.802" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="101.865" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="93.927" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="85.99" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="78.052" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="70.115" y="164.042" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="164.042" x="62.177" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="121.708" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="113.771" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="105.833" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="97.896" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="89.958" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="82.021" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="74.083" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="157.427" x="66.146" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="10.583" height="5.292" x="54.24" y="157.427" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="125.677" height="5.292" width="10.583" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="117.74" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="109.802" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="101.865" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="93.927" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="85.99" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="78.052" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="70.115" y="150.813" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="150.813" x="62.177" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="54.24" y="150.813" rx="1.013" ry="1.013"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="54.24" y="164.042" rx="1.013" ry="1.013"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="6.615" height="5.292" x="66.146" y="170.656" rx="1.013" ry="1.013"/><rect ry="1.013" rx="1.013" y="170.656" x="54.24" height="5.292" width="10.583" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect ry="1.013" rx="1.013" y="157.427" x="129.646" height="5.292" width="6.615" style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"/><rect style="opacity:1;vector-effect:none;fill:#241f31;fill-opacity:1;stroke:none;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal" width="3.969" height="11.906" x="132.292" y="157.427" rx="1.013" ry="1.013"/></g><path d="M1698.67-1487.186v-30.87l-35.458 5.173v25.697h35.458m-37.955-25.333-25.749 3.756v21.577h25.749v-25.333m-25.749 27.83v21.851l25.749 3.8v-25.65h-25.749m28.246 26.019 35.458 5.231v-31.25h-35.457v26.019" fill="#2f71f1" style="fill:#fff;stroke-width:.192542" transform="translate(-4114.957 3178.159) scale(1.98834)"/><g transform="matrix(.55827 0 0 .55827 -1560.682 62.46)"><circle cx="710.744" cy="302.811" r="137.447" fill="#fff"/><path d="M709.905 163.504c-76.834 0-139.205 62.347-139.205 139.182 0 76.834 62.37 139.205 139.205 139.205 76.835 0 139.182-62.37 139.182-139.205 0-76.835-62.347-139.182-139.182-139.182zm-1.148 24.904c7.148 0 14.332.371 19.258 1.124 38.306 6.293 71.971 33.534 86.336 69.926 9.85 24.762 10.54 52.387 2.057 78.107-3.693 11.218-12.595 27.774-14.784 27.774-2.189-.137-16.836-22.704-19.162-29.544-1.231-3.558-2.737-15.475-3.42-28.062-2.737-44.873-4.618-58.567-24.067-78.514-20.005-19.719-49.72-26.125-75.117-13.133-9.987 4.925-23.655 18.19-28.444 27.63-7.387 14.64-8.082 20.255-7.535 68.276l.407 44.041-3.685 5.335c-2.052 2.873-6.17 8.08-9.042 11.363l-5.335 6.148-6.411-8.205c-8.62-10.808-17.803-30.091-20.813-43.635-2.873-12.997-3.132-37.354-.67-49.257 9.577-44.463 47.195-80.726 91.384-88.25 4.789-.753 11.895-1.124 19.043-1.124zm15.167 84.71c4.104-.137 6.685.838 9.832 3.3 8.482 7.252 10.53 23.122 4.784 37.487l-2.176 5.598 4.234 4.785c4.925 5.746 4.793 4.937 2.057 14.377-3.01 10.124-1.904 14.494 7.536 31.458 8.892 15.734 14.228 28.18 13.133 30.095-1.368 2.189-21.347 9.718-31.745 11.77-13.134 2.736-40.635 1.913-53.084-1.507-9.03-2.6-21.065-8.204-31.052-14.497l-6.435-4.115 3.014-6.411c1.642-3.557 4.79-9.32 6.842-13.014 4.789-8.072 6.98-8.208 21.483-.957 11.902 6.02 18.045 6.852 25.023 3.158 7.935-4.105 36.53-23.68 36.53-25.047 0-2.873-6.009-1.093-23.11 6.842-22.026 10.124-25.331 10.405-36.96 2.607-4.515-3.01-8.325-6.158-8.325-6.842 0-1.641.255-1.632 9.832 1.651 5.746 1.915 9.987 2.461 13.133 1.914 5.883-1.095 42.556-16.843 45.43-19.306 4.104-3.967-4.655-1.905-22.44 5.072-26.951 10.671-29.83 10.543-48.3-1.77-8.619-5.746-9.975-7.273-9.975-10.694 0-2.6 1.238-4.783 3.564-6.698l3.684-2.87-2.87-6.556c-8.483-19.563-2.876-37.223 11.626-37.223 8.619 0 13.133 6.305 14.09 19.712l.694 9.426h19.139l.406-4.641c.82-12.04 2.051-16.558 5.335-20.526 4.377-5.062 7.546-6.579 15.07-6.579zm-2.105 16.554c-.904.061-1.963.309-3.374.694-3.283.82-6.435 7.377-6.435 13.396 0 4.515.405 5.083 7.656 8.23 4.24 1.915 8.208 3.137 8.755 2.727 2.326-1.368 4.386-10.533 3.565-15.048-.548-2.599-2.47-5.893-4.522-7.535-2.445-1.881-3.657-2.6-5.645-2.464zm-54.616 1.77c-1.513.105-3.006.799-4.306 2.2-4.104 4.379-3.978 13.544.263 18.47l3.302 3.707 4.928-3.708c4.24-3.283 5.047-4.64 5.047-9.019 0-6.977-4.693-11.964-9.234-11.65z" fill="#241f31"/></g><path style="display:inline;fill:url(#e);fill-opacity:1;stroke:none;stroke-width:3.02157;stroke-opacity:.956856;stop-color:#000" d="M137.415 171.533v.846a52.998 52.998 0 0 0 52.999 52.999h27.116a12.086 12.086 0 0 1 12.086 12.086v4.955a12.086 12.086 0 0 1-12.086 12.086H90.702a52.998 52.998 0 0 0-52.999 52.999v.846a52.998 52.998 0 0 0 52.999 52.998h33.72a12.086 12.086 0 0 1 12.087 12.087v3.021a12.086 12.086 0 0 1-12.087 12.087h-6.526a52.998 52.998 0 0 0-52.999 52.998v.847a52.998 52.998 0 0 0 52.999 52.998h601.051a52.998 52.998 0 0 0 52.999-52.998v-.847a52.998 52.998 0 0 0-52.999-52.998H378.235a12.086 12.086 0 0 1-12.087-12.087v-3.021a12.086 12.086 0 0 1 12.087-12.086h89.922a52.998 52.998 0 0 0 52.998-52.999v-.846a52.998 52.998 0 0 0-52.998-52.999h-32.185a14.53 14.53 0 0 1-14.529-14.53v-.068a14.53 14.53 0 0 1 14.53-14.53h11.033a52.998 52.998 0 0 0 52.998-52.998v-.846a52.998 52.998 0 0 0-52.998-52.999H190.414a52.998 52.998 0 0 0-52.999 52.999z"/><g transform="translate(27.26)"><circle cx="373.504" cy="416.111" fill="#fff" style="stroke-width:.898028" r="123.432"/><path d="M372.75 291.009c-68.999 0-125.01 55.99-125.01 124.99 0 68.998 56.01 125.01 125.01 125.01s124.99-56.01 124.99-125.01-55.99-124.99-124.99-124.99zm-1.03 22.364c6.419 0 12.87.333 17.294 1.01 34.4 5.65 64.632 30.114 77.532 62.795 8.846 22.237 9.465 47.045 1.847 70.143-3.316 10.074-11.31 24.942-13.276 24.942-1.966-.124-15.12-20.39-17.208-26.532-1.106-3.195-2.458-13.897-3.071-25.2-2.458-40.298-4.147-52.595-21.613-70.508-17.965-17.709-44.65-23.461-67.458-11.794-8.968 4.423-21.242 16.335-25.543 24.812-6.634 13.148-7.258 18.19-6.767 61.314l.366 39.55-3.31 4.791c-1.842 2.58-5.54 7.257-8.12 10.205l-4.79 5.52-5.758-7.367c-7.74-9.706-15.987-27.023-18.69-39.186-2.58-11.672-2.813-33.545-.602-44.234 8.6-39.93 42.382-72.495 82.065-79.251 4.301-.677 10.682-1.01 17.102-1.01zm13.62 76.072c3.686-.123 6.003.753 8.83 2.964 7.617 6.512 9.456 20.764 4.296 33.664l-1.954 5.027 3.802 4.297c4.423 5.16 4.304 4.434 1.847 12.911-2.703 9.092-1.71 13.017 6.768 28.25 7.985 14.13 12.777 25.307 11.793 27.027-1.228 1.966-19.17 8.727-28.508 10.57-11.794 2.457-36.491 1.718-47.67-1.354-8.11-2.334-18.918-7.367-27.886-13.018l-5.78-3.696 2.708-5.757c1.474-3.194 4.301-8.37 6.144-11.687 4.3-7.249 6.268-7.371 19.292-.86 10.689 5.407 16.205 6.154 22.472 2.837 7.126-3.687 32.805-21.266 32.805-22.493 0-2.58-5.396-.982-20.754 6.144-19.78 9.092-22.748 9.344-33.19 2.341-4.056-2.703-7.477-5.53-7.477-6.144 0-1.474.229-1.466 8.83 1.482 5.16 1.72 8.968 2.21 11.793 1.72 5.283-.984 38.217-15.126 40.798-17.338 3.685-3.563-4.18-1.71-20.152 4.555-24.203 9.583-26.788 9.468-43.375-1.59-7.74-5.16-8.958-6.531-8.958-9.603 0-2.335 1.112-4.296 3.2-6.015l3.31-2.578-2.578-5.887c-7.618-17.568-2.583-33.428 10.44-33.428 7.74 0 11.794 5.663 12.654 17.702l.623 8.465h17.187l.365-4.168c.736-10.812 1.842-14.87 4.79-18.432 3.931-4.546 6.777-5.909 13.534-5.909zm-1.89 14.866c-.812.055-1.763.278-3.03.624-2.949.736-5.78 6.624-5.78 12.03 0 4.054.365 4.564 6.876 7.39 3.808 1.72 7.371 2.817 7.862 2.45 2.09-1.23 3.94-9.46 3.202-13.514-.492-2.334-2.218-5.292-4.06-6.767-2.197-1.69-3.285-2.335-5.07-2.213zm-49.047 1.59c-1.359.094-2.7.717-3.867 1.975-3.686 3.933-3.572 12.163.236 16.587l2.965 3.33 4.426-3.33c3.808-2.949 4.532-4.168 4.532-8.1 0-6.266-4.214-10.744-8.292-10.462z" fill="#241f31" style="stroke-width:.898028"/></g><g fill="#2f71f1"><path d="M521.895 184.51V228.9a31.602 31.602 49.197 0 0 26.99 31.263l57.464 8.48V184.51h-84.455m92.646 85.34 89.311 13.178a23.552 23.552 139.196 0 0 26.99-23.3v-75.218h-116.3v85.34" style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#f);fill-opacity:1;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000;stop-opacity:1" transform="translate(-55.953)"/><path d="M730.84 176.319v-73.97a23.59 23.59 40.85 0 0-26.995-23.343L614.54 92.032v84.287h116.3M606.348 93.228l-57.46 8.382a31.55 31.55 130.85 0 0-26.995 31.22v43.488h84.455v-83.09" style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#1862bb;fill-opacity:1;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000;stop-opacity:1" transform="translate(-55.953)"/><path d="M730.84 168.126V94.158a23.59 23.59 40.85 0 0-26.995-23.344L614.54 83.84v84.286h116.3m-124.492-83.09-57.46 8.382a31.55 31.55 130.85 0 0-26.995 31.22v43.488h84.455v-83.09m-84.454 91.283v44.388a31.602 31.602 49.197 0 0 26.99 31.263l57.464 8.48v-84.131h-84.455m92.646 85.34 89.311 13.178a23.552 23.552 139.196 0 0 26.99-23.3v-75.219h-116.3v85.342" style="fill:#99c1f1;stroke-width:.631529" transform="translate(-55.953)"/></g><g transform="translate(44.637 5.434)"><rect style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#g);fill-opacity:1;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000;stop-opacity:1" width="192.919" height="192.919" x="70.218" y="80.081" rx="20.512" ry="20.512"/><g clip-path="url(#h)"><path style="fill:#3584e4;stroke-width:6;stop-color:#000" d="M70.218 71.496h192.919v192.919H70.218z"/><path style="opacity:1;vector-effect:none;fill:#99c1f1;stroke-width:7.37866;stroke-linecap:round;stop-color:#000;stop-opacity:1" d="M310.468 181.309c-.283 115.795 30.825 184.072-45.74 184.072-72.091 0-94.298-110.679-94.298-196.135l-17.222-.02c.63-47.182 21.468-223.177 98.035-223.177 76.566 0 59.57 93.871 59.288 209.666z"/><path style="fill:none;stroke:#000;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M121.9 198.946c24.618 29.658 74.768 27.91 94.651 0"/><path style="font-variation-settings:normal;opacity:1;fill:none;fill-opacity:1;stroke:#000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000;stop-opacity:1" d="M127.986 135.307v13.485M205.986 135.307v13.485"/></g></g></svg>
+\ No newline at end of file
+
+base-commit: 5cc910bef66389c8f8122ee4a4a16661fe874e18
+--
+2.41.0
+
base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Sun, 26 Nov 2023 20:19:01 GMT) Full text and rfc822 format available.Message #35 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu>, 67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: Re: [PATCH gnome-team v4] gnu: Add gnome-connections. Date: Sun, 26 Nov 2023 21:17:07 +0100
Am Montag, dem 20.11.2023 um 20:25 +0100 schrieb Vivien Kraus:
> * gnu/packages/gnome.scm (gnome-connections): New variable.
>
> Change-Id: I4c026ab3aae07a73fcbc9b4b0612538455fe126a
> * gnu/packages/patches/gnome-connections-disable-nonfree-desktop-
> page.patch:
> New file.
> * gnu/local.mk (dist_patch_DATA): Register it here.
>
> Change-Id: If88a6e4c4f640a1175a8c98d13986f7520fe77b7
> ---
> gnu/local.mk | 1 +
> gnu/packages/gnome.scm | 51
> ++++++++++++++++++
> ...ections-disable-nonfree-desktop-page.patch | 52
> +++++++++++++++++++
> 3 files changed, 104 insertions(+)
> create mode 100644 gnu/packages/patches/gnome-connections-disable-
> nonfree-desktop-page.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 5cb9874d9f..6ae7e9b577 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1332,6 +1332,7 @@ dist_patch_DATA
> = \
> %D%/packages/patches/gnome-2048-fix-positional-
> argument.patch \
> %D%/packages/patches/gnome-control-center-firmware-
> security.patch \
> %D%/packages/patches/gnome-control-center-libexecdir.patch \
> + %D%/packages/patches/gnome-connections-disable-nonfree-desktop-
> page.patch \
> %D%/packages/patches/gnome-dictionary-meson-i18n.patch \
> %D%/packages/patches/gnome-online-miners-tracker-3.patch \
> %D%/packages/patches/gnome-settings-daemon-gc.patch \
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index d354327497..f2ed075172 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -13623,3 +13623,54 @@ (define-public calls
> backends, such as ModemManager for phones and @acronym{SIP, Session
> Initiation
> Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet
> Protocol}}.")
> (license license:gpl3+)))
> +
> +(define-public gnome-connections
> + (package
> + (name "gnome-connections")
> + (version "44.1")
> + (source (origin
> + (method url-fetch)
> + (uri (string-append "mirror://gnome/sources/" name "/"
> + (version-major version) "/"
> + name "-" version ".tar.xz"))
> + (sha256
> + (base32
> +
> "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
> + (snippet
> + #~(begin
> + (use-modules (guix build utils))
> + (delete-file-recursively "subprojects")))
> + (patches
> + (search-patches "gnome-connections-disable-nonfree-
> desktop-page.patch"))))
> + (build-system meson-build-system)
> + (arguments
> + (list
> + #:glib-or-gtk? #t
> + #:phases
> + #~(modify-phases %standard-phases
> + (add-after 'unpack 'patch-meson
> + (lambda _
> + (substitute* "meson.build"
> + (("gtk_update_icon_cache: true")
> + "gtk_update_icon_cache: false")
> + (("update_desktop_database: true")
> + "update_desktop_database: false"))))
> + (add-after 'unpack 'say-gnu/linux
> + (lambda _
> + (substitute* "src/ui/assistant.ui"
> + (("\\(standard for connecting to Linux\\)")
> + "(standard for connecting to GNU/Linux)")))))))
Unless you also replace these in the .po files, this change is actively
harmful. In fact, I'd argue that even then it's probably not the best
idea to do this.
> + (inputs
> + (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2))
> + (native-inputs
> + (list gettext-minimal
> + `(,glib "bin")
> + itstool
> + pkg-config
> + vala))
> + (home-page "https://apps.gnome.org/Connections")
> + (synopsis "View and use other desktops")
> + (description "Connections allows the user to connect to
> different
> +real or virtual machines, using @acronym{VNC,Virtual Network
> Computing}
> +or @acronym{RDP,Remote Desktop Protocol}.")
> + (license license:gpl3+)))
> diff --git a/gnu/packages/patches/gnome-connections-disable-nonfree-
> desktop-page.patch b/gnu/packages/patches/gnome-connections-disable-
> nonfree-desktop-page.patch
> new file mode 100644
> index 0000000000..10ff421864
> --- /dev/null
> +++ b/gnu/packages/patches/gnome-connections-disable-nonfree-desktop-
> page.patch
> @@ -0,0 +1,52 @@
> +From d6841278e27ee560c080867ec128add9e1faab8c Mon Sep 17 00:00:00
> 2001
> +Message-ID:
> <d6841278e27ee560c080867ec128add9e1faab8c.1701024334.git.vivien <at> plane
> te-kraus.eu>
> +From: Vivien Kraus <vivien <at> planete-kraus.eu>
> +Date: Sun, 26 Nov 2023 19:23:43 +0100
> +Subject: [PATCH] =?UTF-
> 8?q?Onboarding:=20Remove=20the=20=E2=80=9CDifferent?=
> + =?UTF-8?q?=20operating=20systems=E2=80=9D=20page.?=
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +This page may be used to push users to use non-free software on a
> +remote computer.
I think the claim here is "This page may push users to connect to
remote machines running non-free software", or more concretely, "this
program suggests to connect to Windows and/or Mac PCs", taking the
onboarding self-ad at face value. Under such a literal reading, I'd
personally remove the onboarding dialogue itself ("don't tell me what
to do"), but that aside, I fear that simply dropping the page won't
work for upstream (they still have a feature to advertise). Why not
emphasize the multi-protocol thing instead? That way, it at least
stays OS-agnostic, which is probably better for everyone :)
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Sun, 26 Nov 2023 22:03:01 GMT) Full text and rfc822 format available.Message #38 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: Liliana Marie Prikler <liliana.prikler <at> gmail.com>,67309 <at> debbugs.gnu.org Cc: rg <at> raghavgururajan.name, maxim.cournoyer <at> gmail.com Subject: [PATCH gnome-team v5] gnu: Add gnome-connections. Date: Mon, 20 Nov 2023 20:25:45 +0100
* gnu/packages/gnome.scm (gnome-connections): New variable.
Change-Id: If88a6e4c4f640a1175a8c98d13986f7520fe77b7
---
gnu/packages/gnome.scm | 49 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d354327497..72121a0517 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13623,3 +13623,52 @@ (define-public calls
backends, such as ModemManager for phones and @acronym{SIP, Session Initiation
Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.")
(license license:gpl3+)))
+
+(define-public gnome-connections
+ (package
+ (name "gnome-connections")
+ (version "44.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk"))
+ (snippet
+ #~(begin
+ (use-modules (guix build utils))
+ (delete-file-recursively "subprojects")))))
+ (build-system meson-build-system)
+ (arguments
+ (list
+ #:glib-or-gtk? #t
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-meson
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false")
+ (("update_desktop_database: true")
+ "update_desktop_database: false"))))
+ (add-after 'unpack 'disable-onboarding-dialog
+ (lambda _
+ (substitute* "src/application.vala"
+ (("\\(new OnboardingDialog \\(main_window\\)\\).present \\(\\);")
+ "// Skip the onboarding dialog")))))))
+ (inputs
+ (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin")
+ itstool
+ pkg-config
+ vala))
+ (home-page "https://apps.gnome.org/Connections")
+ (synopsis "View and use other desktops")
+ (description "Connections allows the user to connect to different
+real or virtual machines, using @acronym{VNC,Virtual Network Computing}
+or @acronym{RDP,Remote Desktop Protocol}.")
+ (license license:gpl3+)))
base-commit: e21f0cb7b7a87992004193cd56638ad961fe5928
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Sun, 03 Dec 2023 23:53:02 GMT) Full text and rfc822 format available.Message #41 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu> Cc: rg <at> raghavgururajan.name, 67309 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: Re: [bug#67309] [PATCH gnome-team v5] gnu: Add gnome-connections. Date: Sun, 03 Dec 2023 18:52:27 -0500
Hi,
Vivien Kraus <vivien <at> planete-kraus.eu> writes:
> * gnu/packages/gnome.scm (gnome-connections): New variable.
[...]
> + (description "Connections allows the user to connect to different
> +real or virtual machines, using @acronym{VNC,Virtual Network Computing}
> +or @acronym{RDP,Remote Desktop Protocol}.")
> + (license license:gpl3+)))
Nitpick: You can add a space following the colon to separate arguments
of @acronym, for better readability.
Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
--
Thanks,
Maxim
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 04 Dec 2023 17:39:01 GMT) Full text and rfc822 format available.Message #44 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: rg <at> raghavgururajan.name, 67309 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH gnome-team v6 2/2] gnu: gnome-connections: Improve wording. Date: Mon, 4 Dec 2023 18:22:46 +0100
* gnu/packages/gnome.scm (gnome-connections) [description]: Add space after
comma in @acronym.
Change-Id: Ib6c9e39057786e7bd135874238a9b7629e316200
---
See 1/2.
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 185726dd5f..9943b10c2c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13817,6 +13817,6 @@ (define-public gnome-connections
(home-page "https://apps.gnome.org/Connections")
(synopsis "View and use other desktops")
(description "Connections allows the user to connect to different
-real or virtual machines, using @acronym{VNC,Virtual Network Computing}
-or @acronym{RDP,Remote Desktop Protocol}.")
+real or virtual machines, using @acronym{VNC, Virtual Network Computing}
+or @acronym{RDP, Remote Desktop Protocol}.")
(license license:gpl3+)))
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 04 Dec 2023 17:39:02 GMT) Full text and rfc822 format available.Message #47 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Vivien Kraus <vivien <at> planete-kraus.eu> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Cc: rg <at> raghavgururajan.name, 67309 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: [PATCH gnome-team v6 1/2] gnu: gtk-frdp: Improve wording. Date: Mon, 4 Dec 2023 18:22:17 +0100
* gnu/packages/gnome.scm (gtk-frdp) [description]: Add space after comma in
@acronym.
Change-Id: Ic3bc9b317ff54636fad0d073de1af2ffdabcd8f2
---
Hi, the patch has already been merged (by accident?), so I added a new commit.
Best regards,
Vivien
gnu/packages/gnome.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index c6437ce450..185726dd5f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13769,7 +13769,7 @@ (define-public gtk-frdp
(home-page "https://gitlab.gnome.org/GNOME/gtk-frdp")
(synopsis "RDP viewer widget for Gtk")
(description "This library provides a widget to view
-@acronym{RDP,Remote Desktop Protocol} sessions.")
+@acronym{RDP, Remote Desktop Protocol} sessions.")
(license license:gpl3+)))
(define-public gnome-connections
base-commit: 4c323c2f8308bba0e3295f3109d159c7b8f72838
--
2.41.0
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 04 Dec 2023 23:07:01 GMT) Full text and rfc822 format available.Message #50 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu> Cc: rg <at> raghavgururajan.name, 67309 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: Re: [PATCH gnome-team v6 1/2] gnu: gtk-frdp: Improve wording. Date: Mon, 04 Dec 2023 18:05:58 -0500
Vivien Kraus <vivien <at> planete-kraus.eu> writes: > * gnu/packages/gnome.scm (gtk-frdp) [description]: Add space after comma in > @acronym. > > Change-Id: Ic3bc9b317ff54636fad0d073de1af2ffdabcd8f2 Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail> -- Thanks, Maxim
guix-patches <at> gnu.org:bug#67309; Package guix-patches.
(Mon, 04 Dec 2023 23:07:02 GMT) Full text and rfc822 format available.Message #53 received at 67309 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Vivien Kraus <vivien <at> planete-kraus.eu> Cc: rg <at> raghavgururajan.name, 67309 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com> Subject: Re: [PATCH gnome-team v6 2/2] gnu: gnome-connections: Improve wording. Date: Mon, 04 Dec 2023 18:06:14 -0500
Vivien Kraus <vivien <at> planete-kraus.eu> writes: > * gnu/packages/gnome.scm (gnome-connections) [description]: Add space after > comma in @acronym. > > Change-Id: Ib6c9e39057786e7bd135874238a9b7629e316200 Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail> -- Thanks, Maxim
Liliana Marie Prikler <liliana.prikler <at> gmail.com>:Vivien Kraus <vivien <at> planete-kraus.eu>:Message #58 received at 67309-done <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>, Vivien Kraus <vivien <at> planete-kraus.eu> Cc: rg <at> raghavgururajan.name, 67309-done <at> debbugs.gnu.org Subject: Re: [PATCH gnome-team v6 1/2] gnu: gtk-frdp: Improve wording. Date: Wed, 20 Dec 2023 00:01:29 +0100
Am Montag, dem 04.12.2023 um 18:05 -0500 schrieb Maxim Cournoyer: > Vivien Kraus <vivien <at> planete-kraus.eu> writes: > > > * gnu/packages/gnome.scm (gtk-frdp) [description]: Add space after > > comma in > > @acronym. > > > > Change-Id: Ic3bc9b317ff54636fad0d073de1af2ffdabcd8f2 > > Reviewed-by: Maxim Cournoyer <maxim.cournoyer <at> gmail> Done at last.
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Wed, 17 Jan 2024 12:24:06 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.