From cd4c45f9973bf05752633658c1907554554132ea Mon Sep 17 00:00:00 2001
From: Zephyr Lykos <git@mochaa.ws>
Date: Sun, 21 Apr 2024 20:42:11 +0800
Subject: [PATCH 1/2] build: fetch gtk-session-lock as a subproject when not
 present on system

---
 .gitignore                        | 1 +
 subprojects/gtk-session-lock.wrap | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 subprojects/gtk-session-lock.wrap

diff --git a/.gitignore b/.gitignore
index 5c68d9c..e55a014 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /builddir/
+/subprojects/*/
diff --git a/subprojects/gtk-session-lock.wrap b/subprojects/gtk-session-lock.wrap
new file mode 100644
index 0000000..e62c9b8
--- /dev/null
+++ b/subprojects/gtk-session-lock.wrap
@@ -0,0 +1,8 @@
+[wrap-git]
+directory = gtk-session-lock
+url = https://github.com/Cu3PO42/gtk-session-lock
+revision = b3544f361498d716b1ceef1ad6ac9bdf024bf782
+
+[provide]
+dependency_names = gtk-session-lock-0
+gtk-session-lock-0 = gtk_session_lock

From 0409880e3a159908a3d0b0d90e32c6574b94af2c Mon Sep 17 00:00:00 2001
From: Zephyr Lykos <git@mochaa.ws>
Date: Sun, 21 Apr 2024 20:51:03 +0800
Subject: [PATCH 2/2] modules: handle multiarch systems' libdir

---
 meson.build  |  8 +++++++-
 src/module.c | 13 +++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index d0f081e..4f495f3 100644
--- a/meson.build
+++ b/meson.build
@@ -34,13 +34,19 @@ gtklock_set = [
   ui_resources,
 ]
 
+if import('fs').is_absolute(get_option('libdir'))
+  libdir = get_option('libdir')
+else
+  libdir = get_option('prefix') / get_option('libdir')
+endif
+
 executable(
   meson.project_name(),
   gtklock_set,
   include_directories : 'include',
   dependencies : dependencies,
   c_args : [
-    '-DPREFIX=' + get_option('prefix'),
+    '-DLIBDIR=' + libdir,
     '-DMAJOR_VERSION=' + major_version,
     '-DMINOR_VERSION=' + minor_version,
     '-DMICRO_VERSION=' + micro_version,
diff --git a/src/module.c b/src/module.c
index ce65ecf..0bb50cd 100644
--- a/src/module.c
+++ b/src/module.c
@@ -6,9 +6,18 @@
 #include "util.h"
 #include "module.h"
 
+#ifndef LIBDIR
+
+#warning LIBDIR not defined.
+
 #ifndef PREFIX
 #warning PREFIX not defined.
-#define PREFIX /usr/local
+#define LIBDIR /usr/local/lib
+#else
+#warning PREFIX is soft-deprecated. Define LIBDIR instead.
+#define LIBDIR PREFIX/lib
+#endif
+
 #endif
 
 #ifndef MAJOR_VERSION
@@ -36,7 +45,7 @@ GModule *module_load(const char *name) {
 		if(g_file_test(name, G_FILE_TEST_IS_REGULAR)) path = g_strdup(name);
 		else {
 			g_free(path);
-			path = g_build_path("/", STR(PREFIX)"/lib/gtklock", name, NULL);
+			path = g_build_path("/", STR(LIBDIR) "/gtklock", name, NULL);
 		}
 	}