public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gnome-remote-desktop] f45: Update to 51.rc
@ 2026-09-02 9:36 Milan Crha
0 siblings, 0 replies; only message in thread
From: Milan Crha @ 2026-09-02 9:36 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gnome-remote-desktop
Branch : f45
Commit : 8a85c5d6cbf979ff5fda51742a219cf249f5ad8e
Author : Milan Crha <mcrha@redhat.com>
Date : 2026-09-02T11:35:54+02:00
Stats : +3/-156 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/gnome-remote-desktop/c/8a85c5d6cbf979ff5fda51742a219cf249f5ad8e?branch=f45
Log:
Update to 51.rc
---
diff --git a/001-Fix-building-when-pointers-are-32-bit.patch b/001-Fix-building-when-pointers-are-32-bit.patch
deleted file mode 100644
index e2ceff0..0000000
--- a/001-Fix-building-when-pointers-are-32-bit.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 1e3f7d8628d63dc8ad5d813722357ab840ce3049 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Fri, 21 Aug 2026 11:39:51 +0200
-Subject: [PATCH 1/2] daemon/system: Fix building when pointers are 32 bit
-
-We can't use the direct hash/equal function for 64 bit values as that
-does not work on 32 bit architectures. Instead place these values on the
-heap, and use g_int64_(hash|equal).
----
- src/grd-rdp-smartcard.c | 32 ++++++++++++++------------------
- 1 file changed, 14 insertions(+), 18 deletions(-)
-
-diff --git a/src/grd-rdp-smartcard.c b/src/grd-rdp-smartcard.c
-index 4abda0a9e..6f2ff09da 100644
---- a/src/grd-rdp-smartcard.c
-+++ b/src/grd-rdp-smartcard.c
-@@ -48,14 +48,6 @@
- (uint32_t) (val)) \
- : (uint32_t) (val)))
-
--#define INT64_TO_POINTER(val) \
-- (G_STATIC_ASSERT_EXPR (sizeof (val) == sizeof (gpointer)), \
-- (gpointer) (val))
--
--#define POINTER_TO_INT64(ptr) \
-- (G_STATIC_ASSERT_EXPR (sizeof (ptr) == sizeof (int64_t)), \
-- (int64_t) (ptr))
--
- /*
- * pcsc-lite dwState bitmask values. These differ from the WinSCard
- * sequential values (0-6) defined by FreeRDP/WinPR in winpr/smartcard.h.
-@@ -291,10 +283,13 @@ on_smartcard_release_context_complete (RdpdrServerContext *rdpdr_context,
-
- static gboolean
- remove_cards_for_context (gpointer key,
-- gpointer card_context,
-- gpointer context)
-+ gpointer value,
-+ gpointer user_data)
- {
-- return POINTER_TO_INT64 (card_context) == POINTER_TO_INT64 (context);
-+ int64_t card_context = *(int64_t *) value;
-+ int64_t context = *(int64_t *) user_data;
-+
-+ return card_context == context;
- }
-
- static gboolean
-@@ -321,7 +316,7 @@ on_handle_release_context (GrdDBusPcscdSession *skeleton,
-
- g_hash_table_foreach_remove (smartcard->card_to_context,
- remove_cards_for_context,
-- INT64_TO_POINTER (context));
-+ &context);
-
- smartcard_scard_context_native_to_redir (&redir_context, context);
-
-@@ -415,8 +410,8 @@ track_card_context (RdpdrServerContext *rdpdr_context,
- if (smartcard)
- {
- g_hash_table_insert (smartcard->card_to_context,
-- INT64_TO_POINTER (card),
-- INT64_TO_POINTER (context));
-+ g_memdup2 (&card, sizeof card),
-+ g_memdup2 (&context, sizeof context));
- }
- }
-
-@@ -424,7 +419,7 @@ static void
- untrack_card_context (GrdRdpSmartcard *smartcard,
- int64_t card)
- {
-- g_hash_table_remove (smartcard->card_to_context, INT64_TO_POINTER (card));
-+ g_hash_table_remove (smartcard->card_to_context, &card);
- }
-
- static void
-@@ -553,7 +548,7 @@ resolve_context_for_card (GrdRdpSmartcard *smartcard,
- gpointer value;
-
- if (!g_hash_table_lookup_extended (smartcard->card_to_context,
-- INT64_TO_POINTER (card),
-+ &card,
- NULL,
- &value))
- {
-@@ -564,7 +559,7 @@ resolve_context_for_card (GrdRdpSmartcard *smartcard,
- return FALSE;
- }
-
-- *out_context = POINTER_TO_INT64 (value);
-+ *out_context = *(int64_t *) value;
- return TRUE;
- }
-
-@@ -2208,7 +2203,8 @@ grd_rdp_smartcard_init (GrdRdpSmartcard *smartcard)
-
- smartcard->smartcard_device_ids = g_hash_table_new (NULL, NULL);
- smartcard->pending_invocations = g_hash_table_new (NULL, NULL);
-- smartcard->card_to_context = g_hash_table_new (NULL, NULL);
-+ smartcard->card_to_context = g_hash_table_new_full (g_int64_hash, g_int64_equal,
-+ g_free, g_free);
- }
-
- static void
---
-GitLab
-
-
-From ef5a76f5d2d96de4f29ac908ee14db09834882d7 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
-Date: Fri, 21 Aug 2026 15:09:15 +0200
-Subject: [PATCH 2/2] rdp-smartcard: Remove static assert for narrowing macro
-
-We sometimes "narrow" down a size_t to uint32_t, checking that size_t is
-64 bit, which it isn't on some architectures. Thus, drop the assert.
----
- src/grd-rdp-smartcard.c | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/src/grd-rdp-smartcard.c b/src/grd-rdp-smartcard.c
-index 6f2ff09da..15e530aa9 100644
---- a/src/grd-rdp-smartcard.c
-+++ b/src/grd-rdp-smartcard.c
-@@ -37,16 +37,14 @@
- #include "grd-session-rdp.h"
-
- #define EXTEND_32_TO_64(val) \
-- (G_STATIC_ASSERT_EXPR (sizeof (val) == sizeof (uint32_t)), \
-- (uint64_t) (uint32_t) (val))
-+ ((uint64_t) (uint32_t) (val))
-
- #define NARROW_64_TO_32(val) \
-- (G_STATIC_ASSERT_EXPR (sizeof (val) == sizeof (uint64_t)), \
-- ((uint64_t) (val) > UINT32_MAX \
-- ? (g_warning ("Narrowing 64-to-32 lost data in '"#val"': 0x%lx", \
-- (uint64_t) (val)), \
-- (uint32_t) (val)) \
-- : (uint32_t) (val)))
-+ ((uint64_t) (val) > UINT32_MAX \
-+ ? (g_warning ("Narrowing 64-to-32 lost data in '"#val"': 0x%lx", \
-+ (uint64_t) (val)), \
-+ (uint32_t) (val)) \
-+ : (uint32_t) (val))
-
- /*
- * pcsc-lite dwState bitmask values. These differ from the WinSCard
---
-GitLab
-
diff --git a/gnome-remote-desktop.spec b/gnome-remote-desktop.spec
index 6d97fe6..9e5bf73 100644
--- a/gnome-remote-desktop.spec
+++ b/gnome-remote-desktop.spec
@@ -7,13 +7,13 @@
%bcond vnc %[0%{?fedora} || 0%{?rhel} < 10]
%global meson_version 1.4.0
-%global libei_version 1.0.901
+%global libei_version 1.3.901
%global pipewire_version 1.2.0
%global glib_version 2.75.0
%global vncserver_version 0.9.11-7
Name: gnome-remote-desktop
-Version: 51~beta
+Version: 51~rc
Release: %autorelease
Summary: GNOME Remote Desktop screen share service
@@ -26,9 +26,6 @@ Source0: https://download.gnome.org/sources/%{name}/%{gnome_major_version
# Adds encryption support (requires patched LibVNCServer)
Patch0: gnutls-anontls.patch
-# https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/merge_requests/416
-Patch1: 001-Fix-building-when-pointers-are-32-bit.patch
-
BuildRequires: asciidoc
BuildRequires: gcc
BuildRequires: meson >= %{meson_version}
diff --git a/sources b/sources
index c20412d..dcf0b31 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-remote-desktop-51.beta.tar.xz) = 8276b30e56ef42645267551f1b56330e8d3c0ff7096bc6aa088545a5325c45d36d094257906417bde835138d7e7fd76bea1454a11ab989927fb4f2a63a3c5ed2
+SHA512 (gnome-remote-desktop-51.rc.tar.xz) = ff5c8b03591e7de9f0cd15526e2f8540f7b494833deef0eeac7191cfee08b5e5ebb71f9f2fd2de52643025156adfc76ba173d16d621055c46ae7782c8646c701
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-02 9:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-02 9:36 [rpms/gnome-remote-desktop] f45: Update to 51.rc Milan Crha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox