diff options
Diffstat (limited to 'gnome-base/gconf/files')
| -rw-r--r-- | gnome-base/gconf/files/gconf-1.0.9-gcc4.patch | 23 | ||||
| -rw-r--r-- | gnome-base/gconf/files/gconf-1.0.9-linguas.patch | 14 |
2 files changed, 37 insertions, 0 deletions
diff --git a/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch b/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch new file mode 100644 index 000000000000..0d02cb359ef1 --- /dev/null +++ b/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch @@ -0,0 +1,23 @@ +These functions are declared external in a header file, then defined with +static, the mismatch is an error with gcc4 + +--- GConf-1.0.9/backends/bdb.c.agriffis 2006-02-21 08:55:42.000000000 -0500 ++++ GConf-1.0.9/backends/bdb.c 2006-02-21 08:55:51.000000000 -0500 +@@ -331,7 +331,7 @@ + + /* } */ + +-static guint32 ++guint32 + get_dir_id (BDB_Store * bdb, const char *dir) + { + int ret; +@@ -405,7 +405,7 @@ + + /* { Functions to create directories and maintain the dir hierarchy */ + +-static guint32 ++guint32 + get_or_create_dir (BDB_Store * bdb, const char *dir) + { + guint32 parent_id; diff --git a/gnome-base/gconf/files/gconf-1.0.9-linguas.patch b/gnome-base/gconf/files/gconf-1.0.9-linguas.patch new file mode 100644 index 000000000000..9f28a1dc613a --- /dev/null +++ b/gnome-base/gconf/files/gconf-1.0.9-linguas.patch @@ -0,0 +1,14 @@ +Fix bug 114805: gnome-base/gconf-1.0.9 fails to compile if LINGUAS contains zh + +diff -ruN GConf-1.0.9.orig/configure GConf-1.0.9/configure +--- GConf-1.0.9.orig/configure 2005-12-07 14:50:19.000000000 -0800 ++++ GConf-1.0.9/configure 2005-12-07 14:51:26.000000000 -0800 +@@ -10475,7 +10475,7 @@ + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in +- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; ++ $lang|*\ $lang|$lang\ *|*\ $lang\ *) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS |