From 7a56ab6a140de187973173801d7a58d5280319e3 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Tue, 26 Jul 2022 22:15:15 +0300
Subject: [PATCH] cinnamon-screensaver-5.4.1

---
 ...a6c136ab66e3670919460a87f8887f0ba9b7.patch | 36 +++++++++++++++++++
 ...7cb63316608e7f2a64f68eedcc09cc03d0da.patch | 24 +++++++++++++
 .../cinnamon/cinnamon-screensaver/pspec.xml   | 16 ++++++++-
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 desktop/cinnamon/cinnamon-screensaver/files/7673a6c136ab66e3670919460a87f8887f0ba9b7.patch
 create mode 100644 desktop/cinnamon/cinnamon-screensaver/files/cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch

diff --git a/desktop/cinnamon/cinnamon-screensaver/files/7673a6c136ab66e3670919460a87f8887f0ba9b7.patch b/desktop/cinnamon/cinnamon-screensaver/files/7673a6c136ab66e3670919460a87f8887f0ba9b7.patch
new file mode 100644
index 0000000000..879b40a1d8
--- /dev/null
+++ b/desktop/cinnamon/cinnamon-screensaver/files/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/desktop/cinnamon/cinnamon-screensaver/files/cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch b/desktop/cinnamon/cinnamon-screensaver/files/cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch
new file mode 100644
index 0000000000..e4490f10a9
--- /dev/null
+++ b/desktop/cinnamon/cinnamon-screensaver/files/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/desktop/cinnamon/cinnamon-screensaver/pspec.xml b/desktop/cinnamon/cinnamon-screensaver/pspec.xml
index 60a02d7ed5..f9d11de298 100644
--- a/desktop/cinnamon/cinnamon-screensaver/pspec.xml
+++ b/desktop/cinnamon/cinnamon-screensaver/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:gui</IsA>
         <Summary>Screensaver designed to integrate well with the Cinnamon desktop</Summary>
         <Description>Screensaver designed to integrate well with the Cinnamon desktop</Description>
-        <Archive sha1sum="43acecb2a67eeb2f99ac69d2de647adfcc3c38eb" type="targz">https://github.com/linuxmint/cinnamon-screensaver/archive/refs/tags/5.4.0.tar.gz</Archive>
+        <Archive sha1sum="0fed1d8d53bf2efbf4fe38c811f6ad150da28f39" type="targz">https://github.com/linuxmint/cinnamon-screensaver/archive/refs/tags/5.4.1.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>gnome-common</Dependency>
             <Dependency>meson</Dependency>
@@ -21,6 +21,7 @@
             <Dependency>intltool</Dependency>
             <Dependency>glib2-devel</Dependency>
             <Dependency>gtk3-devel</Dependency>
+            <Dependency>xdotool-devel</Dependency>
             <Dependency>gobject-introspection-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
@@ -47,6 +48,10 @@
             <Dependency>libXxf86vm-devel</Dependency>
             <Dependency>libgnome-keyring</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch level="1">7673a6c136ab66e3670919460a87f8887f0ba9b7.patch</Patch>
+            <Patch level="1">cfd87cb63316608e7f2a64f68eedcc09cc03d0da.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -55,6 +60,7 @@
             <Dependency>pam</Dependency>
             <Dependency>xapp</Dependency>
             <Dependency>pango</Dependency>
+            <Dependency>xdotool</Dependency>
             <Dependency>libXrandr</Dependency>
             <Dependency>python3-cairo</Dependency>
             <Dependency>python3-xapp</Dependency>
@@ -102,6 +108,7 @@
             <Dependency>glib2-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
             <Dependency>libXext-devel</Dependency>
+            <Dependency>xdotool-devel</Dependency>
             <Dependency>libXinerama-devel</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -112,6 +119,13 @@
     </Package>
 
     <History>
+        <Update release="2">
+            <Date>2022-07-26</Date>
+            <Version>5.4.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="1">
             <Date>2022-06-30</Date>
             <Version>5.4.0</Version>