diff --git a/.gitignore b/.gitignore index 1b669a3..aba048b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,73 +1 @@ -remmina-0.7.5.tar.gz -/remmina-0.9.3.tar.gz -/remmina-20120330gitffba771d.tar.bz2 -/Remmina-1.0.0.tar.gz -/Remmina-26b814aec6e930746d079c885449dd50d3484fb0.tar.gz -/Remmina-1470c974cddaede87d09345f712202ddcda0810b.tar.gz -/Remmina-65d2ca4872150942cced1fbe92248dd933e9c0cb.tar.gz -/Remmina-efb7b5f87b2ed1604fa8bdf559fd4e08e2a18d9b.tar.gz -/v1.2.0-rcgit.1.tar.gz -/Remmina-b3e339ea5478c0941a6dfa0bf8fed9e7a1c70e0b.tar.gz -/Remmina-b3237e832df87bffc176c4f4024000b3d2d776cf.tar.gz -/Remmina-8855df7.tar.gz -/Remmina-b43697d.tar.gz -/Remmina-1.2.0-rcgit.7.tar.gz -/Remmina-1.2.0.rcgit.12.tar.gz -/Remmina-1.2.0.rcgit.13.tar.gz -/Remmina-1.2.0-rcgit.14.tar.gz -/Remmina-cbcb19e.tar.gz -/Remmina-679bb8e.tar.gz -/Remmina-42f5a87.tar.gz -/Remmina-88f490d.tar.gz -/Remmina-aeaae39.tar.gz -/remmina.spec -/Remmina-80a77b8.tar.gz -/Remmina-35604d5.tar.gz -/Remmina-d1a4a73.tar.gz -/Remmina-1da1fb6.tar.gz -/Remmina-4d8d257.tar.gz -/Remmina-2c0a77e.tar.gz -/Remmina-41c8de6.tar.gz -/Remmina-7e82138.tar.gz -/Remmina-89009c8.tar.gz -/Remmina-0387ee0.tar.gz -/Remmina-205df66.tar.gz -/Remmina-08f5b4b.tar.gz -/Remmina-1.2.0-rcgit.26.tar.gz -/Remmina-d70108c.tar.gz -/Remmina-04e4a99.tar.gz -/Remmina-5f3cc40.tar.gz -/Remmina-f467f19.tar.gz -/Remmina-6b62986.tar.gz -/remmina-1.2.31.3.tar.gz -/remmina-1.2.32.tar.gz -/remmina-1.2.32.1.tar.gz -/remmina-1.3.3.tar.gz -/remmina-1.3.4.tar.gz -/remmina-1.3.5.tar.gz -/remmina-1.3.6.tar.gz -/remmina-1.3.10.tar.gz -/remmina-1.4.1.tar.gz -/remmina-1.4.4.tar.gz -/remmina-1.4.7.tar.gz -/remmina-1.4.8.tar.gz -/remmina-1.4.9.tar.gz -/remmina-1.4.10.tar.gz -/remmina-1.4.11.tar.gz -/remmina-1.4.12.tar.gz -/remmina-1.4.13.tar.gz -/remmina-1.4.14.tar.gz -/remmina-1.4.15.tar.gz -/remmina-1.4.16.tar.gz -/remmina-1.4.17.tar.gz -/remmina-1.4.18.tar.gz -/remmina-1.4.19.tar.gz -/remmina-1.4.20.tar.gz -/remmina-1.4.21.tar.gz -/remmina-1.4.23.tar.gz -/remmina-1.4.24.tar.gz -/remmina-1.4.25.tar.gz -/remmina-1.4.26.tar.gz -/remmina-1.4.27.tar.gz -/remmina-1.4.28.tar.gz -/remmina-1.4.29.tar.gz +/remmina-*.tar.gz diff --git a/0001_add_mime_text_formats_for_rdp_clibpoard.patch b/0001_add_mime_text_formats_for_rdp_clibpoard.patch deleted file mode 100644 index 9b584eb..0000000 --- a/0001_add_mime_text_formats_for_rdp_clibpoard.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/plugins/rdp/rdp_cliprdr.c b/plugins/rdp/rdp_cliprdr.c -index 75938275ddcff76cb3f7282fdba091cacc2c1f0a..a39e4f4c7603f0960099a7b8f89f8d94973c0715 100644 ---- a/plugins/rdp/rdp_cliprdr.c -+++ b/plugins/rdp/rdp_cliprdr.c -@@ -280,14 +280,20 @@ static UINT remmina_rdp_cliprdr_server_format_list(CliprdrClientContext *context - gchar *gtkFormatName = NULL; - if (format->formatId == CF_UNICODETEXT) { - serverFormatName = "CF_UNICODETEXT"; -- gtkFormatName = "UTF8_STRING"; -+ gtkFormatName = "text/plain;charset=utf-8"; - GdkAtom atom = gdk_atom_intern(gtkFormatName, TRUE); - gtk_target_list_add(list, atom, 0, CF_UNICODETEXT); -+ /* Add also the older UTF8_STRING format for older applications */ -+ atom = gdk_atom_intern("UTF8_STRING", TRUE); -+ gtk_target_list_add(list, atom, 0, CF_UNICODETEXT); - } else if (format->formatId == CF_TEXT) { - serverFormatName = "CF_TEXT"; -- gtkFormatName = "TEXT"; -+ gtkFormatName = "text/plain"; - GdkAtom atom = gdk_atom_intern(gtkFormatName, TRUE); - gtk_target_list_add(list, atom, 0, CF_TEXT); -+ /* Add also the older TEXT format for older applications */ -+ atom = gdk_atom_intern("TEXT", TRUE); -+ gtk_target_list_add(list, atom, 0, CF_TEXT); - } else if (format->formatId == CF_DIB) { - serverFormatName = "CF_DIB"; - if (has_dib_level < 1) -@@ -360,7 +366,7 @@ static UINT remmina_rdp_cliprdr_server_format_list(CliprdrClientContext *context - gtk_target_table_free(target_table, n_targets); - if (n_targets == 0) { - REMMINA_PLUGIN_DEBUG("gp=%p adding a dummy text target (empty text) for local clipboard, because we have no interesting targets from the server. Putting it in the local clipboard cache."); -- GdkAtom atom = gdk_atom_intern("UTF8_STRING", TRUE); -+ GdkAtom atom = gdk_atom_intern("text/plain;charset=utf-8", TRUE); - gtk_target_list_add(list, atom, 0, CF_UNICODETEXT); - pthread_mutex_lock(&clipboard->srv_data_mutex); - clipboard->srv_data = malloc(1); diff --git a/0002_fix_unlock_crash.patch b/0002_fix_unlock_crash.patch deleted file mode 100644 index e889727..0000000 --- a/0002_fix_unlock_crash.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/remmina_unlock.c b/src/remmina_unlock.c -index 1a3de304ad8f0bae0fa7183e22537bf8c9e57bdc..d05000f7d81df824a12466d90baac9be0cf797ee 100644 ---- a/src/remmina_unlock.c -+++ b/src/remmina_unlock.c -@@ -75,6 +75,7 @@ void remmina_unlock_timer_destroy() - TRACE_CALL(__func__); - - g_timer_destroy(timer); -+ timer = NULL; - } - - static void remmina_unlock_unlock_clicked(GtkButton *btn, gpointer user_data) diff --git a/0003_remmina_rdp_monitor_get_fix_maxw_maxh_and_monitorids_calculation.patch b/0003_remmina_rdp_monitor_get_fix_maxw_maxh_and_monitorids_calculation.patch deleted file mode 100644 index 31aee2d..0000000 --- a/0003_remmina_rdp_monitor_get_fix_maxw_maxh_and_monitorids_calculation.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0c77fe7e8705d320a3f062afefa8d694d5e9e30a Mon Sep 17 00:00:00 2001 -From: Max Ihlenfeldt -Date: Fri, 24 Feb 2023 14:30:29 +0100 -Subject: [PATCH] remmina_rdp_monitor_get(): fix maxw, maxh and monitorids - calculation - ---- - plugins/rdp/rdp_monitor.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - -diff --git a/plugins/rdp/rdp_monitor.c b/plugins/rdp/rdp_monitor.c -index fddeed776..384cdb496 100644 ---- a/plugins/rdp/rdp_monitor.c -+++ b/plugins/rdp/rdp_monitor.c -@@ -81,6 +81,7 @@ void remmina_rdp_monitor_get (rfContext *rfi, gchar **monitorids, guint32 *maxwi - gint count = 0; - - static gchar buffer[256]; -+ gint buffer_offset = 0; - - GdkRectangle geometry = { 0, 0, 0, 0 }; - GdkRectangle tempgeom = { 0, 0, 0, 0 }; -@@ -106,8 +107,6 @@ void remmina_rdp_monitor_get (rfContext *rfi, gchar **monitorids, guint32 *maxwi - if (*monitorids) - has_custom_monitors = TRUE; - -- buffer[0] = '\0'; -- - rdpMonitor* base = (rdpMonitor *)freerdp_settings_get_pointer(settings, FreeRDP_MonitorDefArray); - for (gint i = 0; i < n_monitors; ++i) { - rdpMonitor* current; -@@ -144,6 +143,8 @@ void remmina_rdp_monitor_get (rfContext *rfi, gchar **monitorids, guint32 *maxwi - * we must multiply by the scale factor */ - scale = gdk_monitor_get_scale_factor (monitor); - REMMINA_PLUGIN_DEBUG("Monitor n %d scale: %d", index, scale); -+ geometry.x *= scale; -+ geometry.y *= scale; - geometry.width *= scale; - geometry.height *= scale; - REMMINA_PLUGIN_DEBUG("Monitor n %d width: %d", index, geometry.width); -@@ -190,10 +191,10 @@ void remmina_rdp_monitor_get (rfContext *rfi, gchar **monitorids, guint32 *maxwi - //current->y - freerdp_settings_get_uint32(settings, FreeRDP_MonitorLocalShiftY); - //REMMINA_PLUGIN_DEBUG("Monitor n %d calculated y: %d", index, current->y); - -- if (buffer[0] == '\0') -- g_sprintf (buffer, "%d", i); -+ if (buffer_offset == 0) -+ buffer_offset = g_sprintf(buffer + buffer_offset, "%d", i); - else -- g_sprintf(buffer, "%s,%d", buffer, i); -+ buffer_offset = g_sprintf(buffer + buffer_offset, ",%d", i); - REMMINA_PLUGIN_DEBUG("Monitor IDs buffer: %s", buffer); - gdk_rectangle_union(&tempgeom, &geometry, &destgeom); - memcpy(&tempgeom, &destgeom, sizeof tempgeom); --- -GitLab - diff --git a/remmina.spec b/remmina.spec index 12374e6..6e8baa7 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,13 +1,13 @@ -%global release_commit_hash fb19eb5f11f206ffb442a9e0c519cb0f2cb3fd8b +%global release_commit_hash 61ea9b6681104cadf0a3f8c25bd3e5685ee6691a # Use old cmake macro behaviour. %define __cmake_in_source_build 1 Name: remmina -Version: 1.4.29 -Release: 5%{?dist} +Version: 1.4.30 +Release: 1%{?dist} Summary: Remote Desktop Client -License: GPLv2+ and MIT +License: GPL-2.0-or-later and MIT URL: https://remmina.org Source0: https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -18,10 +18,6 @@ Source0: https://gitlab.com/Remmina/Remmina/-/archive/v%{version}/Remmina-%{vers # So we can't use it directly only as instructions. Source1: pluginBuild-CMakeLists.txt -Patch01: 0001_add_mime_text_formats_for_rdp_clibpoard.patch -Patch02: 0002_fix_unlock_crash.patch -Patch03: 0003_remmina_rdp_monitor_get_fix_maxw_maxh_and_monitorids_calculation.patch - BuildRequires: cmake BuildRequires: cups-devel BuildRequires: desktop-file-utils @@ -346,6 +342,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat %{_mandir}/man1/remmina-gnome.1* %changelog +* Mon Apr 10 2023 Phil Wyett - 1.4.30-1 +- New upstream version 1.4.30. +- Use SPDX license identifiers. +- Remove no longer needed patches. + * Tue Feb 28 2023 Phil Wyett - 1.4.29-5 - Add patch: 0003_remmina_rdp_monitor_get_fix_maxw_maxh_and_monitorids_calculation.patch diff --git a/sources b/sources index 23622d7..3c88f9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (remmina-1.4.29.tar.gz) = add6f915b0b00587cbb42781a4823600ad350e7a590cebc1b9f6c73c5ab0b6e92600006a5d955fca3fb5c252265dc346695fbfea17e01ba469ee826832b7ddaa +SHA512 (remmina-1.4.30.tar.gz) = 99156e4ce54383d9a047ac8d0b1aaaaba9c8847393ef0fcb087704d3da231276d46b8212c3c5637cd1b949c304589c5f7e0844deedbc5b6e9e50f7f0cacf9673