From ec7e24aea450b20d328b9509238ab58d503537a8 Mon Sep 17 00:00:00 2001 From: David McKinney Date: Sun, 11 Nov 2018 11:33:01 -0500 Subject: [PATCH] Added meson.build patch to gnome-control-center recipe --- ...-Fix-USER_DIR_MODE-value-in-config.h.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch new file mode 100644 index 0000000..01922fe --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-build-Fix-USER_DIR_MODE-value-in-config.h.patch @@ -0,0 +1,41 @@ +From 37a6b940cb83d97b808da77f397e34100beb263f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?I=C3=B1igo=20Mart=C3=ADnez?= +Date: Sat, 14 Apr 2018 23:06:40 +0200 +Subject: [PATCH] build: Fix `USER_DIR_MODE` value in config.h + +meson defines `USER_DIR_MODE` with a raw octal value to be used as +the default permissions when creating the user's configuration +directory. + +However, meson does not support raw octal values[0], so the define +misses the initial `0` value. Due to this, the directory is created +with wrong permissions. + +This has been changed to use the octal value as a string in meson, +so the definition has the proper value. + +Fixes #49 + +[0] https://github.com/mesonbuild/meson/issues/2047 +--- + meson.build | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index fb74d04d1..ae1a897b3 100644 +--- a/meson.build ++++ b/meson.build +@@ -44,7 +44,9 @@ foreach define: set_defines + config_h.set_quoted(define[0], define[1]) + endforeach + +-config_h.set('USER_DIR_MODE', 0700, ++# meson does not support octal values, so it must be handled as a ++# string. See: https://github.com/mesonbuild/meson/issues/2047 ++config_h.set('USER_DIR_MODE', '0700', + description: 'Permissions for creating the user\'s config, cache and data directories') + + # compiler flags +-- +2.19.1 +