From b29ac8fbaceeac7f902fc75bb94a13b9cd9a0465 Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Wed, 7 Apr 2021 13:10:43 -0500
Subject: util/uuid: replace with util/token, remove libuuid

Use 128-bit hexadecimal string tokens generated with /dev/urandom
instead of UUIDs for xdg-foreign handles, removing the libuuid
dependency. Update readme and CI. Closes #2830.

build: remove xdg-foreign feature

With no external dependencies required, there's no reason not to always
build it. Remove WLR_HAS_XDG_FOREIGN as well.
---
 include/meson.build     | 7 -------
 include/util/token.h    | 9 +++++++++
 include/util/uuid.h     | 8 --------
 include/wlr/config.h.in | 2 --
 4 files changed, 9 insertions(+), 17 deletions(-)
 create mode 100644 include/util/token.h
 delete mode 100644 include/util/uuid.h

(limited to 'include')

diff --git a/include/meson.build b/include/meson.build
index c72eada5..747e5984 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -9,13 +9,6 @@ if not features.get('xwayland')
 else
 	subdir('xwayland')
 endif
-if not features.get('xdg-foreign')
-	exclude_files += [
-		'types/wlr_xdg_foreign_v1.h',
-		'types/wlr_xdg_foreign_v2.h',
-		'types/wlr_xdg_foreign_registry.h',
-	]
-endif
 
 install_subdir('wlr',
 	install_dir: get_option('includedir'),
diff --git a/include/util/token.h b/include/util/token.h
new file mode 100644
index 00000000..bdfdaf45
--- /dev/null
+++ b/include/util/token.h
@@ -0,0 +1,9 @@
+#ifndef UTIL_TOKEN_H
+#define UTIL_TOKEN_H
+
+#include <stdbool.h>
+
+#define TOKEN_STRLEN 33
+bool generate_token(char out[static TOKEN_STRLEN]);
+
+#endif
diff --git a/include/util/uuid.h b/include/util/uuid.h
deleted file mode 100644
index 2fecb407..00000000
--- a/include/util/uuid.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef UTIL_UUID_H
-#define UTIL_UUID_H
-
-#include <stdbool.h>
-
-bool generate_uuid(char out[static 37]);
-
-#endif
diff --git a/include/wlr/config.h.in b/include/wlr/config.h.in
index 15aacbfe..bcea55a1 100644
--- a/include/wlr/config.h.in
+++ b/include/wlr/config.h.in
@@ -7,6 +7,4 @@
 
 #mesondefine WLR_HAS_XWAYLAND
 
-#mesondefine WLR_HAS_XDG_FOREIGN
-
 #endif
-- 
cgit v1.2.3