public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/xpra] main: Release 6.5
@ 2026-06-18 14:35 Antonio Trande
  0 siblings, 0 replies; 2+ messages in thread
From: Antonio Trande @ 2026-06-18 14:35 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/xpra
Branch : main
Commit : 0abb78cc262640856a5f3a241e0638b676ae54fe
Author : Antonio Trande <sagitter@fedoraproject.org>
Date   : 2026-06-18T16:34:46+02:00
Stats  : +25/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/xpra/c/0abb78cc262640856a5f3a241e0638b676ae54fe?branch=main

Log:
Release 6.5

---
diff --git a/xpra.spec b/xpra.spec
index cd62830..c96406a 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -50,6 +50,7 @@ BuildRequires:  desktop-file-utils
 BuildRequires:  libvpx-devel
 BuildRequires:  libXdamage-devel
 BuildRequires:  libXres-devel
+BuildRequires:  lua-devel
 BuildRequires:  cups-devel
 BuildRequires:  python3-cups
 BuildRequires:  redhat-rpm-config
@@ -113,7 +114,6 @@ Requires: pulseaudio-utils%{?_isa}
 Requires: cups-filesystem
 Requires: shared-mime-info%{?_isa}
 Requires: systemd-udev%{?_isa}
-
 %description
 Xpra is "screen for X": it allows you to run X programs, usually on a remote
 host, direct their display to your local machine, and then to disconnect from
@@ -130,7 +130,6 @@ network bandwidth constraints.
 Summary:			Gnome integration for the xpra client
 Requires:			%{name}-client-gtk3%{?_isa} = 1:%{version}-%{release}
 Requires:			gnome-shell-extension-appindicator
-
 %description -n %{name}-client-gnome
 This package installs the GNOME Shell extensions
 that can help in restoring the system tray functionality.
@@ -141,10 +140,19 @@ is required for querying and activating keyboard input sources.
 Summary:			GTK3 xpra client
 BuildRequires:		xclip
 Requires:			%{name}%{?_isa} = 1:%{version}-%{release}
-
 %description -n %{name}-client-gtk3
 This package contains the GTK3 xpra client.
 
+%package -n %{name}-plugin-lua
+Summary:			Wireshark/tshark Lua dissector for the Xpra remote display protocol
+BuildRequires:		wireshark-devel
+%{?lua_version:Requires: lua(abi) = %{lua_version}}
+Requires:			%{name}%{?_isa} = 1:%{version}-%{release}
+%description -n %{name}-plugin-lua
+The dissector registers on TCP port 14500 (xpra default) and also
+installs a heuristic detector so it picks up traffic on any port.
+Use Decode As → Xpra to force it on a different port.
+
 %prep
 %autosetup -n %{name}-%{version} -N
 
@@ -239,6 +247,16 @@ install -m0644 -D xpra.sysusers.conf %{buildroot}%{_sysusersdir}/xpra.conf
 # Remove invalid paths
 sed -e 's|build/bdist.linux-%{?_arch}/wheel/xpra-%{version}.data/data||g' -i %{buildroot}%{_sysconfdir}/xpra/conf.d/55_server_x11.conf
 
+# Move Lua script into wireshark plugin directory and remove invalid /usr sub-directory
+%define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
+mkdir -p %{buildroot}%{wireshark_plugindir}
+%ifarch %{ix86}
+cp -p %{buildroot}/usr/%{_libdir}/wireshark/plugins/xpra_dissector.lua %{buildroot}%{wireshark_plugindir}/
+%else
+cp -p %{buildroot}/usr/%{wireshark_plugindir}/xpra_dissector.lua %{buildroot}%{wireshark_plugindir}/
+%endif
+rm -rf %{buildroot}/usr/%{_libdir}
+
 %post
 %systemd_post xpra-encoder.service
 %systemd_post xpra.service
@@ -292,6 +310,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xpra-mdns.png
 %{_datadir}/icons/hicolor/48x48/apps/xpra-shadow.png
 %{_datadir}/icons/hicolor/64x64/apps/xpra.png
+%{_datadir}/icons/xpra-large.png
 %{_mandir}/man1/xpra.1.*
 %{_mandir}/man1/xpra_*.1.*
 %{_mandir}/man1/run_scaled.1.*
@@ -324,5 +343,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/extension.js
 %{_datadir}/gnome-shell/extensions/%{gnome_shell_extension}/metadata.json
 
+%files -n %{name}-plugin-lua
+%{wireshark_plugindir}/xpra_dissector.lua
+
 %changelog
 %autochangelog

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [rpms/xpra] main: Release 6.5
@ 2026-06-17 12:06 Antonio Trande
  0 siblings, 0 replies; 2+ messages in thread
From: Antonio Trande @ 2026-06-17 12:06 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/xpra
Branch : main
Commit : 9c237c7b7165e1daf00dc95c7c7b95a8956a4bd1
Author : Antonio Trande <sagitter@fedoraproject.org>
Date   : 2026-06-17T14:06:06+02:00
Stats  : +3/-65 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/xpra/c/9c237c7b7165e1daf00dc95c7c7b95a8956a4bd1?branch=main

Log:
Release 6.5

---
diff --git a/.gitignore b/.gitignore
index 62aa06f..11a50fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,3 +99,4 @@
 /xpra-6.4.2.tar.gz
 /xpra-6.4.3.tar.gz
 /xpra-6.4.4.tar.gz
+/xpra-6.5.tar.gz

diff --git a/sources b/sources
index a194e64..0db8ef9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-6.4.4.tar.gz) = e4f19ce7d6090b8236faa0087116b7bd59782c923e96994040e3807842b09932b8f397ef2c85bf412537db4278e8b8baf23d216fa6b080d7196a2f82b5493342
+SHA512 (xpra-6.5.tar.gz) = 142871f51c2eab390317ffa1f4bd878bbcc4e122b7200c98e4f4125969a32c251da2a5b83b4c31992358abbd707196b1f4ddd2df78b199853af73b37266c089a

diff --git a/xpra-bug4724.patch b/xpra-bug4724.patch
deleted file mode 100644
index d9feb32..0000000
--- a/xpra-bug4724.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 64d76c103d8d6534da22e52ff3c412548e622164 Mon Sep 17 00:00:00 2001
-From: ndias <Nuno.Dias@gmail.com>
-Date: Tue, 2 Dec 2025 17:54:00 +0000
-Subject: [PATCH 1/2] Update extension.js
-
-Update extension to work with gnome-shell 49
----
- .../extensions/input-source-manager@xpra_org/extension.js   | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js
-index 870927dbed..7b8478bdce 100644
---- a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js
-+++ b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/extension.js
-@@ -18,8 +18,8 @@
-  * SPDX-License-Identifier: GPL-2.0-or-later
-  */
- 
--const { Gio } = imports.gi;
--const { getInputSourceManager } = imports.ui.status.keyboard;
-+import Gio from 'gi://Gio';
-+import * as getInputSourceManager from 'resource:///org/gnome/shell/ui/status/keyboard.js';
- 
- const XMLInterface = `<node>
-   <interface name="xpra_org.InputSourceManager">
-@@ -40,7 +40,7 @@ function init(meta) {
-     return new InputSourceManagerInterface();
- }
- 
--class InputSourceManagerInterface {
-+export default class InputSourceManagerInterface {
-     enable() {
-         this._ism = new ISMWrapper();
-         this._dbusObj= Gio.DBusExportedObject.wrapJSObject(XMLInterface, this._ism);
-
-From 4e7e4b54b37d4701c90ac2d6603d84b64e00e49b Mon Sep 17 00:00:00 2001
-From: ndias <Nuno.Dias@gmail.com>
-Date: Tue, 2 Dec 2025 17:56:34 +0000
-Subject: [PATCH 2/2] Update metadata.json
-
-Update to work with gnome-shell 49
----
- .../extensions/input-source-manager@xpra_org/metadata.json     | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json
-index c99d8362d9..cfc3c822c2 100644
---- a/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json
-+++ b/fs/share/gnome-shell/extensions/input-source-manager@xpra_org/metadata.json
-@@ -9,7 +9,8 @@
-     "41",
-     "42",
-     "43",
--    "44"
-+    "44",
-+    "49"
-   ],
-   "url": "https://github.com/Xpra-org/xpra/",
-   "uuid": "input-source-manager@xpra_org",

diff --git a/xpra.spec b/xpra.spec
index b08db79..cd62830 100644
--- a/xpra.spec
+++ b/xpra.spec
@@ -24,7 +24,7 @@
 %global build_opts -C--global-option=--without-nvidia -C--global-option=--without-pandoc_lua -C--global-option=--with-verbose -C--global-option=--with-Xdummy -C--global-option=--with-Xdummy_wrapper -C--global-option=--without-strict -C--global-option=--with-vpx %{?with_debug:-C--global-option=--with-debug} %{?with_openh264:-C--global-option=--with-openh264} -C--global-option=--without-cuda_rebuild -C--global-option=--with-client -C--global-option=--without-qt6_client -C--global-option=--without-pyglet_client -C--global-option=--without-enc_x264
 
 Name:           xpra
-Version:        6.4.4
+Version:        6.5
 Release:        %autorelease
 Epoch:          1
 Summary:        Remote display server for applications and desktops
@@ -39,9 +39,6 @@ Source1:        %{name}.appdata.xml
 # https://bodhi.fedoraproject.org/updates/FEDORA-2025-0882918c25#comment-4407961
 Patch0:         %{name}-fix_audio.patch
 
-# Fix rhbz#2417964
-Patch1:         %{name}-bug4724.patch
-
 BuildRequires:  python3-devel
 BuildRequires:  gtk3-devel
 BuildRequires:  libXtst-devel
@@ -154,7 +151,6 @@ This package contains the GTK3 xpra client.
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %patch -P 0 -p1 -b .backup
 %endif
-%patch -P 1 -p1
 
 rm -rf *.egg-info
 

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-06-18 14:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-18 14:35 [rpms/xpra] main: Release 6.5 Antonio Trande
  -- strict thread matches above, loose matches on Subject: below --
2026-06-17 12:06 Antonio Trande

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox