summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/gtk+
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-04-25 18:54:03 +0000
committerChris Lord <chris@openedhand.com>2006-04-25 18:54:03 +0000
commite1256b9d3a53d27817873fa6d6636a6aabd342a3 (patch)
tree7a0f74f9f8396c3506c77d4e45398de381a3e71f /openembedded/packages/gtk+
parented0ece597e1e0a284a83af9aef0345f614e0197d (diff)
downloadpoky-e1256b9d3a53d27817873fa6d6636a6aabd342a3.tar.gz
Add gtk 2.6.8, with Ross's no-deprecation patch to build with glib 2.10
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@364 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gtk+')
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/automake-lossage.patch24
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/disable-tooltips.patch11
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/gtk+-handhelds.patch186
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/gtklabel-resize-patch10
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/hardcoded_libtool.patch29
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/menu-deactivate.patch50
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/no-demos.patch10
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/no-deprecation.patch334
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/no-xwc.patch151
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/scroll-timings.patch15
-rw-r--r--openembedded/packages/gtk+/gtk+-2.6.8/spinbutton.patch128
-rw-r--r--openembedded/packages/gtk+/gtk+_2.6.8.bb80
12 files changed, 1028 insertions, 0 deletions
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/automake-lossage.patch b/openembedded/packages/gtk+/gtk+-2.6.8/automake-lossage.patch
new file mode 100644
index 0000000000..0d423ddbb9
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/automake-lossage.patch
@@ -0,0 +1,24 @@
1--- gtk+-2.4.1/docs/tutorial/Makefile.am~ 2003-05-06 22:54:20.000000000 +0100
2+++ gtk+-2.4.1/docs/tutorial/Makefile.am 2004-05-08 12:31:41.000000000 +0100
3@@ -52,21 +52,5 @@
4
5 dist-hook: html
6 cp -Rp $(srcdir)/html $(distdir)
7-else
8-html:
9- echo "***"
10- echo "*** Warning: Tutorial not built"
11- echo "***"
12-
13-pdf:
14- echo "***"
15- echo "*** Warning: Tutorial not built"
16- echo "***"
17-
18-dist-hook:
19- echo "***"
20- echo "*** Warning: Tutorial not built"
21- echo "*** DISTRIBUTION IS INCOMPLETE"
22- echo "***"
23 endif
24
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/disable-tooltips.patch b/openembedded/packages/gtk+/gtk+-2.6.8/disable-tooltips.patch
new file mode 100644
index 0000000000..d71d839c3c
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/disable-tooltips.patch
@@ -0,0 +1,11 @@
1--- gtk+-2.4.3/gtk/gtktooltips.c.old 2004-07-04 18:52:04.000000000 +0100
2+++ gtk+-2.4.3/gtk/gtktooltips.c 2004-07-04 18:52:08.000000000 +0100
3@@ -118,7 +118,7 @@
4 tooltips->tips_data_list = NULL;
5
6 tooltips->delay = DEFAULT_DELAY;
7- tooltips->enabled = TRUE;
8+ tooltips->enabled = FALSE;
9 tooltips->timer_tag = 0;
10 tooltips->use_sticky_delay = FALSE;
11 tooltips->last_popdown.tv_sec = -1;
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/gtk+-handhelds.patch b/openembedded/packages/gtk+/gtk+-2.6.8/gtk+-handhelds.patch
new file mode 100644
index 0000000000..2c5fc39d23
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/gtk+-handhelds.patch
@@ -0,0 +1,186 @@
1--- gtk+-2.4.1/gtk/gtkcalendar.c 2004-03-06 14:37:26.000000000 +1100
2+++ gtk+-2.4.1/gtk/gtkcalendar.c 2004-05-26 14:58:57.000000000 +1000
3@@ -340,6 +340,9 @@
4 static void gtk_calendar_select_and_focus_day (GtkCalendar *calendar,
5 guint day);
6
7+static void gtk_calendar_do_select_day (GtkCalendar *calendar,
8+ guint day);
9+
10 static void gtk_calendar_paint_arrow (GtkWidget *widget,
11 guint arrow);
12 static void gtk_calendar_paint_day_num (GtkWidget *widget,
13@@ -861,13 +864,13 @@
14 if (month_len < calendar->selected_day)
15 {
16 calendar->selected_day = 0;
17- gtk_calendar_select_day (calendar, month_len);
18+ gtk_calendar_do_select_day (calendar, month_len);
19 }
20 else
21 {
22 if (calendar->selected_day < 0)
23 calendar->selected_day = calendar->selected_day + 1 + month_length[leap (calendar->year)][calendar->month + 1];
24- gtk_calendar_select_day (calendar, calendar->selected_day);
25+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
26 }
27
28 gtk_widget_queue_draw (GTK_WIDGET (calendar));
29@@ -908,10 +911,10 @@
30 if (month_len < calendar->selected_day)
31 {
32 calendar->selected_day = 0;
33- gtk_calendar_select_day (calendar, month_len);
34+ gtk_calendar_do_select_day (calendar, month_len);
35 }
36 else
37- gtk_calendar_select_day (calendar, calendar->selected_day);
38+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
39
40 gtk_widget_queue_draw (GTK_WIDGET (calendar));
41 gtk_calendar_thaw (calendar);
42@@ -939,10 +942,10 @@
43 if (month_len < calendar->selected_day)
44 {
45 calendar->selected_day = 0;
46- gtk_calendar_select_day (calendar, month_len);
47+ gtk_calendar_do_select_day (calendar, month_len);
48 }
49 else
50- gtk_calendar_select_day (calendar, calendar->selected_day);
51+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
52
53 gtk_widget_queue_draw (GTK_WIDGET (calendar));
54 gtk_calendar_thaw (calendar);
55@@ -974,10 +977,10 @@
56 if (month_len < calendar->selected_day)
57 {
58 calendar->selected_day = 0;
59- gtk_calendar_select_day (calendar, month_len);
60+ gtk_calendar_do_select_day (calendar, month_len);
61 }
62 else
63- gtk_calendar_select_day (calendar, calendar->selected_day);
64+ gtk_calendar_do_select_day (calendar, calendar->selected_day);
65
66 gtk_widget_queue_draw (GTK_WIDGET (calendar));
67 gtk_calendar_thaw (calendar);
68@@ -2480,9 +2483,9 @@
69 return TRUE;
70 }
71
72-void
73-gtk_calendar_select_day (GtkCalendar *calendar,
74- guint day)
75+static void
76+gtk_calendar_do_select_day (GtkCalendar *calendar,
77+ guint day)
78 {
79 g_return_if_fail (GTK_IS_CALENDAR (calendar));
80 g_return_if_fail (day <= 31);
81@@ -2499,6 +2502,13 @@
82 if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (calendar)))
83 gtk_calendar_paint_day_num (GTK_WIDGET (calendar), selected_day);
84 }
85+}
86+
87+void
88+gtk_calendar_select_day (GtkCalendar *calendar,
89+ guint day)
90+{
91+ gtk_calendar_do_select_day (calendar, day);
92
93 calendar->selected_day = day;
94
95--- gtk+-2.4.1/gtk/gtkentry.c 2004-04-22 08:08:08.000000000 +1000
96+++ gtk+-2.4.1/gtk/gtkentry.c 2004-05-26 14:52:17.000000000 +1000
97@@ -557,6 +557,15 @@
98 0.0,
99 G_PARAM_READABLE | G_PARAM_WRITABLE));
100
101+ gtk_widget_class_install_style_property (widget_class,
102+ g_param_spec_int ("min_width",
103+ _("Minimum width"),
104+ _("Minimum width of the entry field"),
105+ 0,
106+ G_MAXINT,
107+ MIN_ENTRY_WIDTH,
108+ G_PARAM_READABLE));
109+
110 signals[POPULATE_POPUP] =
111 g_signal_new ("populate_popup",
112 G_OBJECT_CLASS_TYPE (gobject_class),
113@@ -1124,7 +1133,7 @@
114 {
115 GtkEntry *entry = GTK_ENTRY (widget);
116 PangoFontMetrics *metrics;
117- gint xborder, yborder;
118+ gint xborder, yborder, min_width;
119 PangoContext *context;
120
121 gtk_widget_ensure_style (widget);
122@@ -1140,9 +1149,11 @@
123
124 xborder += INNER_BORDER;
125 yborder += INNER_BORDER;
126-
127+
128+ gtk_widget_style_get (widget, "min_width", &min_width, NULL);
129+
130 if (entry->width_chars < 0)
131- requisition->width = MIN_ENTRY_WIDTH + xborder * 2;
132+ requisition->width = min_width + xborder * 2;
133 else
134 {
135 gint char_width = pango_font_metrics_get_approximate_char_width (metrics);
136--- gtk+-2.4.1/gtk/gtkrange.c 2004-03-06 14:38:08.000000000 +1100
137+++ gtk+-2.4.1/gtk/gtkrange.c 2004-05-26 14:52:17.000000000 +1000
138@@ -180,6 +180,7 @@
139 static GtkWidgetClass *parent_class = NULL;
140 static guint signals[LAST_SIGNAL];
141
142+static GdkAtom recognize_protocols_atom, atom_atom;
143
144 GType
145 gtk_range_get_type (void)
146@@ -220,6 +221,9 @@
147 object_class = (GtkObjectClass*) class;
148 widget_class = (GtkWidgetClass*) class;
149
150+ recognize_protocols_atom = gdk_atom_intern ("RECOGNIZE_PROTOCOLS", FALSE);
151+ atom_atom = gdk_atom_intern ("ATOM", FALSE);
152+
153 parent_class = g_type_class_peek_parent (class);
154
155 gobject_class->set_property = gtk_range_set_property;
156@@ -815,6 +819,12 @@
157 &attributes, attributes_mask);
158 gdk_window_set_user_data (range->event_window, range);
159
160+ gdk_property_change (range->event_window,
161+ recognize_protocols_atom,
162+ atom_atom,
163+ 32, GDK_PROP_MODE_REPLACE,
164+ NULL, 0);
165+
166 widget->style = gtk_style_attach (widget->style, widget->window);
167 }
168
169@@ -1186,7 +1196,7 @@
170
171 /* ignore presses when we're already doing something else. */
172 if (range->layout->grab_location != MOUSE_OUTSIDE)
173- return FALSE;
174+ return TRUE;
175
176 range->layout->mouse_x = event->x;
177 range->layout->mouse_y = event->y;
178@@ -1364,7 +1374,7 @@
179 return TRUE;
180 }
181
182- return FALSE;
183+ return TRUE;
184 }
185
186 /**
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/gtklabel-resize-patch b/openembedded/packages/gtk+/gtk+-2.6.8/gtklabel-resize-patch
new file mode 100644
index 0000000000..df29656343
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/gtklabel-resize-patch
@@ -0,0 +1,10 @@
1--- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100
2+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100
3@@ -1623,6 +1623,7 @@
4
5 /* We have to clear the layout, fonts etc. may have changed */
6 gtk_label_clear_layout (label);
7+ gtk_widget_queue_resize (GTK_WIDGET (label));
8 }
9
10 static void
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/hardcoded_libtool.patch b/openembedded/packages/gtk+/gtk+-2.6.8/hardcoded_libtool.patch
new file mode 100644
index 0000000000..b2afddcc61
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/hardcoded_libtool.patch
@@ -0,0 +1,29 @@
1--- gtk+-2.6.0/configure.in.old 2005-01-01 16:23:45.000000000 +0000
2+++ gtk+-2.6.0/configure.in 2005-01-01 16:24:03.000000000 +0000
3@@ -360,7 +360,7 @@
4 AC_MSG_CHECKING([Whether to write dependencies into .pc files])
5 case $enable_explicit_deps in
6 auto)
7- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
8+ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh`
9 if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then
10 enable_explicit_deps=yes
11 else
12@@ -688,7 +688,7 @@
13 dnl Now we check to see if our libtool supports shared lib deps
14 dnl (in a rather ugly way even)
15 if $dynworks; then
16- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
17+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
18 pixbuf_deplibs_check=`$pixbuf_libtool_config | \
19 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
20 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
21@@ -1512,7 +1512,7 @@
22 #
23 # We are using gmodule-no-export now, but I'm leaving the stripping
24 # code in place for now, since pango and atk still require gmodule.
25-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
26+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
27 if test -n "$export_dynamic"; then
28 GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
29 GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/menu-deactivate.patch b/openembedded/packages/gtk+/gtk+-2.6.8/menu-deactivate.patch
new file mode 100644
index 0000000000..29e665fbf3
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/menu-deactivate.patch
@@ -0,0 +1,50 @@
1--- gtk+-2.4.4/gtk/gtkmenushell.c.old Thu Aug 26 23:45:28 2004
2+++ gtk+-2.4.4/gtk/gtkmenushell.c Fri Aug 27 00:13:33 2004
3@@ -37,7 +37,7 @@
4 #include "gtktearoffmenuitem.h"
5 #include "gtkwindow.h"
6
7-#define MENU_SHELL_TIMEOUT 500
8+#define MENU_SHELL_TIMEOUT 2000
9
10 enum {
11 DEACTIVATE,
12@@ -156,6 +156,7 @@
13 static GtkContainerClass *parent_class = NULL;
14 static guint menu_shell_signals[LAST_SIGNAL] = { 0 };
15
16+static int last_crossing_time;
17
18 GType
19 gtk_menu_shell_get_type (void)
20@@ -418,6 +419,7 @@
21 gtk_grab_add (GTK_WIDGET (menu_shell));
22 menu_shell->have_grab = TRUE;
23 menu_shell->active = TRUE;
24+ last_crossing_time = 0;
25 }
26 }
27
28@@ -545,6 +547,13 @@
29 menu_shell->activate_time = 0;
30 deactivate = FALSE;
31 }
32+
33+ if (last_crossing_time != 0
34+ && ((event->time - last_crossing_time) < 500))
35+ {
36+ last_crossing_time = 0;
37+ deactivate = FALSE;
38+ }
39
40 if (deactivate)
41 {
42@@ -597,6 +606,8 @@
43 if (menu_shell->active)
44 {
45 menu_item = gtk_get_event_widget ((GdkEvent*) event);
46+
47+ last_crossing_time = event->time;
48
49 if (!menu_item ||
50 (GTK_IS_MENU_ITEM (menu_item) &&
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/no-demos.patch b/openembedded/packages/gtk+/gtk+-2.6.8/no-demos.patch
new file mode 100644
index 0000000000..2f10a30dda
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/no-demos.patch
@@ -0,0 +1,10 @@
1--- gtk+-2.4.1/Makefile.am~ 2004-01-17 22:15:56.000000000 +0000
2+++ gtk+-2.4.1/Makefile.am 2004-05-08 12:25:32.000000000 +0100
3@@ -1,6 +1,6 @@
4 ## Makefile.am for GTK+
5
6-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests contrib
7+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests contrib
8 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs build m4macros
9
10 # require automake 1.4
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/no-deprecation.patch b/openembedded/packages/gtk+/gtk+-2.6.8/no-deprecation.patch
new file mode 100644
index 0000000000..045c566b3a
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/no-deprecation.patch
@@ -0,0 +1,334 @@
1diff -ru gtk+-2.6.8.orig/contrib/gdk-pixbuf-xlib/Makefile.am gtk+-2.6.8/contrib/gdk-pixbuf-xlib/Makefile.am
2--- gtk+-2.6.8.orig/contrib/gdk-pixbuf-xlib/Makefile.am 2004-03-03 20:53:23.000000000 +0000
3+++ gtk+-2.6.8/contrib/gdk-pixbuf-xlib/Makefile.am 2006-04-19 12:47:16.000000000 +0100
4@@ -4,7 +4,6 @@
5 -I$(top_srcdir) -I$(top_builddir) \
6 -I$(top_srcdir)/gdk-pixbuf \
7 -I$(top_srcdir)/contrib \
8- -DG_DISABLE_DEPRECATED \
9 -DGDK_PIXBUF_DISABLE_DEPRECATED \
10 $(GDK_PIXBUF_XLIB_DEP_CFLAGS)
11
12Only in gtk+-2.6.8/contrib/gdk-pixbuf-xlib: Makefile.am~
13diff -ru gtk+-2.6.8.orig/contrib/gdk-pixbuf-xlib/Makefile.in gtk+-2.6.8/contrib/gdk-pixbuf-xlib/Makefile.in
14--- gtk+-2.6.8.orig/contrib/gdk-pixbuf-xlib/Makefile.in 2005-06-15 20:57:33.000000000 +0100
15+++ gtk+-2.6.8/contrib/gdk-pixbuf-xlib/Makefile.in 2006-04-19 12:48:10.000000000 +0100
16@@ -290,7 +290,6 @@
17 -I$(top_srcdir) -I$(top_builddir) \
18 -I$(top_srcdir)/gdk-pixbuf \
19 -I$(top_srcdir)/contrib \
20- -DG_DISABLE_DEPRECATED \
21 -DGDK_PIXBUF_DISABLE_DEPRECATED \
22 $(GDK_PIXBUF_XLIB_DEP_CFLAGS)
23
24Only in gtk+-2.6.8/contrib/gdk-pixbuf-xlib: Makefile.in~
25diff -ru gtk+-2.6.8.orig/demos/gtk-demo/Makefile.am gtk+-2.6.8/demos/gtk-demo/Makefile.am
26--- gtk+-2.6.8.orig/demos/gtk-demo/Makefile.am 2005-05-25 07:48:28.000000000 +0100
27+++ gtk+-2.6.8/demos/gtk-demo/Makefile.am 2006-04-19 12:47:11.000000000 +0100
28@@ -35,7 +35,6 @@
29 -DDEMOCODEDIR="\"$(democodedir)\"" \
30 -I$(top_srcdir) \
31 -I$(top_builddir)/gdk \
32- -DG_DISABLE_DEPRECATED \
33 -DGDK_PIXBUF_DISABLE_DEPRECATED \
34 -DGDK_DISABLE_DEPRECATED \
35 -DGTK_DISABLE_DEPRECATED \
36Only in gtk+-2.6.8/demos/gtk-demo: Makefile.am~
37diff -ru gtk+-2.6.8.orig/demos/gtk-demo/Makefile.in gtk+-2.6.8/demos/gtk-demo/Makefile.in
38--- gtk+-2.6.8.orig/demos/gtk-demo/Makefile.in 2005-06-15 20:57:34.000000000 +0100
39+++ gtk+-2.6.8/demos/gtk-demo/Makefile.in 2006-04-19 12:48:06.000000000 +0100
40@@ -319,7 +319,6 @@
41 -DDEMOCODEDIR="\"$(democodedir)\"" \
42 -I$(top_srcdir) \
43 -I$(top_builddir)/gdk \
44- -DG_DISABLE_DEPRECATED \
45 -DGDK_PIXBUF_DISABLE_DEPRECATED \
46 -DGDK_DISABLE_DEPRECATED \
47 -DGTK_DISABLE_DEPRECATED \
48Only in gtk+-2.6.8/demos/gtk-demo: Makefile.in~
49diff -ru gtk+-2.6.8.orig/demos/Makefile.am gtk+-2.6.8/demos/Makefile.am
50--- gtk+-2.6.8.orig/demos/Makefile.am 2003-06-06 01:52:19.000000000 +0100
51+++ gtk+-2.6.8/demos/Makefile.am 2006-04-19 12:47:13.000000000 +0100
52@@ -5,7 +5,6 @@
53 INCLUDES = \
54 -I$(top_srcdir) \
55 -I$(top_builddir)/gdk \
56- -DG_DISABLE_DEPRECATED \
57 -DGDK_PIXBUF_DISABLE_DEPRECATED \
58 -DGDK_DISABLE_DEPRECATED \
59 -DGTK_DISABLE_DEPRECATED \
60Only in gtk+-2.6.8/demos: Makefile.am~
61diff -ru gtk+-2.6.8.orig/demos/Makefile.in gtk+-2.6.8/demos/Makefile.in
62--- gtk+-2.6.8.orig/demos/Makefile.in 2005-06-15 20:57:33.000000000 +0100
63+++ gtk+-2.6.8/demos/Makefile.in 2006-04-19 12:48:08.000000000 +0100
64@@ -291,7 +291,6 @@
65 INCLUDES = \
66 -I$(top_srcdir) \
67 -I$(top_builddir)/gdk \
68- -DG_DISABLE_DEPRECATED \
69 -DGDK_PIXBUF_DISABLE_DEPRECATED \
70 -DGDK_DISABLE_DEPRECATED \
71 -DGTK_DISABLE_DEPRECATED \
72Only in gtk+-2.6.8/demos: Makefile.in~
73diff -ru gtk+-2.6.8.orig/gdk/linux-fb/Makefile.am gtk+-2.6.8/gdk/linux-fb/Makefile.am
74--- gtk+-2.6.8.orig/gdk/linux-fb/Makefile.am 2003-12-10 13:49:53.000000000 +0000
75+++ gtk+-2.6.8/gdk/linux-fb/Makefile.am 2006-04-19 12:47:02.000000000 +0100
76@@ -15,7 +15,6 @@
77 -I$(top_srcdir) \
78 -I$(top_srcdir)/gdk \
79 -I$(top_builddir)/gdk \
80- -DG_DISABLE_DEPRECATED \
81 -DGDK_PIXBUF_DISABLE_DEPRECATED \
82 $(GDK_DEP_CFLAGS) \
83 $(GTK_DEBUG_FLAGS)
84Only in gtk+-2.6.8/gdk/linux-fb: Makefile.am~
85diff -ru gtk+-2.6.8.orig/gdk/linux-fb/Makefile.in gtk+-2.6.8/gdk/linux-fb/Makefile.in
86--- gtk+-2.6.8.orig/gdk/linux-fb/Makefile.in 2005-06-15 20:57:38.000000000 +0100
87+++ gtk+-2.6.8/gdk/linux-fb/Makefile.in 2006-04-19 12:48:01.000000000 +0100
88@@ -297,7 +297,6 @@
89 -I$(top_srcdir) \
90 -I$(top_srcdir)/gdk \
91 -I$(top_builddir)/gdk \
92- -DG_DISABLE_DEPRECATED \
93 -DGDK_PIXBUF_DISABLE_DEPRECATED \
94 $(GDK_DEP_CFLAGS) \
95 $(GTK_DEBUG_FLAGS)
96Only in gtk+-2.6.8/gdk/linux-fb: Makefile.in~
97diff -ru gtk+-2.6.8.orig/gdk/Makefile.am gtk+-2.6.8/gdk/Makefile.am
98--- gtk+-2.6.8.orig/gdk/Makefile.am 2005-04-09 06:58:54.000000000 +0100
99+++ gtk+-2.6.8/gdk/Makefile.am 2006-04-19 12:47:05.000000000 +0100
100@@ -19,7 +19,6 @@
101 -I$(top_srcdir) \
102 -I$(top_builddir)/gdk \
103 -I$(top_srcdir)/gdk-pixbuf \
104- -DG_DISABLE_DEPRECATED \
105 -DGDK_PIXBUF_DISABLE_DEPRECATED \
106 -DGDK_DISABLE_DEPRECATED \
107 $(GTK_DEBUG_FLAGS) \
108Only in gtk+-2.6.8/gdk: Makefile.am~
109diff -ru gtk+-2.6.8.orig/gdk/Makefile.in gtk+-2.6.8/gdk/Makefile.in
110--- gtk+-2.6.8.orig/gdk/Makefile.in 2005-06-15 20:57:38.000000000 +0100
111+++ gtk+-2.6.8/gdk/Makefile.in 2006-04-19 12:48:04.000000000 +0100
112@@ -307,7 +307,6 @@
113 -I$(top_srcdir) \
114 -I$(top_builddir)/gdk \
115 -I$(top_srcdir)/gdk-pixbuf \
116- -DG_DISABLE_DEPRECATED \
117 -DGDK_PIXBUF_DISABLE_DEPRECATED \
118 -DGDK_DISABLE_DEPRECATED \
119 $(GTK_DEBUG_FLAGS) \
120Only in gtk+-2.6.8/gdk: Makefile.in~
121diff -ru gtk+-2.6.8.orig/gdk/x11/Makefile.am gtk+-2.6.8/gdk/x11/Makefile.am
122--- gtk+-2.6.8.orig/gdk/x11/Makefile.am 2003-12-10 13:49:57.000000000 +0000
123+++ gtk+-2.6.8/gdk/x11/Makefile.am 2006-04-19 12:46:59.000000000 +0100
124@@ -8,7 +8,6 @@
125 -I$(top_srcdir) \
126 -I$(top_srcdir)/gdk \
127 -I$(top_builddir)/gdk \
128- -DG_DISABLE_DEPRECATED \
129 -DGDK_PIXBUF_DISABLE_DEPRECATED \
130 -DGDK_DISABLE_DEPRECATED \
131 $(GTK_DEBUG_FLAGS) \
132Only in gtk+-2.6.8/gdk/x11: Makefile.am~
133diff -ru gtk+-2.6.8.orig/gdk/x11/Makefile.in gtk+-2.6.8/gdk/x11/Makefile.in
134--- gtk+-2.6.8.orig/gdk/x11/Makefile.in 2005-06-15 20:57:39.000000000 +0100
135+++ gtk+-2.6.8/gdk/x11/Makefile.in 2006-04-19 12:47:59.000000000 +0100
136@@ -295,7 +295,6 @@
137 -I$(top_srcdir) \
138 -I$(top_srcdir)/gdk \
139 -I$(top_builddir)/gdk \
140- -DG_DISABLE_DEPRECATED \
141 -DGDK_PIXBUF_DISABLE_DEPRECATED \
142 -DGDK_DISABLE_DEPRECATED \
143 $(GTK_DEBUG_FLAGS) \
144Only in gtk+-2.6.8/gdk/x11: Makefile.in~
145diff -ru gtk+-2.6.8.orig/gdk-pixbuf/Makefile.am gtk+-2.6.8/gdk-pixbuf/Makefile.am
146--- gtk+-2.6.8.orig/gdk-pixbuf/Makefile.am 2005-04-29 18:53:58.000000000 +0100
147+++ gtk+-2.6.8/gdk-pixbuf/Makefile.am 2006-04-19 12:47:35.000000000 +0100
148@@ -279,7 +279,6 @@
149 -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
150 -DGTK_VERSION=\"$(GTK_VERSION)\" \
151 -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
152- -DG_DISABLE_DEPRECATED \
153 -DGDK_PIXBUF_DISABLE_DEPRECATED \
154 -DGTK_PREFIX=\"$(prefix)\" \
155 $(INCLUDED_LOADER_DEFINE) \
156Only in gtk+-2.6.8/gdk-pixbuf: Makefile.am~
157diff -ru gtk+-2.6.8.orig/gdk-pixbuf/Makefile.in gtk+-2.6.8/gdk-pixbuf/Makefile.in
158--- gtk+-2.6.8.orig/gdk-pixbuf/Makefile.in 2005-06-15 20:57:37.000000000 +0100
159+++ gtk+-2.6.8/gdk-pixbuf/Makefile.in 2006-04-19 12:48:47.000000000 +0100
160@@ -509,7 +509,6 @@
161 -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \
162 -DGTK_VERSION=\"$(GTK_VERSION)\" \
163 -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \
164- -DG_DISABLE_DEPRECATED \
165 -DGDK_PIXBUF_DISABLE_DEPRECATED \
166 -DGTK_PREFIX=\"$(prefix)\" \
167 $(INCLUDED_LOADER_DEFINE) \
168Only in gtk+-2.6.8/gdk-pixbuf: Makefile.in~
169diff -ru gtk+-2.6.8.orig/gdk-pixbuf/pixops/Makefile.am gtk+-2.6.8/gdk-pixbuf/pixops/Makefile.am
170--- gtk+-2.6.8.orig/gdk-pixbuf/pixops/Makefile.am 2003-05-06 22:54:28.000000000 +0100
171+++ gtk+-2.6.8/gdk-pixbuf/pixops/Makefile.am 2006-04-19 12:47:29.000000000 +0100
172@@ -4,7 +4,6 @@
173 -I$(top_srcdir) -I$(top_builddir) \
174 $(GTK_DEBUG_FLAGS) \
175 $(GDK_PIXBUF_DEP_CFLAGS) \
176- -DG_DISABLE_DEPRECATED \
177 -DGDK_PIXBUF_DISABLE_DEPRECATED
178
179 noinst_PROGRAMS = timescale
180Only in gtk+-2.6.8/gdk-pixbuf/pixops: Makefile.am~
181diff -ru gtk+-2.6.8.orig/gdk-pixbuf/pixops/Makefile.in gtk+-2.6.8/gdk-pixbuf/pixops/Makefile.in
182--- gtk+-2.6.8.orig/gdk-pixbuf/pixops/Makefile.in 2005-06-15 20:57:37.000000000 +0100
183+++ gtk+-2.6.8/gdk-pixbuf/pixops/Makefile.in 2006-04-19 12:48:44.000000000 +0100
184@@ -290,7 +290,6 @@
185 -I$(top_srcdir) -I$(top_builddir) \
186 $(GTK_DEBUG_FLAGS) \
187 $(GDK_PIXBUF_DEP_CFLAGS) \
188- -DG_DISABLE_DEPRECATED \
189 -DGDK_PIXBUF_DISABLE_DEPRECATED
190
191
192Only in gtk+-2.6.8/gdk-pixbuf/pixops: Makefile.in~
193diff -ru gtk+-2.6.8.orig/gtk/Makefile.am gtk+-2.6.8/gtk/Makefile.am
194--- gtk+-2.6.8.orig/gtk/Makefile.am 2005-04-29 18:53:57.000000000 +0100
195+++ gtk+-2.6.8/gtk/Makefile.am 2006-04-19 12:47:27.000000000 +0100
196@@ -22,7 +22,6 @@
197 -I$(top_srcdir) -I../gdk \
198 -I$(top_srcdir)/gdk \
199 -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
200- -DG_DISABLE_DEPRECATED \
201 -DGDK_PIXBUF_DISABLE_DEPRECATED \
202 -DGDK_DISABLE_DEPRECATED \
203 -DGTK_DISABLE_DEPRECATED \
204Only in gtk+-2.6.8/gtk: Makefile.am~
205diff -ru gtk+-2.6.8.orig/gtk/Makefile.in gtk+-2.6.8/gtk/Makefile.in
206--- gtk+-2.6.8.orig/gtk/Makefile.in 2005-06-15 20:57:39.000000000 +0100
207+++ gtk+-2.6.8/gtk/Makefile.in 2006-04-19 12:48:41.000000000 +0100
208@@ -311,7 +311,6 @@
209 -I$(top_srcdir) -I../gdk \
210 -I$(top_srcdir)/gdk \
211 -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf \
212- -DG_DISABLE_DEPRECATED \
213 -DGDK_PIXBUF_DISABLE_DEPRECATED \
214 -DGDK_DISABLE_DEPRECATED \
215 -DGTK_DISABLE_DEPRECATED \
216Only in gtk+-2.6.8/gtk: Makefile.in~
217diff -ru gtk+-2.6.8.orig/gtk/theme-bits/Makefile.am gtk+-2.6.8/gtk/theme-bits/Makefile.am
218--- gtk+-2.6.8.orig/gtk/theme-bits/Makefile.am 2003-05-06 22:55:40.000000000 +0100
219+++ gtk+-2.6.8/gtk/theme-bits/Makefile.am 2006-04-19 12:47:21.000000000 +0100
220@@ -1,5 +1,4 @@
221 INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
222- -DG_DISABLE_DEPRECATED \
223 -DGDK_PIXBUF_DISABLE_DEPRECATED \
224 $(GDK_PIXBUF_DEP_CFLAGS)
225
226Only in gtk+-2.6.8/gtk/theme-bits: Makefile.am~
227diff -ru gtk+-2.6.8.orig/gtk/theme-bits/Makefile.in gtk+-2.6.8/gtk/theme-bits/Makefile.in
228--- gtk+-2.6.8.orig/gtk/theme-bits/Makefile.in 2005-06-15 20:57:40.000000000 +0100
229+++ gtk+-2.6.8/gtk/theme-bits/Makefile.in 2006-04-19 12:48:39.000000000 +0100
230@@ -285,7 +285,6 @@
231 sysconfdir = @sysconfdir@
232 target_alias = @target_alias@
233 INCLUDES = -I$(top_srcdir) -I$(top_builddir) \
234- -DG_DISABLE_DEPRECATED \
235 -DGDK_PIXBUF_DISABLE_DEPRECATED \
236 $(GDK_PIXBUF_DEP_CFLAGS)
237
238Only in gtk+-2.6.8/gtk/theme-bits: Makefile.in~
239diff -ru gtk+-2.6.8.orig/modules/engines/ms-windows/Makefile.am gtk+-2.6.8/modules/engines/ms-windows/Makefile.am
240--- gtk+-2.6.8.orig/modules/engines/ms-windows/Makefile.am 2005-06-04 21:10:11.000000000 +0100
241+++ gtk+-2.6.8/modules/engines/ms-windows/Makefile.am 2006-04-19 12:47:40.000000000 +0100
242@@ -6,7 +6,6 @@
243 -I$(top_srcdir) \
244 -I$(top_srcdir)/gdk \
245 -I$(top_builddir)/gdk \
246- -DG_DISABLE_DEPRECATED \
247 -DGDK_PIXBUF_DISABLE_DEPRECATED \
248 -DGDK_DISABLE_DEPRECATED \
249 $(GTK_DEP_CFLAGS)
250Only in gtk+-2.6.8/modules/engines/ms-windows: Makefile.am~
251diff -ru gtk+-2.6.8.orig/modules/engines/ms-windows/Makefile.in gtk+-2.6.8/modules/engines/ms-windows/Makefile.in
252--- gtk+-2.6.8.orig/modules/engines/ms-windows/Makefile.in 2005-06-15 20:57:41.000000000 +0100
253+++ gtk+-2.6.8/modules/engines/ms-windows/Makefile.in 2006-04-19 12:48:51.000000000 +0100
254@@ -292,7 +292,6 @@
255 -I$(top_srcdir) \
256 -I$(top_srcdir)/gdk \
257 -I$(top_builddir)/gdk \
258- -DG_DISABLE_DEPRECATED \
259 -DGDK_PIXBUF_DISABLE_DEPRECATED \
260 -DGDK_DISABLE_DEPRECATED \
261 $(GTK_DEP_CFLAGS)
262Only in gtk+-2.6.8/modules/engines/ms-windows: Makefile.in~
263diff -ru gtk+-2.6.8.orig/modules/engines/pixbuf/Makefile.am gtk+-2.6.8/modules/engines/pixbuf/Makefile.am
264--- gtk+-2.6.8.orig/modules/engines/pixbuf/Makefile.am 2004-11-28 17:21:06.000000000 +0000
265+++ gtk+-2.6.8/modules/engines/pixbuf/Makefile.am 2006-04-19 12:47:38.000000000 +0100
266@@ -6,7 +6,6 @@
267 -I$(top_srcdir) \
268 -I$(top_srcdir)/gdk \
269 -I$(top_builddir)/gdk \
270- -DG_DISABLE_DEPRECATED \
271 -DGDK_PIXBUF_DISABLE_DEPRECATED \
272 -DGDK_DISABLE_DEPRECATED \
273 $(GTK_DEP_CFLAGS)
274Only in gtk+-2.6.8/modules/engines/pixbuf: Makefile.am~
275diff -ru gtk+-2.6.8.orig/modules/engines/pixbuf/Makefile.in gtk+-2.6.8/modules/engines/pixbuf/Makefile.in
276--- gtk+-2.6.8.orig/modules/engines/pixbuf/Makefile.in 2005-06-15 20:57:41.000000000 +0100
277+++ gtk+-2.6.8/modules/engines/pixbuf/Makefile.in 2006-04-19 12:48:49.000000000 +0100
278@@ -290,7 +290,6 @@
279 -I$(top_srcdir) \
280 -I$(top_srcdir)/gdk \
281 -I$(top_builddir)/gdk \
282- -DG_DISABLE_DEPRECATED \
283 -DGDK_PIXBUF_DISABLE_DEPRECATED \
284 -DGDK_DISABLE_DEPRECATED \
285 $(GTK_DEP_CFLAGS)
286Only in gtk+-2.6.8/modules/engines/pixbuf: Makefile.in~
287diff -ru gtk+-2.6.8.orig/modules/input/Makefile.am gtk+-2.6.8/modules/input/Makefile.am
288--- gtk+-2.6.8.orig/modules/input/Makefile.am 2005-06-04 23:10:04.000000000 +0100
289+++ gtk+-2.6.8/modules/input/Makefile.am 2006-04-19 12:47:43.000000000 +0100
290@@ -8,7 +8,6 @@
291 -I$(top_srcdir) \
292 -I$(top_srcdir)/gdk \
293 -I$(top_builddir)/gdk \
294- -DG_DISABLE_DEPRECATED \
295 -DGDK_PIXBUF_DISABLE_DEPRECATED \
296 -DGDK_DISABLE_DEPRECATED \
297 -DGTK_DISABLE_DEPRECATED \
298Only in gtk+-2.6.8/modules/input: Makefile.am~
299diff -ru gtk+-2.6.8.orig/modules/input/Makefile.in gtk+-2.6.8/modules/input/Makefile.in
300--- gtk+-2.6.8.orig/modules/input/Makefile.in 2005-06-15 20:57:42.000000000 +0100
301+++ gtk+-2.6.8/modules/input/Makefile.in 2006-04-19 12:48:53.000000000 +0100
302@@ -291,7 +291,6 @@
303 -I$(top_srcdir) \
304 -I$(top_srcdir)/gdk \
305 -I$(top_builddir)/gdk \
306- -DG_DISABLE_DEPRECATED \
307 -DGDK_PIXBUF_DISABLE_DEPRECATED \
308 -DGDK_DISABLE_DEPRECATED \
309 -DGTK_DISABLE_DEPRECATED \
310Only in gtk+-2.6.8/modules/input: Makefile.in~
311diff -ru gtk+-2.6.8.orig/tests/Makefile.am gtk+-2.6.8/tests/Makefile.am
312--- gtk+-2.6.8.orig/tests/Makefile.am 2004-11-12 15:26:07.000000000 +0000
313+++ gtk+-2.6.8/tests/Makefile.am 2006-04-19 12:47:19.000000000 +0100
314@@ -4,7 +4,6 @@
315 -I$(top_srcdir) \
316 -I$(top_builddir)/gdk \
317 -I$(top_srcdir)/gdk \
318- -DG_DISABLE_DEPRECATED \
319 -DGDK_PIXBUF_DISABLE_DEPRECATED \
320 -DGDK_DISABLE_DEPRECATED \
321 -DGTK_DISABLE_DEPRECATED \
322Only in gtk+-2.6.8/tests: Makefile.am~
323diff -ru gtk+-2.6.8.orig/tests/Makefile.in gtk+-2.6.8/tests/Makefile.in
324--- gtk+-2.6.8.orig/tests/Makefile.in 2005-06-15 20:57:42.000000000 +0100
325+++ gtk+-2.6.8/tests/Makefile.in 2006-04-19 12:48:20.000000000 +0100
326@@ -289,7 +289,6 @@
327 -I$(top_srcdir) \
328 -I$(top_builddir)/gdk \
329 -I$(top_srcdir)/gdk \
330- -DG_DISABLE_DEPRECATED \
331 -DGDK_PIXBUF_DISABLE_DEPRECATED \
332 -DGDK_DISABLE_DEPRECATED \
333 -DGTK_DISABLE_DEPRECATED \
334Only in gtk+-2.6.8/tests: Makefile.in~
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/no-xwc.patch b/openembedded/packages/gtk+/gtk+-2.6.8/no-xwc.patch
new file mode 100644
index 0000000000..affb4a303e
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/no-xwc.patch
@@ -0,0 +1,151 @@
1diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c
2--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2004-11-30 14:57:14 +00:00
3+++ gtk+-2.6.0/gdk/x11/gdkdrawable-x11.c 2005-01-02 15:38:06 +00:00
4@@ -576,12 +576,14 @@
5 GDK_GC_GET_XGC (gc), x, y, (XChar2b *) text, text_length / 2);
6 }
7 }
8+#ifdef HAVE_XWC
9 else if (font->type == GDK_FONT_FONTSET)
10 {
11 XFontSet fontset = (XFontSet) GDK_FONT_XFONT (font);
12 XmbDrawString (xdisplay, impl->xid,
13 fontset, GDK_GC_GET_XGC (gc), x, y, text, text_length);
14 }
15+#endif
16 else
17 g_error("undefined font type\n");
18 }
19@@ -613,6 +615,7 @@
20 GDK_GC_GET_XGC (gc), x, y, text_8bit, text_length);
21 g_free (text_8bit);
22 }
23+#ifdef HAVE_XWC
24 else if (font->type == GDK_FONT_FONTSET)
25 {
26 if (sizeof(GdkWChar) == sizeof(wchar_t))
27@@ -633,6 +636,7 @@
28 g_free (text_wchar);
29 }
30 }
31+#endif
32 else
33 g_error("undefined font type\n");
34 }
35diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c gtk+-2.6.0/gdk/x11/gdkfont-x11.c
36--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2004-08-26 01:23:46 +01:00
37+++ gtk+-2.6.0/gdk/x11/gdkfont-x11.c 2005-01-02 15:45:39 +00:00
38@@ -525,10 +525,12 @@
39 width = XTextWidth16 (xfont, (XChar2b *) text, text_length / 2);
40 }
41 break;
42+#ifdef HAVE_XWC
43 case GDK_FONT_FONTSET:
44 fontset = (XFontSet) private->xfont;
45 width = XmbTextEscapement (fontset, text, text_length);
46 break;
47+#endif
48 default:
49 width = 0;
50 }
51@@ -578,6 +580,7 @@
52 width = 0;
53 }
54 break;
55+#ifdef HAVE_XWC
56 case GDK_FONT_FONTSET:
57 if (sizeof(GdkWChar) == sizeof(wchar_t))
58 {
59@@ -595,6 +598,7 @@
60 g_free (text_wchar);
61 }
62 break;
63+#endif
64 default:
65 width = 0;
66 }
67@@ -667,6 +671,7 @@
68 if (descent)
69 *descent = overall.descent;
70 break;
71+#ifdef HAVE_XWC
72 case GDK_FONT_FONTSET:
73 fontset = (XFontSet) private->xfont;
74 XmbTextExtents (fontset, text, text_length, &ink, &logical);
75@@ -681,6 +686,7 @@
76 if (descent)
77 *descent = ink.y + ink.height;
78 break;
79+#endif
80 }
81
82 }
83@@ -753,6 +759,7 @@
84 *descent = overall.descent;
85 break;
86 }
87+#ifdef HAVE_XWC
88 case GDK_FONT_FONTSET:
89 fontset = (XFontSet) private->xfont;
90
91@@ -780,6 +787,7 @@
92 if (descent)
93 *descent = ink.y + ink.height;
94 break;
95+#endif
96 }
97
98 }
99diff -urNd ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c gtk+-2.6.0/gdk/x11/gdkim-x11.c
100--- ../gtk+-2.6.0-r2/gtk+-2.6.0/gdk/x11/gdkim-x11.c 2004-11-17 00:55:10 +00:00
101+++ gtk+-2.6.0/gdk/x11/gdkim-x11.c 2005-01-02 15:42:04 +00:00
102@@ -48,6 +48,7 @@
103 void
104 _gdk_x11_initialize_locale (void)
105 {
106+#ifdef HAVE_XWC
107 wchar_t result;
108 gchar *current_locale;
109 static char *last_locale = NULL;
110@@ -93,7 +94,8 @@
111 GDK_NOTE (XIM,
112 g_message ("%s multi-byte string functions.",
113 gdk_use_mb ? "Using" : "Not using"));
114-
115+#endif
116+
117 return;
118 }
119
120@@ -136,6 +138,7 @@
121 {
122 gchar *mbstr;
123
124+#ifdef HAVE_XWC
125 if (gdk_use_mb)
126 {
127 GdkDisplay *display = find_a_display ();
128@@ -178,6 +181,7 @@
129 XFree (tpr.value);
130 }
131 else
132+#endif
133 {
134 gint length = 0;
135 gint i;
136@@ -210,6 +214,7 @@
137 gint
138 gdk_mbstowcs (GdkWChar *dest, const gchar *src, gint dest_max)
139 {
140+#ifdef HAVE_XWC
141 if (gdk_use_mb)
142 {
143 GdkDisplay *display = find_a_display ();
144@@ -242,6 +247,7 @@
145 return len_cpy;
146 }
147 else
148+#endif
149 {
150 gint i;
151
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/scroll-timings.patch b/openembedded/packages/gtk+/gtk+-2.6.8/scroll-timings.patch
new file mode 100644
index 0000000000..a38b21dcc2
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/scroll-timings.patch
@@ -0,0 +1,15 @@
1--- gtk+-2.4.4/gtk/gtkrange.c~ 2004-08-23 01:50:22.000000000 +0100
2+++ gtk+-2.4.4/gtk/gtkrange.c 2004-08-27 15:48:49.000000000 +0100
3@@ -35,9 +35,9 @@
4 #include "gtkintl.h"
5 #include "gtkscrollbar.h"
6
7-#define SCROLL_INITIAL_DELAY 250 /* must hold button this long before ... */
8-#define SCROLL_LATER_DELAY 100 /* ... it starts repeating at this rate */
9-#define UPDATE_DELAY 300 /* Delay for queued update */
10+#define SCROLL_INITIAL_DELAY 500 /* must hold button this long before ... */
11+#define SCROLL_LATER_DELAY 200 /* ... it starts repeating at this rate */
12+#define UPDATE_DELAY 1000 /* Delay for queued update */
13
14 enum {
15 PROP_0,
diff --git a/openembedded/packages/gtk+/gtk+-2.6.8/spinbutton.patch b/openembedded/packages/gtk+/gtk+-2.6.8/spinbutton.patch
new file mode 100644
index 0000000000..8ad7507af0
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+-2.6.8/spinbutton.patch
@@ -0,0 +1,128 @@
1--- gtk+-2.4.3/gtk/gtkspinbutton.c.old 2004-04-22 14:49:27.000000000 +0100
2+++ gtk+-2.4.3/gtk/gtkspinbutton.c 2004-06-30 21:48:18.000000000 +0100
3@@ -733,7 +733,7 @@
4
5 spin = GTK_SPIN_BUTTON (widget);
6 arrow_size = spin_button_get_arrow_size (spin);
7- panel_width = arrow_size + 2 * widget->style->xthickness;
8+ panel_width = (2 * arrow_size) + 4 * widget->style->xthickness;
9
10 widget->allocation = *allocation;
11
12@@ -866,19 +866,16 @@
13 {
14 width = spin_button_get_arrow_size (spin_button) + 2 * widget->style->xthickness;
15
16+ y = widget->style->ythickness;
17+ height = widget->requisition.height - (2 * y);
18+
19 if (arrow_type == GTK_ARROW_UP)
20 {
21 x = 0;
22- y = 0;
23-
24- height = widget->requisition.height / 2;
25 }
26 else
27 {
28- x = 0;
29- y = widget->requisition.height / 2;
30-
31- height = (widget->requisition.height + 1) / 2;
32+ x = width;
33 }
34
35 if (spin_button_at_limit (spin_button, arrow_type))
36@@ -908,32 +905,17 @@
37 shadow_type = GTK_SHADOW_OUT;
38 }
39 }
40-
41+
42 gtk_paint_box (widget->style, spin_button->panel,
43 state_type, shadow_type,
44 NULL, widget,
45- (arrow_type == GTK_ARROW_UP)? "spinbutton_up" : "spinbutton_down",
46+ NULL,
47 x, y, width, height);
48
49 height = widget->requisition.height;
50
51- if (arrow_type == GTK_ARROW_DOWN)
52- {
53- y = height / 2;
54- height = height - y - 2;
55- }
56- else
57- {
58- y = 2;
59- height = height / 2 - 2;
60- }
61-
62 width -= 3;
63-
64- if (widget && gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
65- x = 2;
66- else
67- x = 1;
68+ height -= 3;
69
70 w = width / 2;
71 w -= w % 2 - 1; /* force odd */
72@@ -1108,7 +1090,7 @@
73 if (GTK_ENTRY (widget)->editable)
74 gtk_spin_button_update (spin);
75
76- if (event->y <= widget->requisition.height / 2)
77+ if (event->x <= (spin_button_get_arrow_size (spin) + widget->style->xthickness))
78 {
79 if (event->button == 1)
80 start_spinning (spin, GTK_ARROW_UP, spin->adjustment->step_increment);
81@@ -1143,44 +1125,11 @@
82
83 arrow_size = spin_button_get_arrow_size (spin);
84
85- if (event->button == spin->button)
86- {
87- int click_child = spin->click_child;
88+ gtk_spin_button_stop_spinning (spin);
89
90- gtk_spin_button_stop_spinning (spin);
91-
92- if (event->button == 3)
93- {
94- if (event->y >= 0 && event->x >= 0 &&
95- event->y <= widget->requisition.height &&
96- event->x <= arrow_size + 2 * widget->style->xthickness)
97- {
98- if (click_child == GTK_ARROW_UP &&
99- event->y <= widget->requisition.height / 2)
100- {
101- gdouble diff;
102-
103- diff = spin->adjustment->upper - spin->adjustment->value;
104- if (diff > EPSILON)
105- gtk_spin_button_real_spin (spin, diff);
106- }
107- else if (click_child == GTK_ARROW_DOWN &&
108- event->y > widget->requisition.height / 2)
109- {
110- gdouble diff;
111-
112- diff = spin->adjustment->value - spin->adjustment->lower;
113- if (diff > EPSILON)
114- gtk_spin_button_real_spin (spin, -diff);
115- }
116- }
117- }
118- spin_button_redraw (spin);
119+ spin_button_redraw (spin);
120
121- return TRUE;
122- }
123- else
124- return GTK_WIDGET_CLASS (parent_class)->button_release_event (widget, event);
125+ return TRUE;
126 }
127
128 static gint
diff --git a/openembedded/packages/gtk+/gtk+_2.6.8.bb b/openembedded/packages/gtk+/gtk+_2.6.8.bb
new file mode 100644
index 0000000000..f4f373c12e
--- /dev/null
+++ b/openembedded/packages/gtk+/gtk+_2.6.8.bb
@@ -0,0 +1,80 @@
1LICENSE = "LGPL"
2DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
3set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
4HOMEPAGE = "http://www.gtk.org"
5SECTION = "libs"
6PRIORITY = "optional"
7DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
8
9SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
10 file://no-demos.patch;patch=1 \
11 file://no-xwc.patch;patch=1 \
12 file://automake-lossage.patch;patch=1 \
13 file://gtk+-handhelds.patch;patch=1 \
14 file://hardcoded_libtool.patch;patch=1 \
15 file://disable-tooltips.patch;patch=1 \
16 file://gtklabel-resize-patch;patch=1 \
17 file://menu-deactivate.patch;patch=1 \
18 file://scroll-timings.patch;patch=1 \
19 file://migration.patch;patch=1;pnum=0 \
20 file://no-deprecation.patch;patch=1"
21
22inherit autotools pkgconfig
23
24FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
25 ${bindir}/gtk-query-immodules-2.0 \
26 ${bindir}/gtk-update-icon-cache \
27 ${libdir}/lib*.so.* \
28 ${datadir}/themes ${sysconfdir} \
29 ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
30FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
31
32RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
33
34EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
35# --disable-cruft
36
37LIBV = "2.4.0"
38
39do_stage () {
40 oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
41 oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
42 oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
43 oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
44
45 autotools_stage_includes
46
47 mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
48 install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
49
50 install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
51}
52
53do_install_append () {
54 install -d ${D}${sysconfdir}/gtk-2.0
55}
56
57postinst_prologue() {
58if [ "x$D" != "x" ]; then
59 exit 1
60fi
61
62}
63
64PACKAGES_DYNAMIC = "gdk-pixbuf-loader-* gtk-immodule-*"
65
66python populate_packages_prepend () {
67 import os.path
68
69 prologue = bb.data.getVar("postinst_prologue", d, 1)
70
71 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
72 loaders_root = os.path.join(gtk_libdir, 'loaders')
73 immodules_root = os.path.join(gtk_libdir, 'immodules')
74
75 do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s', prologue + 'gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders')
76 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules > /etc/gtk-2.0/gtk.immodules')
77
78 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
79 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
80}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-01-15 09:27:55 +0000