summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-gnome/gtk+
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-gnome/gtk+')
-rw-r--r--meta-oe/recipes-gnome/gtk+/composite-pixbuf_0.0.bb21
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch13
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch24
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch31
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch10
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch19
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff100
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+.inc97
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch19
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch10
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch13
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/migration.patch619
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch24
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+/xsettings.patch16
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk+_2.20.1.bb71
-rw-r--r--meta-oe/recipes-gnome/gtk+/gtk-fpu.inc6
16 files changed, 0 insertions, 1093 deletions
diff --git a/meta-oe/recipes-gnome/gtk+/composite-pixbuf_0.0.bb b/meta-oe/recipes-gnome/gtk+/composite-pixbuf_0.0.bb
deleted file mode 100644
index 29e329a4a..000000000
--- a/meta-oe/recipes-gnome/gtk+/composite-pixbuf_0.0.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1DESCRIPTION = "Pixbuf performance test"
2LICENSE = "Public domain"
3DEPENDS = "gtk+"
4
5SRC_URI = "http://amelang.net/composite_pixbuf.c"
6
7S = "${WORKDIR}"
8
9do_compile() {
10 ${CC} ${CFLAGS} composite_pixbuf.c -o composite_pixbuf \
11 `pkg-config --cflags gdk-2.0` `pkg-config --libs gdk-2.0` `pkg-config --libs x11` `pkg-config --libs pango` \
12 -lxcb -lXext -lXinerama -lXrandr -lXcursor -lXfixes -lpangoft2-1.0 -lz -lexpat -lxcb-xlib -lXau -lXdmcp
13}
14
15do_install() {
16 install -d ${D}${bindir}
17 install -m 755 composite_pixbuf ${D}${bindir}
18}
19
20SRC_URI[md5sum] = "97edf3cce3353b6cb5f822442a83aa5e"
21SRC_URI[sha256sum] = "bd6f9e5dc0a89e9918f78a550f6e688480f044cec2e8674d34c7c6212831d6bd"
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch
deleted file mode 100644
index 36e955700..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: gtk+-2.20.1/configure.in
2===================================================================
3--- gtk+-2.20.1.orig/configure.in 2010-07-10 16:25:40.000000000 -0700
4+++ gtk+-2.20.1/configure.in 2010-07-12 22:08:49.878377002 -0700
5@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
6 AC_SYS_LARGEFILE
7
8 AM_PROG_AS
9-AC_PATH_PROG(NM, nm, nm)
10+AC_CHECK_PROG(NM, nm, nm)
11
12 dnl Initialize maintainer mode
13 AM_MAINTAINER_MODE
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch
deleted file mode 100644
index 10e84d3ba..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1commit 96c731cc2dde8a3e4ba542eca4c87ed6154084d2
2Author: Stanislav Brabec <sbrabec@suse.cz>
3Date: Fri Jul 9 15:11:15 2010 +0200
4
5 Fix pointer grab dead lock if gtk_drag_begin uses GDK_CURRENT_TIME and
6 release happens before getting grab.
7
8 For more see https://bugzilla.gnome.org/show_bug.cgi?id=623865
9
10diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
11index a0d878d..48063a5 100644
12--- a/gtk/gtkdnd.c
13+++ b/gtk/gtkdnd.c
14@@ -4065,6 +4065,10 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
15 pointer = gdk_drag_context_get_device (info->context);
16 keyboard = gdk_device_get_associated_device (pointer);
17
18+ /* Prevent grab after release (see bug 623865) */
19+ if (info->grab_time == GDK_CURRENT_TIME)
20+ time = GDK_CURRENT_TIME;
21+
22 if (info->update_idle)
23 {
24 g_source_remove (info->update_idle);
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
deleted file mode 100644
index 82fbbac8d..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1Index: gtk+-2.14.2/configure.in
2===================================================================
3--- gtk+-2.14.2.orig/configure.in 2008-09-23 15:52:44.000000000 +0100
4+++ gtk+-2.14.2/configure.in 2008-09-23 15:53:51.000000000 +0100
5@@ -401,7 +401,7 @@
6 case $enable_explicit_deps in
7 auto)
8 export SED
9- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
10+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
11 if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then
12 enable_explicit_deps=yes
13 else
14@@ -759,7 +759,7 @@
15 dnl Now we check to see if our libtool supports shared lib deps
16 dnl (in a rather ugly way even)
17 if $dynworks; then
18- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config"
19+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config"
20 pixbuf_deplibs_check=`$pixbuf_libtool_config | \
21 grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \
22 sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'`
23@@ -1893,7 +1893,7 @@
24 # We are using gmodule-no-export now, but I'm leaving the stripping
25 # code in place for now, since pango and atk still require gmodule.
26 export SED
27-export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
28+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
29 if test -n "$export_dynamic"; then
30 GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"`
31 GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
deleted file mode 100644
index 0fc4c48d1..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch
+++ /dev/null
@@ -1,10 +0,0 @@
1--- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100
2+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100
3@@ -1,6 +1,6 @@
4 ## Makefile.am for GTK+
5
6-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
7+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib
8 SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
9
10 # require automake 1.4
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
deleted file mode 100644
index aa1bffa8a..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1--- /tmp/Makefile.am 2009-10-28 18:21:54.000000000 +0100
2+++ gtk+-2.18.3/gtk/Makefile.am 2009-10-28 18:23:07.000000000 +0100
3@@ -1300,11 +1300,11 @@
4 ./gtk-update-icon-cache
5 endif
6
7-gtkbuiltincache.h: @REBUILD@ stamp-icons
8- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
9- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
10- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
11- mv gtkbuiltincache.h.tmp gtkbuiltincache.h
12+#gtkbuiltincache.h: @REBUILD@ stamp-icons
13+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
14+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \
15+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
16+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h
17
18 EXTRA_DIST += \
19 $(STOCK_ICONS) \
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff b/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
deleted file mode 100644
index 59ad150b2..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff
+++ /dev/null
@@ -1,100 +0,0 @@
1Index: gtk/gtkcellrenderertoggle.c
2===================================================================
3--- gtk/gtkcellrenderertoggle.c (revision 18523)
4+++ gtk/gtkcellrenderertoggle.c (working copy)
5@@ -71,6 +71,8 @@
6 PROP_INDICATOR_SIZE
7 };
8
9+/* This is a hard-coded default which promptly gets overridden by a size
10+ calculated from the font size. */
11 #define TOGGLE_WIDTH 13
12
13 static guint toggle_cell_signals[LAST_SIGNAL] = { 0 };
14@@ -80,8 +82,9 @@
15 typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate;
16 struct _GtkCellRendererTogglePrivate
17 {
18- gint indicator_size;
19-
20+ gint indicator_size; /* This is the real size */
21+ gint override_size; /* This is the size set from the indicator-size property */
22+ GtkWidget *cached_widget;
23 guint inconsistent : 1;
24 };
25
26@@ -104,6 +107,7 @@
27 GTK_CELL_RENDERER (celltoggle)->ypad = 2;
28
29 priv->indicator_size = TOGGLE_WIDTH;
30+ priv->override_size = 0;
31 priv->inconsistent = FALSE;
32 }
33
34@@ -210,7 +214,7 @@
35 g_value_set_boolean (value, celltoggle->radio);
36 break;
37 case PROP_INDICATOR_SIZE:
38- g_value_set_int (value, priv->indicator_size);
39+ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size);
40 break;
41 default:
42 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
43@@ -245,7 +249,7 @@
44 celltoggle->radio = g_value_get_boolean (value);
45 break;
46 case PROP_INDICATOR_SIZE:
47- priv->indicator_size = g_value_get_int (value);
48+ priv->override_size = g_value_get_int (value);
49 break;
50 default:
51 G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
52@@ -273,6 +277,27 @@
53 }
54
55 static void
56+on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data)
57+{
58+ GtkCellRendererTogglePrivate *priv = user_data;
59+ PangoContext *context;
60+ PangoFontMetrics *metrics;
61+ int height;
62+
63+ context = gtk_widget_get_pango_context (widget);
64+ metrics = pango_context_get_metrics (context,
65+ widget->style->font_desc,
66+ pango_context_get_language (context));
67+
68+ height = pango_font_metrics_get_ascent (metrics) +
69+ pango_font_metrics_get_descent (metrics);
70+
71+ pango_font_metrics_unref (metrics);
72+
73+ priv->indicator_size = PANGO_PIXELS (height * 0.85);
74+}
75+
76+static void
77 gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell,
78 GtkWidget *widget,
79 GdkRectangle *cell_area,
80@@ -287,6 +312,20 @@
81
82 priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell);
83
84+ if (priv->override_size) {
85+ priv->indicator_size = priv->override_size;
86+ } else if (priv->cached_widget != widget) {
87+ if (priv->cached_widget) {
88+ g_object_remove_weak_pointer (widget, &priv->cached_widget);
89+ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv);
90+ }
91+ priv->cached_widget = widget;
92+ g_object_add_weak_pointer (widget, &priv->cached_widget);
93+ g_signal_connect (widget, "style-set", on_widget_style_set, priv);
94+
95+ on_widget_style_set (widget, NULL, priv);
96+ }
97+
98 calc_width = (gint) cell->xpad * 2 + priv->indicator_size;
99 calc_height = (gint) cell->ypad * 2 + priv->indicator_size;
100
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+.inc b/meta-oe/recipes-gnome/gtk+/gtk+.inc
deleted file mode 100644
index 42a8febcd..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+.inc
+++ /dev/null
@@ -1,97 +0,0 @@
1DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \
2set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites."
3HOMEPAGE = "http://www.gtk.org"
4SECTION = "libs"
5LICENSE = "LGPL"
6PRIORITY = "optional"
7DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups \
8 libxrandr libxdamage libxrender libxcomposite cairo jasper gtk+-native"
9PROVIDES = "gdk-pixbuf"
10
11MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
12SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2;name=gtk \
13 file://hardcoded_libtool.patch \
14 file://run-iconcache.patch \
15 file://toggle-font.diff;striplevel=0 \
16 file://xsettings.patch \
17 "
18
19INC_PR = "r10"
20
21inherit autotools pkgconfig
22
23LEAD_SONAME = "libgtk-x11-2.0.so"
24LIBV = "2.10.0"
25
26PACKAGES =+ "${PN}-demo ${PN}-demo-source"
27FILES_${PN}-demo = "${bindir}/gtk-demo"
28FILES_${PN}-demo-source = "${datadir}/gtk-2.0/demo"
29
30FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
31 ${bindir}/gtk-update-icon-cache \
32 ${bindir}/gtk-query-immodules-2.0 \
33 ${libdir}/lib*.so.* \
34 ${datadir}/themes ${sysconfdir} \
35 ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
36
37FILES_${PN}-dev += " \
38 ${datadir}/gtk-2.0/include \
39 ${libdir}/gtk-2.0/include \
40 ${bindir}/gdk-pixbuf-csource \
41 ${bindir}/gtk-builder-convert"
42
43FILES_${PN}-dbg += " \
44 ${libdir}/gtk-2.0/modules/.debug/* \
45 ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
46 ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
47 ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
48 ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
49
50NEATSTUFF = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
51NEATSTUFF_append_linux = " glibc-gconv-iso8859-1"
52NEATSTUFF_append_linux-gnueabi = " glibc-gconv-iso8859-1"
53
54# Only add runtime dependencies for target recipe
55RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}"
56RRECOMMENDS_${PN} += "${@['', '${NEATSTUFF}']['${PN}' == '${BPN}']}"
57
58do_install_append () {
59 mkdir -p ${D}${libdir}/gtk-2.0/include
60 install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
61 # Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
62 cp gtk/*.h ${D}${includedir}/gtk-2.0/gtk/
63
64 install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
65
66 install -d ${D}${sysconfdir}/gtk-2.0
67 rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
68}
69
70do_install_append_virtclass-native () {
71 ${D}${bindir}/gdk-pixbuf-query-loaders \
72 ${D}${libdir}/gtk-2.0/${LIBV}/loaders/*.so | \
73 sed -e's,${D},,' > \
74 ${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
75}
76
77SYSROOT_PREPROCESS_FUNCS_append_virtclass-native = " gdk_pixbuf_fixup"
78
79_SYSROOT_DEST = "${SYSROOT_DESTDIR}${STAGING_DIR_HOST}"
80gdk_pixbuf_fixup () {
81 create_wrapper ${_SYSROOT_DEST}${bindir}/gdk-pixbuf-query-loaders \
82 LD_LIBRARY_PATH=${STAGING_LIBDIR} \
83 GDK_PIXBUF_MODULEDIR=${libdir}/gtk-2.0/${LIBV}/loaders
84 ${_SYSROOT_DEST}${bindir}/gdk-pixbuf-query-loaders \
85 ${_SYSROOT_DEST}${libdir}/gtk-2.0/${LIBV}/loaders/*.so | \
86 sed -e's,${_SYSROOT_DEST},,' > \
87 ${_SYSROOT_DEST}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
88 create_wrapper ${_SYSROOT_DEST}${bindir}/gdk-pixbuf-csource \
89 GDK_PIXBUF_MODULE_FILE=${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders
90}
91
92postinst_prologue() {
93if [ "x$D" != "x" ]; then
94 exit 1
95fi
96
97}
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch b/meta-oe/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch
deleted file mode 100644
index 7b37d4bb2..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1--- gtk+-2.10.12_/gtk/gtkfilesel.c 2007-06-12 14:00:38.000000000 +0200
2+++ gtk+-2.10.12/gtk/gtkfilesel.c 2007-06-12 14:40:32.000000000 +0200
3@@ -2444,9 +2444,13 @@
4
5 if (!is_file)
6 {
7- gtk_file_selection_dir_activate (tree_view, path,
8- gtk_tree_view_get_column (tree_view, DIR_COLUMN),
9- user_data);
10+ fs->last_selected = g_strdup (g_ptr_array_index (new_names, index));
11+ gtk_file_selection_dir_activate (tree_view, path,
12+ gtk_tree_view_get_column (tree_view, DIR_COLUMN),
13+ user_data);
14+ gtk_tree_path_free (path);
15+ return;
16+
17 }
18
19 gtk_tree_path_free (path);
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch b/meta-oe/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch
deleted file mode 100644
index df2965634..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch
+++ /dev/null
@@ -1,10 +0,0 @@
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/meta-oe/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch b/meta-oe/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch
deleted file mode 100644
index 6cf1c1499..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c
2===================================================================
3--- gtk+-2.6.10.orig/modules/engines/pixbuf/pixbuf-render.c 2005-08-18 14:11:00.000000000 +0000
4+++ gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c 2007-05-24 11:16:50.000000000 +0000
5@@ -407,7 +407,7 @@
6 0, 0, rect.width, rect.height,
7 dest_x - rect.x, dest_y - rect.y,
8 x_scale, y_scale,
9- GDK_INTERP_BILINEAR);
10+ GDK_INTERP_NEAREST);
11
12 g_object_unref (partial_src);
13
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/migration.patch b/meta-oe/recipes-gnome/gtk+/gtk+/migration.patch
deleted file mode 100644
index f4c7f853a..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+/migration.patch
+++ /dev/null
@@ -1,619 +0,0 @@
1Index: configure.in
2===================================================================
3RCS file: /cvs/gnome/gtk+/configure.in,v
4retrieving revision 1.419.2.4
5diff -u -r1.419.2.4 configure.in
6--- configure.in 8 Feb 2005 21:39:42 -0000 1.419.2.4
7+++ configure.in 27 Feb 2005 13:10:16 -0000
8@@ -1495,6 +1495,16 @@
9 GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"
10 GTK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GTK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS $GTK_EXTRA_CFLAGS"
11
12+AC_ARG_ENABLE(display-migration,
13+ [AC_HELP_STRING([--enable-display-migration],
14+ [include support for GPE_CHANGE_DISPLAY protocol])],
15+ enable_migration=yes, enable_migration=no)
16+if test "$enable_migration" = "yes"; then
17+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled])
18+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt"
19+fi
20+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes")
21+
22 AC_SUBST(GTK_PACKAGES)
23 AC_SUBST(GTK_EXTRA_LIBS)
24 AC_SUBST(GTK_EXTRA_CFLAGS)
25Index: gtk/Makefile.am
26===================================================================
27RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v
28retrieving revision 1.266.2.1
29diff -u -r1.266.2.1 Makefile.am
30--- gtk/Makefile.am 13 Jan 2005 15:18:21 -0000 1.266.2.1
31+++ gtk/Makefile.am 27 Feb 2005 13:10:17 -0000
32@@ -520,6 +520,10 @@
33 gtkwindow.c \
34 xembed.h
35
36+if ENABLE_MIGRATION
37+gtk_c_sources += gtkmigration.c
38+endif
39+
40 if OS_UNIX
41 gtk_private_h_sources += gtkfilesystemunix.h
42 gtk_c_sources += gtkfilesystemunix.c
43Index: gtk/gtkmain.c
44===================================================================
45RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v
46retrieving revision 1.255
47diff -u -r1.255 gtkmain.c
48--- gtk/gtkmain.c 27 Dec 2004 05:25:15 -0000 1.255
49+++ gtk/gtkmain.c 27 Feb 2005 13:10:19 -0000
50@@ -491,6 +491,10 @@
51 _gtk_accel_map_init ();
52 _gtk_rc_init ();
53
54+#ifdef ENABLE_MIGRATION
55+ gtk_migration_init ();
56+#endif
57+
58 /* Set the 'initialized' flag.
59 */
60 gtk_initialized = TRUE;
61Index: gtk/gtkwindow.c
62===================================================================
63RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.c,v
64retrieving revision 1.281.2.4
65diff -u -r1.281.2.4 gtkwindow.c
66--- gtk/gtkwindow.c 21 Feb 2005 04:21:49 -0000 1.281.2.4
67+++ gtk/gtkwindow.c 27 Feb 2005 13:10:56 -0000
68@@ -731,6 +731,8 @@
69 add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
70 }
71
72+extern void gtk_migration_mark_window (GtkWidget *w);
73+
74 static void
75 gtk_window_init (GtkWindow *window)
76 {
77@@ -790,6 +792,10 @@
78 "event",
79 G_CALLBACK (gtk_window_event),
80 NULL);
81+
82+#ifdef ENABLE_MIGRATION
83+ gtk_migration_mark_window (window);
84+#endif
85 }
86
87 static void
88--- /dev/null 2005-02-20 01:07:50.714416160 +0000
89+++ gtk/gtkmigration.c 2005-02-27 15:05:04.052757352 +0000
90@@ -0,0 +1,529 @@
91+/*
92+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org>
93+ *
94+ * This program is free software; you can redistribute it and/or
95+ * modify it under the terms of the GNU General Public License
96+ * as published by the Free Software Foundation; either version
97+ * 2 of the License, or (at your option) any later version.
98+ */
99+
100+#include <stdlib.h>
101+#include <ctype.h>
102+#include <libintl.h>
103+#include <string.h>
104+#include <assert.h>
105+
106+#include <X11/X.h>
107+#include <X11/Xlib.h>
108+#include <X11/Xatom.h>
109+
110+#include <gcrypt.h>
111+
112+#include "gtk.h"
113+#include "gdk.h"
114+#include "x11/gdkx.h"
115+
116+#define _(x) gettext(x)
117+
118+static GdkAtom string_gdkatom, display_change_gdkatom;
119+static GdkAtom rsa_challenge_gdkatom;
120+
121+#define DISPLAY_CHANGE_SUCCESS 0
122+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1
123+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2
124+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3
125+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4
126+
127+static gboolean no_auth;
128+
129+static GSList *all_widgets;
130+
131+static gboolean gtk_migration_initialised;
132+
133+#define CHALLENGE_LEN 64
134+
135+gchar *gtk_migration_auth_challenge_string;
136+
137+static unsigned char challenge_bytes[CHALLENGE_LEN];
138+static unsigned long challenge_seq;
139+
140+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0')
141+
142+struct rsa_key
143+{
144+ gcry_mpi_t n, e, d, p, q, u;
145+};
146+
147+static gcry_mpi_t
148+mpi_from_sexp (gcry_sexp_t r, char *tag)
149+{
150+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0);
151+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG);
152+}
153+
154+static char *
155+hex_from_mpi (gcry_mpi_t m)
156+{
157+ char *buf;
158+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m);
159+ return buf;
160+}
161+
162+static void
163+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result)
164+{
165+ size_t dlen = strlen (display);
166+ gchar *buf = g_malloc (dlen + 1 + len);
167+ strcpy (buf, display);
168+ memcpy (buf + dlen + 1, challenge, len);
169+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1);
170+ g_free (buf);
171+}
172+
173+static int
174+do_encode_md (const unsigned char *digest, size_t digestlen, int algo,
175+ unsigned int nbits, gcry_mpi_t *r_val)
176+{
177+ int nframe = (nbits+7) / 8;
178+ unsigned char *frame;
179+ int i, n;
180+ unsigned char asn[100];
181+ size_t asnlen;
182+
183+ asnlen = sizeof(asn);
184+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen))
185+ return -1;
186+
187+ if (digestlen + asnlen + 4 > nframe )
188+ return -1;
189+
190+ /* We encode the MD in this way:
191+ *
192+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes)
193+ *
194+ * PAD consists of FF bytes.
195+ */
196+ frame = g_malloc (nframe);
197+ n = 0;
198+ frame[n++] = 0;
199+ frame[n++] = 1; /* block type */
200+ i = nframe - digestlen - asnlen -3 ;
201+ assert ( i > 1 );
202+ memset ( frame+n, 0xff, i ); n += i;
203+ frame[n++] = 0;
204+ memcpy ( frame+n, asn, asnlen ); n += asnlen;
205+ memcpy ( frame+n, digest, digestlen ); n += digestlen;
206+ assert ( n == nframe );
207+
208+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe);
209+ g_free (frame);
210+ return 0;
211+}
212+
213+static gboolean
214+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf)
215+{
216+ gcry_mpi_t mpi, mpi2;
217+ gcry_sexp_t data, sig, key;
218+ int rc;
219+
220+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi);
221+
222+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi);
223+
224+ gcry_mpi_release (mpi);
225+
226+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e);
227+
228+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL))
229+ {
230+ gcry_sexp_release (data);
231+ return FALSE;
232+ }
233+
234+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2);
235+
236+ rc = gcry_pk_verify (sig, data, key);
237+
238+ gcry_sexp_release (data);
239+ gcry_sexp_release (key);
240+ gcry_sexp_release (sig);
241+ gcry_mpi_release (mpi2);
242+
243+ if (rc)
244+ return FALSE;
245+
246+ return TRUE;
247+}
248+
249+static void
250+gtk_migration_auth_update_challenge (void)
251+{
252+ int i;
253+ unsigned char *p;
254+
255+ if (gtk_migration_auth_challenge_string == NULL)
256+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9);
257+
258+ p = gtk_migration_auth_challenge_string;
259+
260+ for (i = 0; i < CHALLENGE_LEN; i++)
261+ {
262+ *p++ = hexbyte (challenge_bytes[i] >> 4);
263+ *p++ = hexbyte (challenge_bytes[i] & 15);
264+ }
265+
266+ sprintf (p, "%08lx", challenge_seq++);
267+}
268+
269+static void
270+gtk_migration_auth_generate_challenge (void)
271+{
272+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM);
273+ gtk_migration_auth_update_challenge ();
274+}
275+
276+static struct rsa_key *
277+parse_pubkey (char *s)
278+{
279+ struct rsa_key *r;
280+ gcry_mpi_t n, e;
281+ gchar *sp;
282+
283+ sp = strtok (s, " \n");
284+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL);
285+ sp = strtok (NULL, " \n");
286+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL);
287+
288+ r = g_malloc0 (sizeof (struct rsa_key));
289+ r->e = e;
290+ r->n = n;
291+ return r;
292+}
293+
294+static struct rsa_key *
295+lookup_pubkey (u_int32_t id)
296+{
297+ const gchar *home_dir = g_get_home_dir ();
298+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir);
299+ FILE *fp = fopen (filename, "r");
300+ struct rsa_key *r = NULL;
301+
302+ if (fp)
303+ {
304+ while (!feof (fp))
305+ {
306+ char buffer[4096];
307+ if (fgets (buffer, 4096, fp))
308+ {
309+ char *p;
310+ u_int32_t this_id = strtoul (buffer, &p, 16);
311+ if (p != buffer && *p == ' ')
312+ {
313+#ifdef DEBUG
314+ fprintf (stderr, "found id %x\n", this_id);
315+#endif
316+ if (this_id == id)
317+ {
318+ r = parse_pubkey (++p);
319+ break;
320+ }
321+ }
322+ }
323+ }
324+ fclose (fp);
325+ }
326+
327+ g_free (filename);
328+ return r;
329+}
330+
331+static void
332+free_pubkey (struct rsa_key *k)
333+{
334+ gcry_mpi_release (k->n);
335+ gcry_mpi_release (k->e);
336+
337+ g_free (k);
338+}
339+
340+static gboolean
341+gtk_migration_auth_validate_request (char *display, char *data)
342+{
343+ u_int32_t key_id;
344+ char *ep;
345+ char *p;
346+ struct rsa_key *k;
347+ char hash[20];
348+ gboolean rc;
349+
350+ p = strchr (data, ' ');
351+ if (p == NULL)
352+ return FALSE;
353+ *p++ = 0;
354+
355+ key_id = strtoul (data, &ep, 16);
356+ if (*ep)
357+ return FALSE;
358+
359+ k = lookup_pubkey (key_id);
360+ if (k == NULL)
361+ return FALSE;
362+
363+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string,
364+ strlen (gtk_migration_auth_challenge_string), hash);
365+
366+ rc = gtk_migration_crypt_check_signature (k, hash, p);
367+
368+ free_pubkey (k);
369+
370+ return rc;
371+}
372+
373+static int
374+do_change_display (GtkWidget *w, char *display_name)
375+{
376+ GdkDisplay *newdisplay;
377+ guint screen_nr = 1;
378+ guint i;
379+
380+ if (display_name[0] == 0)
381+ return DISPLAY_CHANGE_INDETERMINATE_ERROR;
382+
383+ i = strlen (display_name) - 1;
384+ while (i > 0 && isdigit (display_name[i]))
385+ i--;
386+
387+ if (display_name[i] == '.')
388+ {
389+ screen_nr = atoi (display_name + i + 1);
390+ display_name[i] = 0;
391+ }
392+
393+ newdisplay = gdk_display_open (display_name);
394+ if (newdisplay)
395+ {
396+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr);
397+ if (screen)
398+ {
399+ gtk_window_set_screen (GTK_WINDOW (w), screen);
400+ gdk_display_manager_set_default_display (gdk_display_manager_get (),
401+ newdisplay);
402+ return DISPLAY_CHANGE_SUCCESS;
403+ }
404+ else
405+ return DISPLAY_CHANGE_NO_SUCH_SCREEN;
406+ }
407+
408+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT;
409+}
410+
411+static void
412+set_challenge_on_window (GdkWindow *window)
413+{
414+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom,
415+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string,
416+ strlen (gtk_migration_auth_challenge_string));
417+}
418+
419+static void
420+update_challenge_on_windows (void)
421+{
422+ GSList *i;
423+
424+ gtk_migration_auth_update_challenge ();
425+
426+ for (i = all_widgets; i; i = i->next)
427+ {
428+ GtkWidget *w = GTK_WIDGET (i->data);
429+ if (w->window)
430+ set_challenge_on_window (w->window);
431+ }
432+}
433+
434+static void
435+reset_state (GdkWindow *window)
436+{
437+ gdk_property_change (window, display_change_gdkatom, string_gdkatom,
438+ 8, GDK_PROP_MODE_REPLACE, NULL, 0);
439+}
440+
441+static void
442+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code)
443+{
444+ XClientMessageEvent ev;
445+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay,
446+ display_change_gdkatom);
447+
448+ memset (&ev, 0, sizeof (ev));
449+
450+ ev.type = ClientMessage;
451+ ev.window = window;
452+ ev.message_type = atom;
453+ ev.format = 32;
454+
455+ ev.data.l[0] = window;
456+ ev.data.l[1] = code;
457+
458+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev);
459+}
460+
461+static int
462+handle_request (GdkWindow *gwindow, char *prop)
463+{
464+ GtkWidget *widget;
465+ char *target, *auth_method, *auth_data;
466+ char *p;
467+
468+ target = prop;
469+ auth_method = "NULL";
470+ auth_data = NULL;
471+
472+ p = strchr (prop, ' ');
473+ if (p)
474+ {
475+ *p = 0;
476+ auth_method = ++p;
477+
478+ p = strchr (p, ' ');
479+ if (p)
480+ {
481+ *p = 0;
482+ auth_data = ++p;
483+ }
484+ }
485+
486+ if (no_auth == FALSE)
487+ {
488+ if (!strcasecmp (auth_method, "null"))
489+ return DISPLAY_CHANGE_AUTHENTICATION_BAD;
490+ else if (!strcasecmp (auth_method, "rsa-sig"))
491+ {
492+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE)
493+ return DISPLAY_CHANGE_AUTHENTICATION_BAD;
494+ }
495+ else
496+ return DISPLAY_CHANGE_AUTHENTICATION_BAD;
497+ }
498+
499+ gdk_window_get_user_data (gwindow, (gpointer*) &widget);
500+
501+ if (widget)
502+ return do_change_display (widget, target);
503+
504+ return DISPLAY_CHANGE_INDETERMINATE_ERROR;
505+}
506+
507+static GdkFilterReturn
508+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p)
509+{
510+ XPropertyEvent *xev = (XPropertyEvent *)xevp;
511+
512+ if (xev->type == PropertyNotify)
513+ {
514+ GdkDisplay *gdisplay;
515+ Atom atom;
516+
517+ gdisplay = gdk_x11_lookup_xdisplay (xev->display);
518+ if (gdisplay)
519+ {
520+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom);
521+
522+ if (xev->atom == atom)
523+ {
524+ GdkWindow *gwindow;
525+
526+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window);
527+
528+ if (gwindow)
529+ {
530+ GdkAtom actual_type;
531+ gint actual_format;
532+ gint actual_length;
533+ unsigned char *prop = NULL;
534+
535+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom,
536+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format,
537+ &actual_length, &prop))
538+ {
539+ if (actual_length != 0)
540+ {
541+ if (actual_type == string_gdkatom && actual_length > 8)
542+ {
543+ gchar *buf = g_malloc (actual_length + 1);
544+ int rc;
545+
546+ memcpy (buf, prop, actual_length);
547+ buf[actual_length] = 0;
548+
549+ rc = handle_request (gwindow, buf);
550+
551+ g_free (buf);
552+ generate_response (gdisplay, xev->display, xev->window, rc);
553+
554+ if (rc == DISPLAY_CHANGE_SUCCESS)
555+ update_challenge_on_windows ();
556+ }
557+
558+ reset_state (gwindow);
559+ }
560+ }
561+
562+ if (prop)
563+ g_free (prop);
564+ }
565+ }
566+
567+ return GDK_FILTER_REMOVE;
568+ }
569+ }
570+
571+ return GDK_FILTER_CONTINUE;
572+}
573+
574+static void
575+unrealize_window (GtkWidget *w)
576+{
577+ all_widgets = g_slist_remove (all_widgets, w);
578+}
579+
580+void
581+gtk_migration_mark_window (GtkWidget *w)
582+{
583+ if (! gtk_migration_initialised)
584+ {
585+ g_warning ("gtk_migration not initialised yet");
586+ return;
587+ }
588+
589+ if (GTK_WIDGET_REALIZED (w))
590+ {
591+ GdkWindow *window = w->window;
592+
593+ gdk_window_add_filter (window, filter_func, NULL);
594+
595+ reset_state (window);
596+ set_challenge_on_window (window);
597+
598+ all_widgets = g_slist_append (all_widgets, w);
599+
600+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL);
601+ }
602+ else
603+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL);
604+}
605+
606+void
607+gtk_migration_init (void)
608+{
609+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL)
610+ no_auth = TRUE;
611+
612+ string_gdkatom = gdk_atom_intern ("STRING", FALSE);
613+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE);
614+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE);
615+
616+ gtk_migration_auth_generate_challenge ();
617+
618+ gtk_migration_initialised = TRUE;
619+}
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch b/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch
deleted file mode 100644
index b74d9c963..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1commit eff1fe2500f07fa2b4683ff52fe92e39e6487b05
2Author: Matthias Clasen <mclasen@redhat.com>
3Date: Fri May 21 12:13:05 2010 -0400
4
5 Make the !xkb build survive a little longer
6
7 This fixes bug 619114.
8
9diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
10index c0cbc99..6cded79 100644
11--- a/gdk/x11/gdkdisplay-x11.c
12+++ b/gdk/x11/gdkdisplay-x11.c
13@@ -690,7 +690,11 @@ gdk_display_beep (GdkDisplay *display)
14 {
15 g_return_if_fail (GDK_IS_DISPLAY (display));
16
17+#ifdef HAVE_XKB
18 XkbBell (GDK_DISPLAY_XDISPLAY (display), None, 0, None);
19+#else
20+ XBell (GDK_DISPLAY_XDISPLAY (display), 0);
21+#endif
22 }
23
24 /**
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+/xsettings.patch b/meta-oe/recipes-gnome/gtk+/gtk+/xsettings.patch
deleted file mode 100644
index b63e262d3..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+/xsettings.patch
+++ /dev/null
@@ -1,16 +0,0 @@
1--- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004
2+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004
3@@ -2827,10 +2827,9 @@
4 {
5 GdkScreenX11 *screen = data;
6
7- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent))
8- return GDK_FILTER_REMOVE;
9- else
10- return GDK_FILTER_CONTINUE;
11+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent);
12+
13+ return GDK_FILTER_CONTINUE;
14 }
15
16 static void
diff --git a/meta-oe/recipes-gnome/gtk+/gtk+_2.20.1.bb b/meta-oe/recipes-gnome/gtk+/gtk+_2.20.1.bb
deleted file mode 100644
index c565514a1..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk+_2.20.1.bb
+++ /dev/null
@@ -1,71 +0,0 @@
1require gtk+.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
4 file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \
5 file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
6 file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c"
7
8SRC_URI_append_virtclass-native = " file://no-demos.patch \
9"
10SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
11 file://cross-nm.patch \
12 file://xkb-ifdef.patch \
13 "
14
15SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
16SRC_URI[gtk.sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65"
17
18PR = "${INC_PR}.4"
19
20BBCLASSEXTEND = "native"
21
22ARM_INSTRUCTION_SET = "arm"
23
24DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native libxext-native libgcrypt-native"
25PROVIDES_virtclass-native = "gdk-pixbuf-csource-native"
26
27# Enable xkb selectively
28XKBTOGGLE = " --disable-xkb"
29XKBTOGGLE_angstrom = ""
30
31EXTRA_OECONF = " --enable-introspection=no --with-libtiff ${XKBTOGGLE} --disable-glibtest gio_can_sniff=yes"
32EXTRA_OECONF_append_virtclass-native = " --without-libtiff --without-libjpeg --disable-cups"
33
34PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*"
35
36python populate_packages_prepend () {
37 import os.path
38
39 prologue = bb.data.getVar("postinst_prologue", d, 1)
40
41 gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d)
42 loaders_root = os.path.join(gtk_libdir, 'loaders')
43 immodules_root = os.path.join(gtk_libdir, 'immodules')
44 printmodules_root = os.path.join(gtk_libdir, 'printbackends');
45 modules_root = bb.data.expand('${libdir}/gtk-2.0/modules/',d)
46
47 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', extra_depends='')
48 do_split_packages(d, immodules_root, '^im-(.*)\.so$', 'gtk-immodule-%s', 'GTK input module for %s', prologue + 'gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules', extra_depends='')
49 do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s', extra_depends='')
50 do_split_packages(d, modules_root, '^lib(.*)\.so$', 'gtk-module-%s', 'GTK module for %s', extra_depends='')
51
52 if (bb.data.getVar('DEBIAN_NAMES', d, 1)):
53 bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d)
54}
55
56# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23):
57PROVIDES = "virtual/gail"
58RPROVIDES_${PN} = "libgailutil18"
59RCONFLICTS_${PN} = "libgailutil18"
60RREPLACES_${PN} = "libgailutil18"
61RPROVIDES_${PN}-dev = "libgailutil-dev"
62RCONFLICTS_${PN}-dev = "libgailutil-dev"
63RREPLACES_${PN}-dev = "libgailutil-dev"
64RPROVIDES_${PN}-doc = "libgailutil-doc"
65RCONFLICTS_${PN}-doc = "libgailutil-doc"
66RREPLACES_${PN}-doc = "libgailutil-doc"
67RPROVIDES_${PN}-dbg = "libgailutil-dbg"
68RCONFLICTS_${PN}-dbg = "libgailutil-dbg"
69RREPLACES_${PN}-dbg = "libgailutil-dbg"
70# FIXME: replace locales as well
71
diff --git a/meta-oe/recipes-gnome/gtk+/gtk-fpu.inc b/meta-oe/recipes-gnome/gtk+/gtk-fpu.inc
deleted file mode 100644
index 52cdc3b44..000000000
--- a/meta-oe/recipes-gnome/gtk+/gtk-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1
2def get_gtk_fpu_setting(bb, d):
3 if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
4 return "--enable-integer-pixops"
5 return ""
6
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 13:16:52 +0000