pool/xrdp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 783661 from home:zhangxiaofei:branches:X11:RemoteDesktop

Browse Source 
- Update xrdp-avahi.diff: Fix implicit definitions errors.

OBS-URL: https://build.opensuse.org/request/show/783661
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=74
This commit is contained in:
Tomáš Chvátal 2020-03-11 09:52:18 +00:00 committed by Git OBS Bridge
parent cb8de94a4a
commit 971a6e448f
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xrdp-avahi.diff
View File

@ -1,7 +1,7 @@
Index: b/configure.ac Index: b/configure.ac
=================================================================== ===================================================================
--- a/configure.ac 2019-08-19 23:39:17.000000000 +0800 --- a/configure.ac 2020-03-11 15:31:17.466041360 +0800
+++ b/configure.ac 2019-10-12 18:00:31.198468206 +0800 +++ b/configure.ac 2020-03-11 15:31:17.466041360 +0800
@@ -9,6 +9,7 @@ AC_PROG_CC @@ -9,6 +9,7 @@ AC_PROG_CC
AC_C_CONST AC_C_CONST
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
@ -12,8 +12,8 @@ Index: b/configure.ac
AC_MSG_ERROR([please install pkg-config]) AC_MSG_ERROR([please install pkg-config])
Index: b/xrdp/Makefile.am Index: b/xrdp/Makefile.am
=================================================================== ===================================================================
--- a/xrdp/Makefile.am 2019-03-25 10:34:16.000000000 +0800 --- a/xrdp/Makefile.am 2020-03-11 15:31:17.466041360 +0800
+++ b/xrdp/Makefile.am 2019-10-12 17:56:20.380230201 +0800 +++ b/xrdp/Makefile.am 2020-03-11 15:31:17.466041360 +0800
@@ -12,7 +12,9 @@ AM_CPPFLAGS = \ @@ -12,7 +12,9 @@ AM_CPPFLAGS = \
-DXRDP_SOCKET_PATH=\"${socketdir}\" \ -DXRDP_SOCKET_PATH=\"${socketdir}\" \
-I$(top_builddir) \ -I$(top_builddir) \
@ -45,8 +45,8 @@ Index: b/xrdp/Makefile.am
Index: b/xrdp/xrdp.h Index: b/xrdp/xrdp.h
=================================================================== ===================================================================
--- a/xrdp/xrdp.h 2019-08-19 23:39:17.000000000 +0800 --- a/xrdp/xrdp.h 2020-03-11 15:31:17.466041360 +0800
+++ b/xrdp/xrdp.h 2019-10-12 17:56:20.380230201 +0800 +++ b/xrdp/xrdp.h 2020-03-11 15:31:17.466041360 +0800
@@ -527,3 +527,10 @@ server_add_char_alpha(struct xrdp_mod* m @@ -527,3 +527,10 @@ server_add_char_alpha(struct xrdp_mod* m
int int
server_session_info(struct xrdp_mod *mod, const char *data, int data_bytes); server_session_info(struct xrdp_mod *mod, const char *data, int data_bytes);
@ -61,8 +61,8 @@ Index: b/xrdp/xrdp.h
Index: b/xrdp/xrdp_avahi.c Index: b/xrdp/xrdp_avahi.c
=================================================================== ===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ b/xrdp/xrdp_avahi.c 2019-10-12 17:56:20.380230201 +0800 +++ b/xrdp/xrdp_avahi.c 2020-03-11 15:46:17.611966870 +0800
@@ -0,0 +1,173 @@ @@ -0,0 +1,176 @@
+/* +/*
+ This program is free software; you can redistribute it and/or modify + This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by + it under the terms of the GNU General Public License as published by
@ -85,6 +85,9 @@ Index: b/xrdp/xrdp_avahi.c
+ +
+*/ +*/
+ +
+#include <stdio.h>
+#include <unistd.h>
+
+#include <avahi-client/client.h> +#include <avahi-client/client.h>
+#include <avahi-client/publish.h> +#include <avahi-client/publish.h>
+#include <avahi-common/thread-watch.h> +#include <avahi-common/thread-watch.h>
@ -238,8 +241,8 @@ Index: b/xrdp/xrdp_avahi.c
+} +}
Index: b/common/arch.h Index: b/common/arch.h
=================================================================== ===================================================================
--- a/common/arch.h 2019-10-12 18:00:48.462622251 +0800 --- a/common/arch.h 2020-03-11 15:31:17.466041360 +0800
+++ b/common/arch.h 2019-10-12 18:01:11.506827870 +0800 +++ b/common/arch.h 2020-03-11 15:31:17.466041360 +0800
@@ -20,28 +20,7 @@ @@ -20,28 +20,7 @@
#define ARCH_H #define ARCH_H

5
xrdp.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 11 07:52:20 UTC 2020 - Felix Zhang <fzhang.foss@gmail.com>
- Update xrdp-avahi.diff: Fix implicit definitions errors.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 8 01:39:00 UTC 2020 - Cristian Rodríguez <crrodriguez@opensuse.org> Sat Feb 8 01:39:00 UTC 2020 - Cristian Rodríguez <crrodriguez@opensuse.org>