update to 6.2.2 [release 6.2.2-1mamba;Fri Dec 27 2024]

2024-12-29 13:49:06 +01:00 · 2024-12-29 13:49:06 +01:00 · 946869d23b
commit 946869d23b
parent deb8748209
4 changed files with 27 additions and 99 deletions
--- a/xpra-4.4.2-upstream_clamp_clock_values_to_unsigned_long.patch
+++ b/xpra-4.4.2-upstream_clamp_clock_values_to_unsigned_long.patch
@ -1,71 +0,0 @@
-From 3f5eb97283e73ca78059be5dd828a87b393a38c7 Mon Sep 17 00:00:00 2001
-From: totaam <antoine@xpra.org>
-Date: Sat, 12 Nov 2022 15:48:54 +0700
-Subject: [PATCH] #3685 clamp clock values to 'unsigned long'
-
---
- xpra/x11/bindings/randr_bindings.pyx | 31 +++++++++-------------------
- 1 file changed, 10 insertions(+), 21 deletions(-)
-
-diff --git a/xpra/x11/bindings/randr_bindings.pyx b/xpra/x11/bindings/randr_bindings.pyx
-index f527d594a8..aaebe088f3 100644
--- a/xpra/x11/bindings/randr_bindings.pyx
-+++ b/xpra/x11/bindings/randr_bindings.pyx
-@@ -19,7 +19,7 @@ from xpra.x11.bindings.xlib cimport (
-     )
- from xpra.common import DEFAULT_REFRESH_RATE
- from xpra.util import envint, envbool, csv, first_time, decode_str, prettify_plug_name
-from xpra.os_util import strtobytes, bytestostr
-+from xpra.os_util import strtobytes, bytestostr, BITS
- 
- 
- TIMESTAMPS = envbool("XPRA_RANDR_TIMESTAMPS", False)
-@@ -597,7 +597,6 @@ cdef class RandRBindingsInstance(X11CoreBindingsInstance):
-     cdef XRRModeInfo *calculate_mode(self, name, unsigned int w, unsigned int h, unsigned int vrefresh):
-         log("calculate_mode(%s, %i, %i, %i)", name, w, h, vrefresh)
-         #monitor settings as set in xorg.conf...
-        cdef unsigned long maxPixelClock = 30*1000*1000*1000    #30,000 MHz
-         cdef unsigned int minHSync = 1*1000                     #1KHz
-         cdef unsigned int maxHSync = 300*1000                   #300KHz
-         cdef unsigned int minVSync = 1                          #1Hz
-@@ -622,31 +621,21 @@ cdef class RandRBindingsInstance(X11CoreBindingsInstance):
-         yBack = round(h * timeVBack)
-         yTotal = h + yFront + ySync + yBack
- 
-        cdef unsigned long modeMaxClock = maxPixelClock
-        if (maxHSync * xTotal)<maxPixelClock:
-            modeMaxClock = maxHSync * xTotal
-        tmp = maxVSync * xTotal * yTotal * yFactor
-        if tmp<modeMaxClock:
-            modeMaxClock = tmp
-        cdef unsigned long modeMinClock = minHSync * xTotal
-        # Monitor minVSync too low? => increase mode minimum pixel clock
-        tmp = minVSync * xTotal * yTotal * yFactor
-        if tmp > modeMinClock:
-            modeMinClock = tmp
-+        if sizeof(long)<=4:
-+            maxPixelClock = 0xffffffff
-+        else:
-+            maxPixelClock = 30*1000*1000*1000    #30,000 MHz
-+        modeMaxClock = min(maxPixelClock, maxHSync * xTotal, maxVSync * xTotal * yTotal * yFactor)
-+        modeMinClock = max(minHSync * xTotal, minVSync * xTotal * yTotal * yFactor)
-         # If minimum clock > maximum clock, the mode is impossible...
-         if modeMinClock > modeMaxClock:
-            log.warn("Warning: cannot add mode %s", name)
-            log.warn(" clock %iHz is above maximum value %iHz", modeMinClock, modeMaxClock)
-+            log.warn(f"Warning: cannot add mode {name}")
-+            log.warn(f" clock {modeMinClock}Hz is above maximum value {modeMaxClock}Hz")
-             log.warn(" no suitable clocks could be found")
-             return NULL
- 
-         idealClock = idealVSync * xTotal * yTotal * yFactor
-        cdef unsigned long clock = idealClock
-        if clock < modeMinClock:
-            clock = modeMinClock
-        elif clock > modeMaxClock:
-            clock = modeMaxClock
-
-+        cdef unsigned long clock = min(modeMaxClock, max(modeMinClock, idealClock))
-         log("Modeline %ix%i@%i %s %s %s %s %s %s %s %s %s", w, h, round(vrefresh/1000),
-                         clock/1000/1000,
-                         w, w+xFront, w+xFront+xSync, xTotal,
--- a/xpra-4.4.5-add_missing_fake_function.patch
+++ b/xpra-4.4.5-add_missing_fake_function.patch
@ -1,21 +0,0 @@
-From a5bccfca2cae9b64528b140e90568d2fa899fd97 Mon Sep 17 00:00:00 2001
-From: totaam <antoine@xpra.org>
-Date: Wed, 24 May 2023 12:38:44 +0700
-Subject: [PATCH] #3860 add missing fake function
-
---
- xpra/client/gl/window_backend.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/xpra/client/gl/window_backend.py b/xpra/client/gl/window_backend.py
-index 53b27a0516..d766ca925c 100755
--- a/xpra/client/gl/window_backend.py
-+++ b/xpra/client/gl/window_backend.py
-@@ -69,6 +69,7 @@ def noop(*_args):
-         self.server_readonly = False
-         self.server_pointer = False
-         self.update_focus = noop
-+        self.has_focus = noop
-         self.handle_key_action = noop
-         self.window_ungrab = noop
-         self.idle_add = no_idle_add
--- a/xpra-6.2.2-pam-1.7.0.patch
+++ b/xpra-6.2.2-pam-1.7.0.patch
@ -0,0 +1,17 @@
+--- xpra-6.2.2/xpra/server/pam.pyx.orig	2024-12-29 12:13:57.205571587 +0100
+++ xpra-6.2.2/xpra/server/pam.pyx	2024-12-29 12:14:21.275363955 +0100
+@@ -36,12 +36,12 @@
+ cdef extern from "stdlib.h":
+     void *calloc(size_t nitems, size_t size)
+ 
+-cdef extern from "pam_misc.h":
+cdef extern from "security/pam_misc.h":
+     ctypedef struct pam_handle_t:
+         pass
+     void misc_conv(int num_msg, const pam_message **msgm, pam_response **response, void *appdata_ptr)
+ 
+-cdef extern from "pam_appl.h":
+cdef extern from "security/pam_appl.h":
+     struct pam_conv:
+         void *conv
+         #int (*conv)(int num_msg, const pam_message **msg, pam_response **resp, void *appdata_ptr)
--- a/xpra.spec
+++ b/xpra.spec
@ -1,5 +1,5 @@
 Name:          xpra
-Version:       6.1.3
+Version:       6.2.2
 Release:       1mamba
 Summary:       A tool like screen for X allowing to direct X programs display to another X host
 Group:         Graphical Desktop/Applications/Utilities
@ -8,8 +8,7 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://github.com/Xpra-org/xpra/
 Source:        http://xpra.org/src/xpra-%{version}.tar.xz
-Patch0:        xpra-4.4.2-upstream_clamp_clock_values_to_unsigned_long.patch
-Patch1:        xpra-4.4.5-add_missing_fake_function.patch
+Patch0:        xpra-6.2.2-pam-1.7.0.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@ -32,7 +31,7 @@ BuildRequires: libgdk-pixbuf-devel
 BuildRequires: libglib-devel
 BuildRequires: libgtk3-devel
 BuildRequires: libharfbuzz-devel
-BuildRequires: libjpeg-devel
+BuildRequires: libjpeg-turbo
 BuildRequires: liblz4-devel
 BuildRequires: libopenh264-devel
 BuildRequires: libpam-devel
@ -77,13 +76,13 @@ Xpra is 'screen for X' -- it allows you to run X programs, usually on a remote h
 %setup -q
 #-D -T
 #:<< _EOF
-#%patch 0 -p1 -b .upstream_clamp_clock_values_to_unsigned_long
-#%patch 1 -p1 -b .add_missing_fake_function
+%patch 0 -p1

 sed -i "s|systemd_dir = .*|systemd_dir = \"%{_unitdir}\"|" setup.py

 %build
-CFLAGS="%{optflags}" %{__python3} setup.py build --without-nvidia
+CFLAGS="%{optflags}" %{__python3} setup.py build \
+   --without-nvidia --without-cuda_kernels

 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
@ -93,6 +92,7 @@ CFLAGS="%{optflags}" %{__python3} setup.py build --without-nvidia
   --install-headers=%{python3_inc} \
   --install-lib=%{python3_sitearch} \
   --without-docs \
+   --without-nvidia --without-cuda_kernels \
   --record=%{name}.filelist

 sed -i "s|%{buildroot}||" %{buildroot}%{_sysconfdir}/xpra/conf.d/55_server_x11.conf
@ -166,6 +166,9 @@ fi
 %doc COPYING

 %changelog
+* Fri Dec 27 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 6.2.2-1mamba
+- update to 6.2.2
+
 * Sat Oct 05 2024 Automatic Build System <autodist@openmamba.org> 6.1.3-1mamba
 - automatic version update by autodist