#5 Update to 1.4.34
Opened 3 months ago by orion. Modified 3 months ago
rpms/ orion/remmina update  into  rawhide

file added
+61
@@ -0,0 +1,61 @@ 

+ From 105d422f382ae7a062e8cf0cdd05554c8a2f5d9e Mon Sep 17 00:00:00 2001

+ From: myheroyuki <myheroyuki@outlook.com>

+ Date: Wed, 14 Feb 2024 21:49:38 +0900

+ Subject: [PATCH] [REM-3047] fix issue compiling with gcc-14

+ 

+ ---

+  plugins/kwallet/src/kwallet_plugin_main.c | 10 +++++-----

+  1 file changed, 5 insertions(+), 5 deletions(-)

+ 

+ diff --git a/plugins/kwallet/src/kwallet_plugin_main.c b/plugins/kwallet/src/kwallet_plugin_main.c

+ index 6a6be3b051..17dd3cae62 100644

+ --- a/plugins/kwallet/src/kwallet_plugin_main.c

+ +++ b/plugins/kwallet/src/kwallet_plugin_main.c

+ @@ -44,7 +44,7 @@

+  

+  static RemminaPluginService *remmina_plugin_service = NULL;

+  

+ -gboolean remmina_plugin_kwallet_is_service_available(RemminaPlugin *plugin)

+ +gboolean remmina_plugin_kwallet_is_service_available(RemminaSecretPlugin *plugin)

+  {

+  	return rp_kwallet_is_service_available();

+  }

+ @@ -68,7 +68,7 @@ static gchar *build_kwallet_key(RemminaFile *remminafile, const gchar *key)

+  	return kwkey;

+  }

+  

+ -void remmina_plugin_kwallet_store_password(RemminaPlugin *plugin, RemminaFile *remminafile, const gchar *key, const gchar *password)

+ +void remmina_plugin_kwallet_store_password(RemminaSecretPlugin *plugin, RemminaFile *remminafile, const gchar *key, const gchar *password)

+  {

+  	TRACE_CALL(__func__);

+  	gchar *kwkey;

+ @@ -78,7 +78,7 @@ void remmina_plugin_kwallet_store_password(RemminaPlugin *plugin, RemminaFile *r

+  }

+  

+  gchar*

+ -remmina_plugin_kwallet_get_password(RemminaPlugin *plugin, RemminaFile *remminafile, const gchar *key)

+ +remmina_plugin_kwallet_get_password(RemminaSecretPlugin *plugin, RemminaFile *remminafile, const gchar *key)

+  {

+  	TRACE_CALL(__func__);

+  	gchar *kwkey, *password;

+ @@ -90,7 +90,7 @@ remmina_plugin_kwallet_get_password(RemminaPlugin *plugin, RemminaFile *remminaf

+  	return password;

+  }

+  

+ -void remmina_plugin_kwallet_delete_password(RemminaPlugin *plugin, RemminaFile *remminafile, const gchar *key)

+ +void remmina_plugin_kwallet_delete_password(RemminaSecretPlugin *plugin, RemminaFile *remminafile, const gchar *key)

+  {

+  	TRACE_CALL(__func__);

+  	gchar *kwkey;

+ @@ -99,7 +99,7 @@ void remmina_plugin_kwallet_delete_password(RemminaPlugin *plugin, RemminaFile *

+  	g_free(kwkey);

+  }

+  

+ -gboolean remmina_plugin_kwallet_init(RemminaPlugin *plugin)

+ +gboolean remmina_plugin_kwallet_init(RemminaSecretPlugin *plugin)

+  {

+  	/* Activates only when KDE is running */

+  	const gchar *envvar;

+ -- 

+ GitLab

+ 

file modified
+19 -5
@@ -1,6 +1,8 @@ 

+ %global commit 75a0bdb795d99e052690178ae0d81ebdbd2cbdd3

+ 

  Name: remmina

- Version: 1.4.33

- Release: 3%{?dist}

+ Version: 1.4.34

+ Release: 1%{?dist}

  Summary: Remote Desktop Client

  License: GPL-2.0-or-later and MIT

  URL: https://remmina.org
@@ -13,6 +15,9 @@ 

  # So we can't use it directly only as instructions.

  Source1: pluginBuild-CMakeLists.txt

  

+ # Fix gcc 14 incompatible pointer type error

+ Patch0: https://gitlab.com/Remmina/Remmina/-/merge_requests/2568.patch

+ 

  BuildRequires: cmake >= 3.2

  BuildRequires: cups-devel

  BuildRequires: desktop-file-utils
@@ -31,9 +36,14 @@ 

  BuildRequires: pkgconfig(avahi-ui)

  BuildRequires: pkgconfig(avahi-ui-gtk3)

  %endif

- BuildRequires: pkgconfig(freerdp2)

+ # Missing dependencies from libwinpr-devel

+ # https://bugzilla.redhat.com/show_bug.cgi?id=2264711

+ BuildRequires: freerdp

+ BuildRequires: fuse3-devel

+ BuildRequires: pkgconfig(freerdp3)

  BuildRequires: pkgconfig(gtk+-3.0)

  BuildRequires: pkgconfig(json-glib-1.0)

+ BuildRequires: pkgconfig(libcurl)

  BuildRequires: pkgconfig(libsecret-1)

  %if 0%{?fedora} >= 37

  BuildRequires: pkgconfig(libsoup-3.0)
@@ -216,7 +226,7 @@ 

  that shows up under the display manager session menu.

  

  %prep

- %autosetup -p1 -n Remmina-v.%{version}

+ %autosetup -p1 -n Remmina-v%{version}-%{commit}

  

  %build

  %cmake \
@@ -228,7 +238,7 @@ 

  %else

      -DWITH_AVAHI=OFF \

  %endif

-     -DWITH_FREERDP=ON \

+     -DWITH_FREERDP3=ON \

      -DWITH_GCRYPT=ON \

      -DWITH_GETTEXT=ON \

      -DWITH_KF5WALLET=ON \
@@ -335,6 +345,10 @@ 

  %{_mandir}/man1/remmina-gnome.1*

  

  %changelog

+ * Sun Feb 18 2024 Orion Poplawski <orion@nwra.com> - 1.4.34-1

+ - Update to 1.4.34

+ - Build with freerdp3

+ 

  * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.33-3

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

  

Build with freerdp3

Totally untested.

I had this mostly done but I was waiting on the gcc14 error to be fixed, which looks like it has happened as of 1.4.35. If you want to rebase to that and drop the patch I'll merge and build this.

Metadata