From 504eee2c569af2a2518e968c2e1ab32a8e6dd8ca Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin.wimpress@ubuntu.com>
Date: Mon, 17 Aug 2020 16:51:50 +0100
Subject: [PATCH] debian/patches: Refactor
 1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch

---
 ...stored-monitor-configuration-if-sess.patch | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch b/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch
index 292dc7b..93e6180 100644
--- a/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch
+++ b/debian/patches/1001_RDA-Don-t-apply-stored-monitor-configuration-if-sess.patch
@@ -1,4 +1,4 @@
-From f6254cafe0920ecc8e3d96becbd83d297cb158c4 Mon Sep 17 00:00:00 2001
+From c575333eb75e944801cfe3caf09f4dd7820a28dc Mon Sep 17 00:00:00 2001
 From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
 Date: Wed, 18 Dec 2019 09:11:12 +0100
 Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
@@ -12,18 +12,19 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -58,6 +58,7 @@
+@@ -59,6 +59,7 @@ MATE_DESKTOP_REQUIRED_VERSION=1.23.2
  LIBMATEKBD_REQUIRED_VERSION=1.17.0
  LIBNOTIFY_REQUIRED_VERSION=0.7.0
  LIBMATEMIXER_REQUIRED_VERSION=1.10.0
 +RDA_REQUIRED_VERSION=0.0.3
  
- EXTRA_COMPILE_WARNINGS(yes)
+ PKG_CHECK_MODULES(SETTINGS_DAEMON,
+ 	glib-2.0 >= $GLIB_REQUIRED_VERSION
+@@ -363,6 +364,15 @@ fi
  
-@@ -365,6 +366,15 @@
  AM_CONDITIONAL(BUILD_RFKILL, [test x"$enable_rfkill" = x"yes"])
  
- # ---------------------------------------------------------------------------
++# ---------------------------------------------------------------------------
 +# - Check if Remote Desktop Awareness support is available
 +# ---------------------------------------------------------------------------
 +
@@ -32,11 +33,10 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
 +  AC_DEFINE(HAVE_RDA, 1, [Have the Remote Desktop Awareness library])
 +fi
 +
-+# ---------------------------------------------------------------------------
+ # ---------------------------------------------------------------------------
  # Enable Profiling
  # ---------------------------------------------------------------------------
- AC_ARG_ENABLE(profiling,
-@@ -537,4 +547,5 @@
+@@ -498,4 +508,5 @@ ${NSS_DATABASE:+\
      System nssdb:             ${NSS_DATABASE}
  }\
      Profiling support:        ${enable_profiling}
@@ -44,15 +44,15 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
  "
 --- a/plugins/xrandr/Makefile.am
 +++ b/plugins/xrandr/Makefile.am
-@@ -55,6 +55,7 @@
+@@ -67,6 +67,7 @@ libxrandr_la_CPPFLAGS =						\
  libxrandr_la_CFLAGS =			\
  	$(SETTINGS_PLUGIN_CFLAGS)	\
  	$(LIBNOTIFY_CFLAGS)		\
 +	$(RDA_CFLAGS)			\
  	$(MATE_DESKTOP_CFLAGS)		\
- 	$(AM_CFLAGS)
- 
-@@ -64,6 +65,7 @@
+ 	$(AM_CFLAGS)			\
+ 	$(WARN_CFLAGS)
+@@ -77,6 +78,7 @@ libxrandr_la_LDFLAGS = 			\
  libxrandr_la_LIBADD  =			\
  	$(SETTINGS_PLUGIN_LIBS)		\
  	$(LIBNOTIFY_LIBS)		\
@@ -73,7 +73,7 @@ Subject: [PATCH] RDA: Don't apply stored monitor configuration if session is
  #include "mate-settings-profile.h"
  #include "msd-xrandr-manager.h"
  
-@@ -2418,6 +2422,12 @@
+@@ -2405,6 +2409,12 @@ apply_intended_configuration (MsdXrandrManager *manager, const char *intended_fi
          GError *my_error;
          gboolean result;