From 968a68c2dfbfd4b51cdabacb941eb309ac771fafba6400949569e670d5078cfe Mon Sep 17 00:00:00 2001 From: Johannes Weberhofer Date: Fri, 17 Apr 2020 09:57:34 +0000 Subject: [PATCH] Accepting request 794847 from home:marxin:branches:X11:RemoteDesktop - Add fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch in order to fix boo#1169748. OBS-URL: https://build.opensuse.org/request/show/794847 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=95 --- fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch | 34 ++++++++++++++++++++ freerdp.changes | 6 ++++ freerdp.spec | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch diff --git a/fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch b/fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch new file mode 100644 index 0000000..ef6b01f --- /dev/null +++ b/fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch @@ -0,0 +1,34 @@ +From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001 +From: akallabeth +Date: Fri, 10 Apr 2020 14:16:19 +0200 +Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions + +--- + channels/urbdrc/client/urbdrc_main.h | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h +index 5ec839983b..749aaf8727 100644 +--- a/channels/urbdrc/client/urbdrc_main.h ++++ b/channels/urbdrc/client/urbdrc_main.h +@@ -222,14 +222,12 @@ struct _IUDEVMAN + UINT32 status; + }; + +-enum +-{ +- DEVICE_ADD_FLAG_BUS, +- DEVICE_ADD_FLAG_DEV, +- DEVICE_ADD_FLAG_VENDOR, +- DEVICE_ADD_FLAG_PRODUCT, +- DEVICE_ADD_FLAG_REGISTER +-} device_add_flag_t; ++#define DEVICE_ADD_FLAG_BUS 0x01 ++#define DEVICE_ADD_FLAG_DEV 0x02 ++#define DEVICE_ADD_FLAG_VENDOR 0x04 ++#define DEVICE_ADD_FLAG_PRODUCT 0x08 ++#define DEVICE_ADD_FLAG_REGISTER 0x10 ++ + #define DEVICE_ADD_FLAG_ALL \ + (DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR | \ + DEVICE_ADD_FLAG_PRODUCT | DEVICE_ADD_FLAG_REGISTER) diff --git a/freerdp.changes b/freerdp.changes index e12902f..3a6235a 100644 --- a/freerdp.changes +++ b/freerdp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Apr 17 09:37:36 UTC 2020 - Martin Liška + +- Add fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch in order + to fix boo#1169748. + ------------------------------------------------------------------- Mon Apr 13 05:23:54 UTC 2020 - Johannes Weberhofer diff --git a/freerdp.spec b/freerdp.spec index 74b0814..4045f46 100644 --- a/freerdp.spec +++ b/freerdp.spec @@ -37,6 +37,7 @@ License: Apache-2.0 Group: Productivity/Networking/Other URL: https://www.freerdp.com/ Source0: https://github.com/FreeRDP/FreeRDP/archive/%{version}.tar.gz#/FreeRDP-%{version}.tar.gz +Patch0: fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch BuildRequires: chrpath BuildRequires: cmake >= 2.8 BuildRequires: cups-devel @@ -171,6 +172,7 @@ use the uwac library. %prep %setup -q -n FreeRDP-%{version} +%autopatch -p1 %build if [ -z "$SOURCE_DATE_EPOCH" ]; then