Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-2.14.7-uncertain-mime.patch gtk+-2.14.7-ignore-gtkcurve.patch
Date: Sun, 01 Mar 2009 23:01:20
Message-Id: E1Lduep-0005uY-1F@stork.gentoo.org
1 eva 09/03/01 23:01:15
2
3 Added: gtk+-2.14.7-uncertain-mime.patch
4 gtk+-2.14.7-ignore-gtkcurve.patch
5 Log:
6 Bump to 2.14.7-r2. Hopefully fix test failures, bug #238995, and enhance mime-type resolution, bug #257980.
7 (Portage version: 2.2_rc23/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.7-uncertain-mime.patch?rev=1.1&content-type=text/plain
14
15 Index: gtk+-2.14.7-uncertain-mime.patch
16 ===================================================================
17 # http://bugzilla.gnome.org/show_bug.cgi?id=569671
18 # If pure sniffing yields uncertain results, try again with the filename.
19 # Patch by Tyler Lawson
20 --- a/gdk-pixbuf/gdk-pixbuf-io.c 2009-02-09 11:33:45.000000000 -0600
21 +++ b/gdk-pixbuf/gdk-pixbuf-io.c 2009-02-09 11:36:32.000000000 -0600
22 @@ -793,8 +793,12 @@
23 gchar **mimes;
24 gchar *type;
25 gint j;
26 + gboolean mimetype_uncertain;
27
28 - mime_type = g_content_type_guess (NULL, buffer, size, NULL);
29 + mime_type = g_content_type_guess (NULL, buffer, size, &mimetype_uncertain);
30 + if (mimetype_uncertain)
31 + mime_type = g_content_type_guess (filename, buffer, size, NULL);
32 +
33
34 for (modules = get_file_formats (); modules; modules = g_slist_next (modules)) {
35 GdkPixbufModule *module = (GdkPixbufModule *)modules->data;
36
37
38
39 1.1 x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch?rev=1.1&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/gtk+/files/gtk+-2.14.7-ignore-gtkcurve.patch?rev=1.1&content-type=text/plain
43
44 Index: gtk+-2.14.7-ignore-gtkcurve.patch
45 ===================================================================
46 # https://bugzilla.gnome.org/show_bug.cgi?id=525550
47 # Fix test suite failure by ignoring gtkcurve altogether.
48 diff --git a/gtk/tests/object.c b/gtk/tests/object.c
49 index c243913..e2bc63b 100644
50 --- a/gtk/tests/object.c
51 +++ b/gtk/tests/object.c
52 @@ -55,6 +55,7 @@ list_ignore_properties (gboolean buglist)
53 {
54 /* currently untestable properties */
55 static const IgnoreProperty ignore_properties[] = {
56 + { "GtkCurve", "", NULL, }, /* Just ignore it, not worth fixing */
57 { "GtkContainer", "child", NULL, }, /* needs working child widget */
58 { "GtkRadioMenuItem", "group", NULL, }, /* needs working sibling */
59 { "GtkWidget", "parent", NULL, }, /* needs working parent widget */
60 @@ -89,11 +90,6 @@ list_ignore_properties (gboolean buglist)
61 static const IgnoreProperty bug_properties[] = {
62 { "GtkComboBox", "active", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL model bug */
63 { "GtkCTree", "spacing", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers signedness bug */
64 - { "GtkCurve", "curve-type", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers OOM */
65 - { "GtkCurve", "min-x", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */
66 - { "GtkCurve", "min-y", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */
67 - { "GtkCurve", "max-x", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */
68 - { "GtkCurve", "max-y", (void*) 0x80000000 }, /* FIXME: triggers coordinate OOB */
69 { "GtkFileChooserButton", "local-only", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL path assertion */
70 { "GtkFileChooserDialog", "local-only", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL path assertion */
71 { "GtkFileChooserWidget", "local-only", (void*) MATCH_ANY_VALUE }, /* FIXME: triggers NULL path assertion */
72 @@ -227,7 +223,8 @@ object_test_property (GObject *object,
73 /* ignore untestable properties */
74 ignore_properties = list_ignore_properties (FALSE);
75 for (i = 0; ignore_properties[i].name; i++)
76 - if (g_type_is_a (G_OBJECT_TYPE (object), g_type_from_name (ignore_properties[i].type_name)) &&
77 + if (g_strcmp0 ("", ignore_properties[i].name) ||
78 + g_type_is_a (G_OBJECT_TYPE (object), g_type_from_name (ignore_properties[i].type_name)) &&
79 strcmp (pspec->name, ignore_properties[i].name) == 0 &&
80 (MATCH_ANY_VALUE == ignore_properties[i].value ||
81 value_as_pointer (&value) == ignore_properties[i].value ||
82 @@ -235,7 +232,7 @@ object_test_property (GObject *object,
83 strcmp (g_value_get_string (&value), ignore_properties[i].value) == 0)))
84 break;
85 /* ignore known property bugs if not testing thoroughly */
86 - if (ignore_properties[i].name == NULL && !g_test_thorough())
87 + if (ignore_properties[i].name == NULL && !g_test_thorough ())
88 {
89 ignore_properties = list_ignore_properties (TRUE);
90 for (i = 0; ignore_properties[i].name; i++)
91 @@ -250,7 +247,7 @@ object_test_property (GObject *object,
92 /* assign unignored properties */
93 if (ignore_properties[i].name == NULL)
94 {
95 - if (g_test_verbose())
96 + if (g_test_verbose ())
97 g_print ("PropertyTest: %s::%s := (%s value (%s): %p)\n",
98 g_type_name (G_OBJECT_TYPE (object)), pspec->name,
99 SELECT_NAME (dvalue), g_type_name (G_VALUE_TYPE (&value)),
100 @@ -330,7 +327,7 @@ main (int argc,
101 /* initialize test program */
102 pixbuf_init ();
103 gtk_test_init (&argc, &argv);
104 - gtk_test_register_all_types();
105 + gtk_test_register_all_types ();
106 /* install a property test for each widget type */
107 otypes = gtk_test_list_all_types (NULL);
108 for (i = 0; otypes[i]; i++)
109 @@ -342,5 +339,5 @@ main (int argc,
110 g_test_add_data_func (testpath, (void*) otypes[i], widget_property_tests);
111 g_free (testpath);
112 }
113 - return g_test_run();
114 + return g_test_run ();
115 }
Report Message
Find on MARC Find on Google Groups