forked from getsolus/packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
vinagre: Fix builds and housekeeping
**Summary** - Fix build - Change homepage (Part of getsolus#4116) - Add monitoring.yml (Part of getsolus#4121)
- Loading branch information
Showing
8 changed files
with
180 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| From d4d268f60cafd7f686a0a7c64a1fe077b8254f15 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> | ||
| Date: Mon, 2 Sep 2024 16:56:24 +0200 | ||
| Subject: [PATCH] appdata: Update URLs | ||
|
|
||
| --- | ||
| data/vinagre.appdata.xml.in | 7 ++++--- | ||
| 1 file changed, 4 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/data/vinagre.appdata.xml.in b/data/vinagre.appdata.xml.in | ||
| index 1516a83..41fbc1f 100644 | ||
| --- a/data/vinagre.appdata.xml.in | ||
| +++ b/data/vinagre.appdata.xml.in | ||
| @@ -14,12 +14,13 @@ | ||
| connect to SSH servers.</_p> | ||
| </description> | ||
| <url type="homepage">https://wiki.gnome.org/Apps/Vinagre</url> | ||
| - <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre</url> | ||
| - <url type="donation">http://www.gnome.org/friends/</url> | ||
| + <url type="bugtracker">https://gitlab.gnome.org/GNOME/vinagre/-/issues</url> | ||
| + <url type="donation">https://www.gnome.org/donate/</url> | ||
| <url type="help">https://help.gnome.org/users/vinagre/stable/</url> | ||
| + <url type="vcs-browser">https://gitlab.gnome.org/GNOME/vinagre</url> | ||
| <screenshots> | ||
| <screenshot type="default"> | ||
| - <image>http://amigadave.com/temp/vinagre-default.png</image> | ||
| + <image>https://gitlab.gnome.org/GNOME/vinagre/-/raw/master/help/C/figures/vinagre-connected-3-16.png</image> | ||
| <_caption><!-- Describe this screenshot in less than ~10 words --></_caption> | ||
| </screenshot> | ||
| </screenshots> | ||
| -- | ||
| 2.46.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| Add missing GType types, to avoid defaulting to int. For C99 compatibility. | ||
|
|
||
| diff --git a/plugins/rdp/vinagre-rdp-plugin.c b/plugins/rdp/vinagre-rdp-plugin.c | ||
| index 475110242a3c9b8b..30531098ea5451c2 100644 | ||
| --- a/plugins/rdp/vinagre-rdp-plugin.c | ||
| +++ b/plugins/rdp/vinagre-rdp-plugin.c | ||
| @@ -234,7 +234,7 @@ __attribute__((constructor)) void | ||
| rdp_register_types (void) | ||
| { | ||
| g_type_init (); | ||
| - volatile dontoptimiseaway = vinagre_rdp_plugin_get_type (); | ||
| + volatile GType dontoptimiseaway = vinagre_rdp_plugin_get_type (); | ||
| } | ||
|
|
||
| /* vim: set ts=8: */ | ||
| diff --git a/plugins/spice/vinagre-spice-plugin.c b/plugins/spice/vinagre-spice-plugin.c | ||
| index 87377eff75c6c625..6c2c951beb28e65f 100644 | ||
| --- a/plugins/spice/vinagre-spice-plugin.c | ||
| +++ b/plugins/spice/vinagre-spice-plugin.c | ||
| @@ -368,7 +368,7 @@ __attribute__((constructor)) void | ||
| spice_register_types (void) | ||
| { | ||
| g_type_init (); | ||
| - volatile dontoptimiseaway = vinagre_spice_plugin_get_type (); | ||
| + volatile GType dontoptimiseaway = vinagre_spice_plugin_get_type (); | ||
| } | ||
|
|
||
| /* vim: set ts=8: */ | ||
| diff --git a/plugins/ssh/vinagre-ssh-plugin.c b/plugins/ssh/vinagre-ssh-plugin.c | ||
| index 38306d51815c8fb1..1563720ff88b129a 100644 | ||
| --- a/plugins/ssh/vinagre-ssh-plugin.c | ||
| +++ b/plugins/ssh/vinagre-ssh-plugin.c | ||
| @@ -199,7 +199,7 @@ __attribute__((constructor)) void | ||
| ssh_register_types (void) | ||
| { | ||
| g_type_init (); | ||
| - volatile dontoptimiseaway = vinagre_ssh_plugin_get_type (); | ||
| + volatile GType dontoptimiseaway = vinagre_ssh_plugin_get_type (); | ||
| } | ||
|
|
||
| /* vim: set ts=8: */ | ||
| diff --git a/plugins/vnc/vinagre-vnc-plugin.c b/plugins/vnc/vinagre-vnc-plugin.c | ||
| index d77140f806407ef6..b0100d77aca3b121 100644 | ||
| --- a/plugins/vnc/vinagre-vnc-plugin.c | ||
| +++ b/plugins/vnc/vinagre-vnc-plugin.c | ||
| @@ -431,7 +431,7 @@ __attribute__((constructor)) void | ||
| vnc_register_types (void) | ||
| { | ||
| g_type_init (); | ||
| - volatile dontoptimiseaway = vinagre_vnc_plugin_get_type (); | ||
| + volatile GType dontoptimiseaway = vinagre_vnc_plugin_get_type (); | ||
| } | ||
|
|
||
| /* vim: set ts=8: */ |
25 changes: 25 additions & 0 deletions
25
packages/v/vinagre/files/vinagre-incompatible-pointer.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| From 3f204d68a7401a533902c7ac7636c9b748b236f7 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> | ||
| Date: Mon, 2 Sep 2024 16:41:42 +0200 | ||
| Subject: [PATCH] Fix incompatible pointer types | ||
|
|
||
| --- | ||
| vinagre/vinagre-tube-handler.c | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/vinagre/vinagre-tube-handler.c b/vinagre/vinagre-tube-handler.c | ||
| index 291d4d6..72fa9c8 100644 | ||
| --- a/vinagre/vinagre-tube-handler.c | ||
| +++ b/vinagre/vinagre-tube-handler.c | ||
| @@ -112,7 +112,7 @@ vinagre_tube_handler_set_channel (VinagreTubeHandler *self, | ||
| g_return_if_fail (VINAGRE_IS_TUBE_HANDLER (self)); | ||
|
|
||
| VinagreTubeHandlerPrivate *priv = VINAGRE_TUBE_HANDLER_GET_PRIVATE (self); | ||
| - priv->channel = g_object_ref (channel); | ||
| + priv->channel = TP_CHANNEL (g_object_ref (channel)); | ||
| } | ||
|
|
||
| static void | ||
| -- | ||
| 2.46.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| From 0f10cacfc57024dc847a94e879680d5b61f66e3a Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <[email protected]> | ||
| Date: Mon, 2 Sep 2024 17:35:20 +0200 | ||
| Subject: [PATCH] rdp: Fix infinite loop | ||
|
|
||
| Break the loop on any errors. | ||
| --- | ||
| plugins/rdp/vinagre-rdp-tab.c | 8 ++++---- | ||
| 1 file changed, 4 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/plugins/rdp/vinagre-rdp-tab.c b/plugins/rdp/vinagre-rdp-tab.c | ||
| index bbb8adf..1e2a7b5 100644 | ||
| --- a/plugins/rdp/vinagre-rdp-tab.c | ||
| +++ b/plugins/rdp/vinagre-rdp-tab.c | ||
| @@ -1127,10 +1127,10 @@ open_freerdp (VinagreRdpTab *rdp_tab) | ||
| success = freerdp_connect (priv->freerdp_session); | ||
| if (!success) | ||
| { | ||
| - authentication_errors += freerdp_get_last_error (priv->freerdp_session->context) == 0x20009 || | ||
| - freerdp_get_last_error (priv->freerdp_session->context) == 0x2000c; | ||
| - | ||
| - cancelled = freerdp_get_last_error (priv->freerdp_session->context) == 0x2000b; | ||
| + if (freerdp_get_last_error (priv->freerdp_session->context) == FREERDP_ERROR_CONNECT_CANCELLED) | ||
| + cancelled = TRUE; | ||
| + else | ||
| + authentication_errors += 1; | ||
|
|
||
| freerdp_free (priv->freerdp_session); | ||
| init_freerdp (rdp_tab); | ||
| -- | ||
| 2.46.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| releases: | ||
| id: 5573 | ||
| rss: ~ | ||
| # No known CPE, checked 2024-11-13 | ||
| security: | ||
| cpe: ~ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters