summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-02-25 11:49:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-25 05:58:19 -0800
commit8918247ead32d1f2423c6b419a19801ad1e8173d (patch)
tree829f96aa1fefadd7205d7f1bd4e29b7742d40d08 /meta
parente96d541c8edccbb69602eace900ce9293ee12d22 (diff)
downloadpoky-8918247ead32d1f2423c6b419a19801ad1e8173d.tar.gz
gconf: add patch to remove '+' from invalid characters list
This will allow gconftool-2 to run when configuration source addresses contain the '+' sign. [YOCTO #3893] (From OE-Core rev: 5ba4d947189f76692ea6cc75500d9295417a2055) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch19
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.5.bb1
2 files changed, 20 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch b/meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch
new file mode 100644
index 0000000000..59a7ca7802
--- /dev/null
+++ b/meta/recipes-gnome/gnome/gconf-3.2.5/remove_plus_from_invalid_characters_list.patch
@@ -0,0 +1,19 @@
1Upstream-Status: Pending
2
3Remove '+' from invalid characters list
4
5Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
6
7Index: GConf-3.2.5/gconf/gconf-backend.c
8===================================================================
9--- GConf-3.2.5.orig/gconf/gconf-backend.c
10+++ GConf-3.2.5/gconf/gconf-backend.c
11@@ -37,7 +37,7 @@ static const char invalid_chars[] =
12 /* Space is common in user names (and thus home directories) on Windows */
13 " "
14 #endif
15- "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\";
16+ "\t\r\n\"$&<>,=#!()'|{}[]?~`;%\\";
17
18 static gboolean
19 gconf_address_valid (const char *address,
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.5.bb b/meta/recipes-gnome/gnome/gconf_3.2.5.bb
index c80c0b00f2..abdf15169a 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.5.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.5.bb
@@ -15,6 +15,7 @@ inherit gnomebase gtk-doc
15 15
16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \ 16SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \
17 file://obsolete_automake_macros.patch \ 17 file://obsolete_automake_macros.patch \
18 file://remove_plus_from_invalid_characters_list.patch \
18" 19"
19 20
20S = "${WORKDIR}/GConf-${PV}" 21S = "${WORKDIR}/GConf-${PV}"