aboutsummaryrefslogtreecommitdiffstats
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
parente96d541c8edccbb69602eace900ce9293ee12d22 (diff)
downloadopenembedded-core-contrib-8918247ead32d1f2423c6b419a19801ad1e8173d.tar.gz
openembedded-core-contrib-8918247ead32d1f2423c6b419a19801ad1e8173d.tar.bz2
openembedded-core-contrib-8918247ead32d1f2423c6b419a19801ad1e8173d.zip
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>
-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 @@
+Upstream-Status: Pending
+
+Remove '+' from invalid characters list
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: GConf-3.2.5/gconf/gconf-backend.c
+===================================================================
+--- GConf-3.2.5.orig/gconf/gconf-backend.c
++++ GConf-3.2.5/gconf/gconf-backend.c
+@@ -37,7 +37,7 @@ static const char invalid_chars[] =
+ /* Space is common in user names (and thus home directories) on Windows */
+ " "
+ #endif
+- "\t\r\n\"$&<>,+=#!()'|{}[]?~`;%\\";
++ "\t\r\n\"$&<>,=#!()'|{}[]?~`;%\\";
+
+ static gboolean
+ 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
SRC_URI = "${GNOME_MIRROR}/GConf/${@gnome_verdir("${PV}")}/GConf-${PV}.tar.xz;name=archive \
file://obsolete_automake_macros.patch \
+ file://remove_plus_from_invalid_characters_list.patch \
"
S = "${WORKDIR}/GConf-${PV}"