diff options
| author |   Mart Raudsepp <leio@gentoo.org> | 2006-12-20 17:28:47 +0000 |
|---|---|---|
| committer | Mart Raudsepp <leio@gentoo.org> | 2006-12-20 17:28:47 +0000 |
| commit | 0c0b0e713aef5ac31be202a9c47e74c043e6bef6 (patch) | |
| tree | 185ad9fcb4460aab038d57d5e4fbac3a4c60d26a /dev-libs/glib/files | |
| parent | Version bump (diff) | |
| download | gentoo-2-0c0b0e713aef5ac31be202a9c47e74c043e6bef6.tar.gz gentoo-2-0c0b0e713aef5ac31be202a9c47e74c043e6bef6.tar.bz2 gentoo-2-0c0b0e713aef5ac31be202a9c47e74c043e6bef6.zip | |
Fix file association from MIME types, bug 158646
(Portage version: 2.1.2_rc3-r8)
Diffstat (limited to 'dev-libs/glib/files')
| -rw-r--r-- | dev-libs/glib/files/digest-glib-2.12.5-r1 | 3 | ||||
| -rw-r--r-- | dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch | 46 |
2 files changed, 49 insertions, 0 deletions
diff --git a/dev-libs/glib/files/digest-glib-2.12.5-r1 b/dev-libs/glib/files/digest-glib-2.12.5-r1 new file mode 100644 index 000000000000..96ab444c5273 --- /dev/null +++ b/dev-libs/glib/files/digest-glib-2.12.5-r1 @@ -0,0 +1,3 @@ +MD5 08f51fd565805289879819964bb8192b glib-2.12.5.tar.bz2 2900298 +RMD160 b306fbfb4573a30e288476ad44a3c30e47914f6a glib-2.12.5.tar.bz2 2900298 +SHA256 ab8575a302c597f8ed72921c3f20033bab0f84f0325f08f9b9347e28333c8644 glib-2.12.5.tar.bz2 2900298 diff --git a/dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch b/dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch new file mode 100644 index 000000000000..4fbb56bdd695 --- /dev/null +++ b/dev-libs/glib/files/glib-2.12.5-gkeyfile-gnomevfs-mime.patch @@ -0,0 +1,46 @@ +cvs diff -D'20061219 21:07 UTC' -D'20061219 21:10 UTC' +Changes to tests/gkeyfile-test.c not included here +The ones that are are the same in glib-2.12 branch and will be part of glib-2.12.6 + +http://bugzilla.gnome.org/show_bug.cgi?id=343191 +Index: ChangeLog +=================================================================== +RCS file: /cvs/gnome/glib/ChangeLog,v +retrieving revision 1.2472 +retrieving revision 1.2473 +diff -u -B -r1.2472 -r1.2473 +--- ChangeLog 19 Dec 2006 15:28:17 -0000 1.2472 ++++ ChangeLog 19 Dec 2006 21:08:31 -0000 1.2473 +@@ -1,3 +1,11 @@ ++2006-12-19 Matthias Clasen <mclasen@redhat.com> ++ ++ * glib/gkeyfile.c (g_key_file_is_key_name): Accept ++ '/', '+' and '.' in key names, since gnome-vfs uses ++ mime types as keys in some cache. ++ ++ * tests/keyfile-test.c: Tests for the above. ++ + 2006-12-18 Matthias Clasen <mclasen@redhat.com> + + * configure.in: Fix the broken poll test. (#387260, +Index: glib/gkeyfile.c +=================================================================== +RCS file: /cvs/gnome/glib/glib/gkeyfile.c,v +retrieving revision 1.50 +retrieving revision 1.51 +diff -u -B -r1.50 -r1.51 +--- glib/gkeyfile.c 18 Dec 2006 14:13:33 -0000 1.50 ++++ glib/gkeyfile.c 19 Dec 2006 21:08:31 -0000 1.51 +@@ -3234,7 +3234,11 @@ + return FALSE; + + p = q = (gchar *) name; +- while (*q && (g_unichar_isalnum (g_utf8_get_char (q)) || *q == '-')) ++ /* We accept a little more than the desktop entry spec says, ++ * since gnome-vfs uses mime-types as keys in its cache. ++ */ ++ while (*q && (g_unichar_isalnum (g_utf8_get_char (q)) || ++ *q == '-' || *q == '_' || *q == '/' || *q == '+' || *q == '.')) + q = g_utf8_next_char (q); + + if (*q == '[') |