From 8ba010ba978d5e668f97e45eaf68fc7161bd97f5 Mon Sep 17 00:00:00 2001 From: Muhammad Alfi Syahrin Date: Wed, 13 Nov 2024 20:42:26 +0700 Subject: [PATCH] vinagre: Fix builds and housekeeping **Summary** - Fix build - Change homepage (Part of getsolus/packages#4116) - Add monitoring.yml (Part of getsolus/packages#4121) --- packages/v/vinagre/abi_used_symbols | 4 +- .../vinagre/files/vinagre-appdata-fixes.patch | 33 ++++++++++++ packages/v/vinagre/files/vinagre-c99.patch | 54 +++++++++++++++++++ .../files/vinagre-incompatible-pointer.patch | 25 +++++++++ .../vinagre/files/vinagre-infinite-loop.patch | 32 +++++++++++ packages/v/vinagre/monitoring.yml | 6 +++ packages/v/vinagre/package.yml | 11 ++-- packages/v/vinagre/pspec_x86_64.xml | 27 +++++++--- 8 files changed, 180 insertions(+), 12 deletions(-) create mode 100644 packages/v/vinagre/files/vinagre-appdata-fixes.patch create mode 100644 packages/v/vinagre/files/vinagre-c99.patch create mode 100644 packages/v/vinagre/files/vinagre-incompatible-pointer.patch create mode 100644 packages/v/vinagre/files/vinagre-infinite-loop.patch create mode 100644 packages/v/vinagre/monitoring.yml diff --git a/packages/v/vinagre/abi_used_symbols b/packages/v/vinagre/abi_used_symbols index 57926bedc2f..0ea072327ac 100644 --- a/packages/v/vinagre/abi_used_symbols +++ b/packages/v/vinagre/abi_used_symbols @@ -201,8 +201,8 @@ libglib-2.0.so.0:g_malloc0 libglib-2.0.so.0:g_malloc0_n libglib-2.0.so.0:g_markup_printf_escaped libglib-2.0.so.0:g_mkdir_with_parents -libglib-2.0.so.0:g_once_init_enter -libglib-2.0.so.0:g_once_init_leave +libglib-2.0.so.0:g_once_init_enter_pointer +libglib-2.0.so.0:g_once_init_leave_pointer libglib-2.0.so.0:g_option_context_add_group libglib-2.0.so.0:g_option_context_add_main_entries libglib-2.0.so.0:g_option_context_free diff --git a/packages/v/vinagre/files/vinagre-appdata-fixes.patch b/packages/v/vinagre/files/vinagre-appdata-fixes.patch new file mode 100644 index 00000000000..a949d749a89 --- /dev/null +++ b/packages/v/vinagre/files/vinagre-appdata-fixes.patch @@ -0,0 +1,33 @@ +From d4d268f60cafd7f686a0a7c64a1fe077b8254f15 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +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. + + https://wiki.gnome.org/Apps/Vinagre +- https://bugzilla.gnome.org/enter_bug.cgi?product=vinagre +- http://www.gnome.org/friends/ ++ https://gitlab.gnome.org/GNOME/vinagre/-/issues ++ https://www.gnome.org/donate/ + https://help.gnome.org/users/vinagre/stable/ ++ https://gitlab.gnome.org/GNOME/vinagre + + +- http://amigadave.com/temp/vinagre-default.png ++ https://gitlab.gnome.org/GNOME/vinagre/-/raw/master/help/C/figures/vinagre-connected-3-16.png + <_caption> + + +-- +2.46.0 + diff --git a/packages/v/vinagre/files/vinagre-c99.patch b/packages/v/vinagre/files/vinagre-c99.patch new file mode 100644 index 00000000000..63598fc972f --- /dev/null +++ b/packages/v/vinagre/files/vinagre-c99.patch @@ -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: */ diff --git a/packages/v/vinagre/files/vinagre-incompatible-pointer.patch b/packages/v/vinagre/files/vinagre-incompatible-pointer.patch new file mode 100644 index 00000000000..9fb4eae1695 --- /dev/null +++ b/packages/v/vinagre/files/vinagre-incompatible-pointer.patch @@ -0,0 +1,25 @@ +From 3f204d68a7401a533902c7ac7636c9b748b236f7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +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 + diff --git a/packages/v/vinagre/files/vinagre-infinite-loop.patch b/packages/v/vinagre/files/vinagre-infinite-loop.patch new file mode 100644 index 00000000000..09234cf6166 --- /dev/null +++ b/packages/v/vinagre/files/vinagre-infinite-loop.patch @@ -0,0 +1,32 @@ +From 0f10cacfc57024dc847a94e879680d5b61f66e3a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +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 + diff --git a/packages/v/vinagre/monitoring.yml b/packages/v/vinagre/monitoring.yml new file mode 100644 index 00000000000..1a354dc2952 --- /dev/null +++ b/packages/v/vinagre/monitoring.yml @@ -0,0 +1,6 @@ +releases: + id: 5573 + rss: ~ +# No known CPE, checked 2024-11-13 +security: + cpe: ~ diff --git a/packages/v/vinagre/package.yml b/packages/v/vinagre/package.yml index 31b0536e012..1040f478b44 100644 --- a/packages/v/vinagre/package.yml +++ b/packages/v/vinagre/package.yml @@ -1,9 +1,9 @@ name : vinagre version : 3.22.0 -release : 23 -homepage : https://wiki.gnome.org/Apps/Vinagre +release : 24 source : - - git|https://gitlab.gnome.org/GNOME/vinagre.git : 9da43e8505c91c9938abd88c2253da339a9c5ff4 + - git|https://gitlab.gnome.org/GNOME/vinagre.git : c86e114efe31381bff3cad008e9f2cd84a83a803 +homepage : https://gitlab.gnome.org/Archive/vinagre/ license : GPL-3.0-or-later component : desktop.gnome summary : Vinagre is a remote desktop viewer for GNOME. @@ -24,7 +24,12 @@ builddeps : - vala - yelp-tools setup : | + # Apply most of Archlinux patches %patch -p1 -i $pkgfiles/Fix-compilation-with-GCC-10.patch + %patch -p1 -i $pkgfiles/vinagre-incompatible-pointer.patch + %patch -p1 -i $pkgfiles/vinagre-c99.patch + %patch -p1 -i $pkgfiles/vinagre-infinite-loop.patch + %patch -p1 -i $pkgfiles/vinagre-appdata-fixes.patch NOCONFIGURE=1 ./autogen.sh %configure --enable-rdp --enable-spice --with-ssh --enable-compile-warnings=minimum build : | diff --git a/packages/v/vinagre/pspec_x86_64.xml b/packages/v/vinagre/pspec_x86_64.xml index f974d9d8ed1..d43b34f5ed8 100644 --- a/packages/v/vinagre/pspec_x86_64.xml +++ b/packages/v/vinagre/pspec_x86_64.xml @@ -1,10 +1,10 @@ vinagre - https://wiki.gnome.org/Apps/Vinagre + https://gitlab.gnome.org/Archive/vinagre/ - Joey Riches - josephriches@gmail.com + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com GPL-3.0-or-later desktop.gnome @@ -65,6 +65,19 @@ /usr/share/help/cs/vinagre/scaling.page /usr/share/help/cs/vinagre/take-screenshot.page /usr/share/help/cs/vinagre/view-only.page + /usr/share/help/da/vinagre/connect-file.page + /usr/share/help/da/vinagre/connect-reverse.page + /usr/share/help/da/vinagre/connect.page + /usr/share/help/da/vinagre/figures/preferences-desktop-remote-desktop.png + /usr/share/help/da/vinagre/figures/vinagre-connected-3-16.png + /usr/share/help/da/vinagre/fullscreen.page + /usr/share/help/da/vinagre/index.page + /usr/share/help/da/vinagre/introduction.page + /usr/share/help/da/vinagre/keyboard-shortcuts.page + /usr/share/help/da/vinagre/legal.xml + /usr/share/help/da/vinagre/scaling.page + /usr/share/help/da/vinagre/take-screenshot.page + /usr/share/help/da/vinagre/view-only.page /usr/share/help/de/vinagre/connect-file.page /usr/share/help/de/vinagre/connect-reverse.page /usr/share/help/de/vinagre/connect.page @@ -415,12 +428,12 @@ - - 2024-03-22 + + 2024-11-13 3.22.0 Packaging update - Joey Riches - josephriches@gmail.com + Muhammad Alfi Syahrin + malfisya.dev@hotmail.com \ No newline at end of file