summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch')
-rw-r--r--meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch102
1 files changed, 102 insertions, 0 deletions
diff --git a/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch b/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
new file mode 100644
index 0000000..c5d5864
--- /dev/null
+++ b/meta/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch
@@ -0,0 +1,102 @@
1Upstream-Status: Pending
2
3diff -ur libglade-2.4.0~/configure.in libglade-2.4.0/configure.in
4--- libglade-2.4.0~/configure.in 2004-05-17 12:38:31.000000000 +0100
5+++ libglade-2.4.0/configure.in 2004-07-28 16:53:09.000000000 +0100
6@@ -147,6 +147,18 @@
7 AM_CONDITIONAL(HAVE_PYTHON, $have_python)
8 AC_SUBST(PYTHON)
9
10+AC_MSG_CHECKING([for cruft in libgtk])
11+AC_TRY_LINK([
12+#include <gtk/gtk.h>
13+#include <stdio.h>
14+], [ gtk_tree_get_type (); return 0; ],
15+ [ AC_MSG_RESULT(yes)
16+ have_cruft=yes ],
17+ [ AC_MSG_RESULT(no)
18+ AC_DEFINE(DISABLE_CRUFT,,[leave out support for old, broken widgets])
19+ have_cruft=no ])
20+AC_SUBST(DISABLE_CRUFT)
21+
22 dnl add debugging options ...
23 changequote(,)dnl
24 if test "x$GCC" = xyes; then
25Only in libglade-2.4.0: configure.in.orig
26diff -ur libglade-2.4.0~/glade/glade-gtk.c libglade-2.4.0/glade/glade-gtk.c
27--- libglade-2.4.0~/glade/glade-gtk.c 2004-03-13 13:47:35.000000000 +0000
28+++ libglade-2.4.0/glade/glade-gtk.c 2004-07-28 16:53:52.000000000 +0100
29@@ -213,6 +213,8 @@
30 gtk_clist_column_titles_hide (GTK_CLIST (w));
31 }
32
33+#ifndef DISABLE_CRUFT
34+
35 static void
36 tree_set_selection_mode (GladeXML *xml, GtkWidget *w,
37 const char *name, const char *value)
38@@ -238,6 +240,8 @@
39 gtk_tree_set_view_lines (GTK_TREE (w), BOOL (value));
40 }
41
42+#endif
43+
44 static void
45 list_set_selection_mode (GladeXML *xml, GtkWidget *w,
46 const char *name, const char *value)
47@@ -254,6 +258,7 @@
48 gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (w), BOOL (value));
49 }
50
51+#ifndef DISABLE_CRUFT
52 static void
53 text_set_text (GladeXML *xml, GtkWidget *w,
54 const char *name, const char *value)
55@@ -262,6 +267,7 @@
56
57 gtk_editable_insert_text (GTK_EDITABLE (w), value, -1, &pos);
58 }
59+#endif
60
61 static void
62 radio_menu_item_set_group (GladeXML *xml, GtkWidget *w,
63@@ -1125,13 +1131,17 @@
64 glade_register_custom_prop (GTK_TYPE_CLIST, "selection_mode", clist_set_selection_mode);
65 glade_register_custom_prop (GTK_TYPE_CLIST, "shadow_type", clist_set_shadow_type);
66 glade_register_custom_prop (GTK_TYPE_CLIST, "show_titles", clist_set_show_titles);
67+#ifndef DISABLE_CRUFT
68 glade_register_custom_prop (GTK_TYPE_TREE, "selection_mode", tree_set_selection_mode);
69 glade_register_custom_prop (GTK_TYPE_TREE, "view_mode", tree_set_view_mode);
70 glade_register_custom_prop (GTK_TYPE_TREE, "view_line", tree_set_view_line);
71+#endif
72 glade_register_custom_prop (GTK_TYPE_LIST, "selection_mode", list_set_selection_mode);
73 glade_register_custom_prop (GTK_TYPE_CHECK_MENU_ITEM, "always_show_toggle",
74 check_menu_item_set_always_show_toggle);
75+#ifndef DISABLE_CRUFT
76 glade_register_custom_prop (GTK_TYPE_TEXT, "text", text_set_text);
77+#endif
78 glade_register_custom_prop (GTK_TYPE_RADIO_MENU_ITEM, "group",
79 radio_menu_item_set_group);
80 glade_register_custom_prop (GTK_TYPE_TOOLBAR, "tooltips", toolbar_set_tooltips);
81@@ -1288,8 +1298,10 @@
82 glade_standard_build_children, NULL);
83 glade_register_widget (GTK_TYPE_TEAROFF_MENU_ITEM, glade_standard_build_widget,
84 NULL, NULL);
85+#ifndef DISABLE_CRUFT
86 glade_register_widget (GTK_TYPE_TEXT, glade_standard_build_widget,
87 NULL, NULL);
88+#endif
89 glade_register_widget (GTK_TYPE_TEXT_VIEW, glade_standard_build_widget,
90 NULL, NULL);
91 glade_register_widget (GTK_TYPE_TIPS_QUERY, glade_standard_build_widget,
92@@ -1304,8 +1316,10 @@
93 glade_standard_build_children, NULL);
94 glade_register_widget (GTK_TYPE_TOOL_BUTTON, glade_standard_build_widget,
95 NULL, NULL);
96+#ifndef DISABLE_CRUFT
97 glade_register_widget (GTK_TYPE_TREE, glade_standard_build_widget,
98 NULL, NULL);
99+#endif
100 glade_register_widget (GTK_TYPE_TREE_VIEW, glade_standard_build_widget,
101 NULL, NULL);
102 glade_register_widget (GTK_TYPE_VBUTTON_BOX, glade_standard_build_widget,