From bd1644fe24b210e808a06ccee0d513d54451e2c0 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@gmail.com>
Date: Jul 16 2022 22:05:31 +0000
Subject: Update to 5.4.0 release


---

diff --git a/7673a6c136ab66e3670919460a87f8887f0ba9b7.patch b/7673a6c136ab66e3670919460a87f8887f0ba9b7.patch
new file mode 100644
index 0000000..879b40a
--- /dev/null
+++ b/7673a6c136ab66e3670919460a87f8887f0ba9b7.patch
@@ -0,0 +1,36 @@
+From 7673a6c136ab66e3670919460a87f8887f0ba9b7 Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 16 Jul 2022 13:50:21 -0400
+Subject: [PATCH] build: Try to find libxdo with pkgconfig, and use
+ find_library() only if that fails.
+
+Ubuntu/Mint doesn't have a .pc file, so we rely on find_library(),
+but this isn't necessarily the case everywhere else.
+
+Bug report to add the pc file to Ubuntu's packaging:
+https://bugs.launchpad.net/ubuntu/+source/xdotool/+bug/1981895
+---
+ meson.build | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 02b34ba..3ef0fd0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -44,7 +44,15 @@ x11 = dependency('x11')
+ xext = dependency('xext')
+ xrandr = dependency('xrandr', required: false)
+ m = cc.find_library('m')
+-xdo = cc.find_library('xdo')
++
++xdo = dependency('libxdo', required: false)
++if not xdo.found()
++  xdo = cc.find_library('xdo')
++    if not xdo.found()
++      error('could not find usable xdo library (libxdo')
++    endif
++endif
++
+ dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', datadir])
+ 
+ # check for symbols and headers
diff --git a/cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch b/cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch
new file mode 100644
index 0000000..e4490f1
--- /dev/null
+++ b/cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch
@@ -0,0 +1,24 @@
+From cfd87cb63316608e7f2a64f68eedcc09cc03d0da Mon Sep 17 00:00:00 2001
+From: Michael Webster <miketwebster@gmail.com>
+Date: Sat, 16 Jul 2022 13:56:13 -0400
+Subject: [PATCH] Don't try to throw an error if libxdo can't be found - meson
+ will already do this if required == true.
+
+---
+ meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 3ef0fd0..e139718 100644
+--- a/meson.build
++++ b/meson.build
+@@ -48,9 +48,6 @@ m = cc.find_library('m')
+ xdo = dependency('libxdo', required: false)
+ if not xdo.found()
+   xdo = cc.find_library('xdo')
+-    if not xdo.found()
+-      error('could not find usable xdo library (libxdo')
+-    endif
+ endif
+ 
+ dbus_services_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', datadir])
diff --git a/cinnamon-screensaver.spec b/cinnamon-screensaver.spec
index a9bc8fd..8e4c68a 100644
--- a/cinnamon-screensaver.spec
+++ b/cinnamon-screensaver.spec
@@ -1,10 +1,12 @@
 Summary: Cinnamon Screensaver
 Name:    cinnamon-screensaver
-Version: 5.4.0
+Version: 5.4.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL:     https://github.com/linuxmint/%{name}
 Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+Patch0:  %{url}/commit/7673a6c136ab66e3670919460a87f8887f0ba9b7.patch
+Patch1:  %{url}/commit/cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch
 
 ExcludeArch: %{ix86}
 
@@ -17,6 +19,7 @@ BuildRequires: pam-devel
 BuildRequires: python3-devel
 BuildRequires: gtk3-devel
 BuildRequires: libXext-devel
+BuildRequires: libxdo-devel
 BuildRequires: desktop-file-utils
 
 Requires: cinnamon-desktop%{?_isa} >= 5.4.0
@@ -92,6 +95,9 @@ rm %{buildroot}%{_datadir}/gir-1.0/CScreensaver-1.0.gir
 %{_libdir}/girepository-1.0/CScreensaver-1.0.typelib
 
 %changelog
+* Sat Jul 16 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.1-1
+- Update to 5.4.1 release
+
 * Fri Jun 10 2022 Leigh Scott <leigh123linux@gmail.com> - 5.4.0-1
 - Update to 5.4.0 release
 
diff --git a/sources b/sources
index 94bb68c..9495561 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cinnamon-screensaver-5.4.0.tar.gz) = 160029cfeb6d6fae40e2cfc928b60c0d61a9ee7ba037cf92150990de0562f0d03a7917ce3e24ed7ff51af764cedd7e088d9d40bd4c5c7827e40d50047beb42ce
+SHA512 (cinnamon-screensaver-5.4.1.tar.gz) = 2f8ab0b0633ccc03a5350a0629c3434604f8ad8e8c46f62f48ffd4150c30c865d9de1f21ad9a022e9954ed1c73431d7518d563771e6321d39af3e4cfa5a626b6