diff options
Diffstat (limited to 'meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch')
-rw-r--r-- | meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch b/meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch new file mode 100644 index 0000000000..4baf905b71 --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf-3.2.3/backenddir.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | Allow the backend directory to be specified from the environment. This is | ||
2 | required so we can relocate gconf-native to different paths and still | ||
3 | allow it to work. | ||
4 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | RP 2011/11/23 | ||
8 | |||
9 | Index: GConf-3.2.3/gconf/gconf-backend.c | ||
10 | =================================================================== | ||
11 | --- GConf-3.2.3.orig/gconf/gconf-backend.c 2011-07-01 14:01:20.000000000 +0100 | ||
12 | +++ GConf-3.2.3/gconf/gconf-backend.c 2011-11-23 14:56:37.141293320 +0000 | ||
13 | @@ -21,6 +21,7 @@ | ||
14 | #include <config.h> | ||
15 | #include "gconf-backend.h" | ||
16 | #include "gconf-internals.h" | ||
17 | +#include <stdlib.h> | ||
18 | #include <stdio.h> | ||
19 | #include <string.h> | ||
20 | #include <sys/stat.h> | ||
21 | @@ -171,6 +172,7 @@ | ||
22 | gchar* back; | ||
23 | gchar* file; | ||
24 | gchar* retval; | ||
25 | + const gchar* backenddir; | ||
26 | |||
27 | g_return_val_if_fail(address != NULL, NULL); | ||
28 | |||
29 | @@ -179,9 +181,13 @@ | ||
30 | if (back == NULL) | ||
31 | return NULL; | ||
32 | |||
33 | + backenddir = getenv("GCONF_BACKEND_DIR"); | ||
34 | + if (backenddir == NULL) | ||
35 | + backenddir = GCONF_BACKEND_DIR; | ||
36 | + | ||
37 | file = g_strconcat("gconfbackend-", back, NULL); | ||
38 | |||
39 | - retval = g_module_build_path(GCONF_BACKEND_DIR, file); | ||
40 | + retval = g_module_build_path(backenddir, file); | ||
41 | |||
42 | g_free(back); | ||
43 | |||