[packages/freerdp3] - patch for heimdal, restored webkit support; release 2

[qboosh]

commit 01c2f43af38af2eea7c6c1035fbcef039fc1af31
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Oct 26 13:22:12 2024 +0200

    - patch for heimdal, restored webkit support; release 2

 freerdp-heimdal.patch | 19 +++++++++++++++++++
 freerdp3.spec         | 10 +++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
---
diff --git a/freerdp3.spec b/freerdp3.spec
index 5d41e27..1e2a805 100644
--- a/freerdp3.spec
+++ b/freerdp3.spec
@@ -41,13 +41,14 @@ Summary:	Remote Desktop Protocol client
 Summary(pl.UTF-8):	Klient protokołu RDP
 Name:		freerdp3
 Version:	3.9.0
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Applications/Communications
 Source0:	https://pub.freerdp.com/releases/freerdp-%{version}.tar.xz
 # Source0-md5:	bc2a02e5eeae0ae17027f64d16de1cc5
 Patch0:		freerdp-opt.patch
 Patch1:		freerdp-gsm.patch
+Patch2:		freerdp-heimdal.patch
 URL:		https://www.freerdp.com/
 %{?with_opencl:BuildRequires:	OpenCL-devel}
 %{?with_sdl:BuildRequires:	SDL2-devel >= 2.0}
@@ -69,9 +70,10 @@ BuildRequires:	gcc >= 6:4.7
 BuildRequires:	glib2-devel >= 2.0
 %{?with_gstreamer:BuildRequires:	gstreamer-devel >= 1.0.5}
 %{?with_gstreamer:BuildRequires:	gstreamer-plugins-base-devel >= 1.0.5}
-BuildRequires:	gtk-webkit4-devel
+# or gtk-webkit4
+BuildRequires:	gtk-webkit4.1-devel
 BuildRequires:	gtk+3-devel >= 3.0
-# or MIT krb5 >= 1.14
+# or MIT krb5 >= 1.14 (without heimdal patch)
 %{?with_kerberos5:BuildRequires:	heimdal-devel}
 %{?with_lame:BuildRequires:	lame-libs-devel}
 BuildRequires:	libfuse3-devel >= 3
@@ -249,6 +251,7 @@ Pliki nagłówkowe biblioteki uwac.
 %setup -q -n freerdp-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 cat << EOF > xfreerdp.desktop
 [Desktop Entry]
@@ -301,6 +304,7 @@ EOF
 	%{cmake_on_off ffmpeg WITH_VAAPI} \
 	%{cmake_on_off ffmpeg WITH_VIDEO_FFMPEG} \
 	%{cmake_on_off wayland WITH_WAYLAND} \
+	-DWITH_WEBVIEW=ON \
 	%{cmake_on_off x11 WITH_X11} \
 	-DWITH_XCURSOR=ON \
 	-DWITH_XEXT=ON \
diff --git a/freerdp-heimdal.patch b/freerdp-heimdal.patch
new file mode 100644
index 0000000..35e48a3
--- /dev/null
+++ b/freerdp-heimdal.patch
@@ -0,0 +1,19 @@
+--- freerdp-3.9.0/winpr/libwinpr/sspi/Kerberos/kerberos.c.orig	2024-10-21 15:36:02.000000000 +0200
++++ freerdp-3.9.0/winpr/libwinpr/sspi/Kerberos/kerberos.c	2024-10-26 12:50:31.202989647 +0200
+@@ -238,14 +238,14 @@ static BOOL isValidIP(const char* ipAddr
+ 	return isValidIPv4(ipAddress) || isValidIPv6(ipAddress);
+ }
+ 
+-static int build_krbtgt(krb5_context ctx, krb5_data* realm, krb5_principal* ptarget)
++static int build_krbtgt(krb5_context ctx, Realm* realm, krb5_principal* ptarget)
+ {
+ 	/* "krbtgt/" + realm + "@" + realm */
+ 	size_t len = 0;
+ 	char* name = NULL;
+ 	krb5_error_code rv = KRB5_CC_NOMEM;
+ 
+-	(void)winpr_asprintf(&name, &len, "krbtgt/%s@%s", realm->data, realm->data);
++	(void)winpr_asprintf(&name, &len, "krbtgt/%s@%s", realm, realm);
+ 	if (!name || (len == 0))
+ 		goto fail;
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/freerdp3.git/commitdiff/01c2f43af38af2eea7c6c1035fbcef039fc1af31