diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-08 12:15:43 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-08 12:15:43 +0200 |
commit | ee3c757b7e4541dbce40b588c96981a76c162c7a (patch) | |
tree | dd412be64f849a0a29d4857315393be25692a41d /meta-oe/recipes-gnome | |
parent | a41e8f8612bfbd48f0abcf9b9897660796958c64 (diff) | |
download | meta-openembedded-contrib-ee3c757b7e4541dbce40b588c96981a76c162c7a.tar.gz |
gtk+ 2.20.x: drop from layer to align with oe-core
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-gnome')
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 29e329a4afc..00000000000 --- a/meta-oe/recipes-gnome/gtk+/composite-pixbuf_0.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -DESCRIPTION = "Pixbuf performance test" -LICENSE = "Public domain" -DEPENDS = "gtk+" - -SRC_URI = "http://amelang.net/composite_pixbuf.c" - -S = "${WORKDIR}" - -do_compile() { - ${CC} ${CFLAGS} composite_pixbuf.c -o composite_pixbuf \ - `pkg-config --cflags gdk-2.0` `pkg-config --libs gdk-2.0` `pkg-config --libs x11` `pkg-config --libs pango` \ - -lxcb -lXext -lXinerama -lXrandr -lXcursor -lXfixes -lpangoft2-1.0 -lz -lexpat -lxcb-xlib -lXau -lXdmcp -} - -do_install() { - install -d ${D}${bindir} - install -m 755 composite_pixbuf ${D}${bindir} -} - -SRC_URI[md5sum] = "97edf3cce3353b6cb5f822442a83aa5e" -SRC_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 36e95570093..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/cross-nm.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gtk+-2.20.1/configure.in -=================================================================== ---- gtk+-2.20.1.orig/configure.in 2010-07-10 16:25:40.000000000 -0700 -+++ gtk+-2.20.1/configure.in 2010-07-12 22:08:49.878377002 -0700 -@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - AC_SYS_LARGEFILE - - AM_PROG_AS --AC_PATH_PROG(NM, nm, nm) -+AC_CHECK_PROG(NM, nm, nm) - - dnl Initialize maintainer mode - 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 10e84d3baca..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/gtk-dnd-grab-deadlock-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 96c731cc2dde8a3e4ba542eca4c87ed6154084d2 -Author: Stanislav Brabec <sbrabec@suse.cz> -Date: Fri Jul 9 15:11:15 2010 +0200 - - Fix pointer grab dead lock if gtk_drag_begin uses GDK_CURRENT_TIME and - release happens before getting grab. - - For more see https://bugzilla.gnome.org/show_bug.cgi?id=623865 - -diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c -index a0d878d..48063a5 100644 ---- a/gtk/gtkdnd.c -+++ b/gtk/gtkdnd.c -@@ -4065,6 +4065,10 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time) - pointer = gdk_drag_context_get_device (info->context); - keyboard = gdk_device_get_associated_device (pointer); - -+ /* Prevent grab after release (see bug 623865) */ -+ if (info->grab_time == GDK_CURRENT_TIME) -+ time = GDK_CURRENT_TIME; -+ - if (info->update_idle) - { - 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 82fbbac8d74..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/hardcoded_libtool.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: gtk+-2.14.2/configure.in -=================================================================== ---- gtk+-2.14.2.orig/configure.in 2008-09-23 15:52:44.000000000 +0100 -+++ gtk+-2.14.2/configure.in 2008-09-23 15:53:51.000000000 +0100 -@@ -401,7 +401,7 @@ - case $enable_explicit_deps in - auto) - export SED -- deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` -+ deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` - if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then - enable_explicit_deps=yes - else -@@ -759,7 +759,7 @@ - dnl Now we check to see if our libtool supports shared lib deps - dnl (in a rather ugly way even) - if $dynworks; then -- pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" - pixbuf_deplibs_check=`$pixbuf_libtool_config | \ - grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ - sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1893,7 +1893,7 @@ - # We are using gmodule-no-export now, but I'm leaving the stripping - # code in place for now, since pango and atk still require gmodule. - export SED --export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` - if test -n "$export_dynamic"; then - GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` - 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 0fc4c48d1a4..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/no-demos.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.10.1/Makefile.am.orig 2006-08-08 12:37:30.000000000 +0100 -+++ gtk+-2.10.1/Makefile.am 2006-08-08 12:37:48.000000000 +0100 -@@ -1,6 +1,6 @@ - ## Makefile.am for GTK+ - --SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib -+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules tests perf contrib - SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros - - # 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 aa1bffa8a7a..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/run-iconcache.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- /tmp/Makefile.am 2009-10-28 18:21:54.000000000 +0100 -+++ gtk+-2.18.3/gtk/Makefile.am 2009-10-28 18:23:07.000000000 +0100 -@@ -1300,11 +1300,11 @@ - ./gtk-update-icon-cache - endif - --gtkbuiltincache.h: @REBUILD@ stamp-icons -- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) -- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -- mv gtkbuiltincache.h.tmp gtkbuiltincache.h -+#gtkbuiltincache.h: @REBUILD@ stamp-icons -+# $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) -+# $(gtk_update_icon_cache_program) --force --ignore-theme-index \ -+# --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ -+# mv gtkbuiltincache.h.tmp gtkbuiltincache.h - - EXTRA_DIST += \ - $(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 59ad150b2fc..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+-2.20.1/toggle-font.diff +++ /dev/null @@ -1,100 +0,0 @@ -Index: gtk/gtkcellrenderertoggle.c -=================================================================== ---- gtk/gtkcellrenderertoggle.c (revision 18523) -+++ gtk/gtkcellrenderertoggle.c (working copy) -@@ -71,6 +71,8 @@ - PROP_INDICATOR_SIZE - }; - -+/* This is a hard-coded default which promptly gets overridden by a size -+ calculated from the font size. */ - #define TOGGLE_WIDTH 13 - - static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; -@@ -80,8 +82,9 @@ - typedef struct _GtkCellRendererTogglePrivate GtkCellRendererTogglePrivate; - struct _GtkCellRendererTogglePrivate - { -- gint indicator_size; -- -+ gint indicator_size; /* This is the real size */ -+ gint override_size; /* This is the size set from the indicator-size property */ -+ GtkWidget *cached_widget; - guint inconsistent : 1; - }; - -@@ -104,6 +107,7 @@ - GTK_CELL_RENDERER (celltoggle)->ypad = 2; - - priv->indicator_size = TOGGLE_WIDTH; -+ priv->override_size = 0; - priv->inconsistent = FALSE; - } - -@@ -210,7 +214,7 @@ - g_value_set_boolean (value, celltoggle->radio); - break; - case PROP_INDICATOR_SIZE: -- g_value_set_int (value, priv->indicator_size); -+ g_value_set_int (value, priv->override_size ? priv->override_size : priv->indicator_size); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); -@@ -245,7 +249,7 @@ - celltoggle->radio = g_value_get_boolean (value); - break; - case PROP_INDICATOR_SIZE: -- priv->indicator_size = g_value_get_int (value); -+ priv->override_size = g_value_get_int (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); -@@ -273,6 +277,27 @@ - } - - static void -+on_widget_style_set (GtkWidget *widget, GtkStyle *previous, gpointer user_data) -+{ -+ GtkCellRendererTogglePrivate *priv = user_data; -+ PangoContext *context; -+ PangoFontMetrics *metrics; -+ int height; -+ -+ context = gtk_widget_get_pango_context (widget); -+ metrics = pango_context_get_metrics (context, -+ widget->style->font_desc, -+ pango_context_get_language (context)); -+ -+ height = pango_font_metrics_get_ascent (metrics) + -+ pango_font_metrics_get_descent (metrics); -+ -+ pango_font_metrics_unref (metrics); -+ -+ priv->indicator_size = PANGO_PIXELS (height * 0.85); -+} -+ -+static void - gtk_cell_renderer_toggle_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - GdkRectangle *cell_area, -@@ -287,6 +312,20 @@ - - priv = GTK_CELL_RENDERER_TOGGLE_GET_PRIVATE (cell); - -+ if (priv->override_size) { -+ priv->indicator_size = priv->override_size; -+ } else if (priv->cached_widget != widget) { -+ if (priv->cached_widget) { -+ g_object_remove_weak_pointer (widget, &priv->cached_widget); -+ g_signal_handlers_disconnect_by_func (priv->cached_widget, on_widget_style_set, priv); -+ } -+ priv->cached_widget = widget; -+ g_object_add_weak_pointer (widget, &priv->cached_widget); -+ g_signal_connect (widget, "style-set", on_widget_style_set, priv); -+ -+ on_widget_style_set (widget, NULL, priv); -+ } -+ - calc_width = (gint) cell->xpad * 2 + priv->indicator_size; - calc_height = (gint) cell->ypad * 2 + priv->indicator_size; - diff --git a/meta-oe/recipes-gnome/gtk+/gtk+.inc b/meta-oe/recipes-gnome/gtk+/gtk+.inc deleted file mode 100644 index 42a8febcddf..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+.inc +++ /dev/null @@ -1,97 +0,0 @@ -DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -SECTION = "libs" -LICENSE = "LGPL" -PRIORITY = "optional" -DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cups \ - libxrandr libxdamage libxrender libxcomposite cairo jasper gtk+-native" -PROVIDES = "gdk-pixbuf" - -MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" -SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2;name=gtk \ - file://hardcoded_libtool.patch \ - file://run-iconcache.patch \ - file://toggle-font.diff;striplevel=0 \ - file://xsettings.patch \ - " - -INC_PR = "r10" - -inherit autotools pkgconfig - -LEAD_SONAME = "libgtk-x11-2.0.so" -LIBV = "2.10.0" - -PACKAGES =+ "${PN}-demo ${PN}-demo-source" -FILES_${PN}-demo = "${bindir}/gtk-demo" -FILES_${PN}-demo-source = "${datadir}/gtk-2.0/demo" - -FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ - ${bindir}/gtk-update-icon-cache \ - ${bindir}/gtk-query-immodules-2.0 \ - ${libdir}/lib*.so.* \ - ${datadir}/themes ${sysconfdir} \ - ${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so" - -FILES_${PN}-dev += " \ - ${datadir}/gtk-2.0/include \ - ${libdir}/gtk-2.0/include \ - ${bindir}/gdk-pixbuf-csource \ - ${bindir}/gtk-builder-convert" - -FILES_${PN}-dbg += " \ - ${libdir}/gtk-2.0/modules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \ - ${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*" - -NEATSTUFF = "ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm" -NEATSTUFF_append_linux = " glibc-gconv-iso8859-1" -NEATSTUFF_append_linux-gnueabi = " glibc-gconv-iso8859-1" - -# Only add runtime dependencies for target recipe -RDEPENDS_${PN} += "${@['', 'hicolor-icon-theme']['${PN}' == '${BPN}']}" -RRECOMMENDS_${PN} += "${@['', '${NEATSTUFF}']['${PN}' == '${BPN}']}" - -do_install_append () { - mkdir -p ${D}${libdir}/gtk-2.0/include - install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h - # Copy over all headers, since the maemo stuff needs access to the private api. *sigh* - cp gtk/*.h ${D}${includedir}/gtk-2.0/gtk/ - - install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/ - - install -d ${D}${sysconfdir}/gtk-2.0 - rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la -} - -do_install_append_virtclass-native () { - ${D}${bindir}/gdk-pixbuf-query-loaders \ - ${D}${libdir}/gtk-2.0/${LIBV}/loaders/*.so | \ - sed -e's,${D},,' > \ - ${D}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders -} - -SYSROOT_PREPROCESS_FUNCS_append_virtclass-native = " gdk_pixbuf_fixup" - -_SYSROOT_DEST = "${SYSROOT_DESTDIR}${STAGING_DIR_HOST}" -gdk_pixbuf_fixup () { - create_wrapper ${_SYSROOT_DEST}${bindir}/gdk-pixbuf-query-loaders \ - LD_LIBRARY_PATH=${STAGING_LIBDIR} \ - GDK_PIXBUF_MODULEDIR=${libdir}/gtk-2.0/${LIBV}/loaders - ${_SYSROOT_DEST}${bindir}/gdk-pixbuf-query-loaders \ - ${_SYSROOT_DEST}${libdir}/gtk-2.0/${LIBV}/loaders/*.so | \ - sed -e's,${_SYSROOT_DEST},,' > \ - ${_SYSROOT_DEST}${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders - create_wrapper ${_SYSROOT_DEST}${bindir}/gdk-pixbuf-csource \ - GDK_PIXBUF_MODULE_FILE=${sysconfdir}/gtk-2.0/gdk-pixbuf.loaders -} - -postinst_prologue() { -if [ "x$D" != "x" ]; then - exit 1 -fi - -} 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 7b37d4bb2e3..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+/filesel-fix-segfault.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gtk+-2.10.12_/gtk/gtkfilesel.c 2007-06-12 14:00:38.000000000 +0200 -+++ gtk+-2.10.12/gtk/gtkfilesel.c 2007-06-12 14:40:32.000000000 +0200 -@@ -2444,9 +2444,13 @@ - - if (!is_file) - { -- gtk_file_selection_dir_activate (tree_view, path, -- gtk_tree_view_get_column (tree_view, DIR_COLUMN), -- user_data); -+ fs->last_selected = g_strdup (g_ptr_array_index (new_names, index)); -+ gtk_file_selection_dir_activate (tree_view, path, -+ gtk_tree_view_get_column (tree_view, DIR_COLUMN), -+ user_data); -+ gtk_tree_path_free (path); -+ return; -+ - } - - 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 df296563438..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+/gtklabel-resize-patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gtk+-2.4.3/gtk/gtklabel.c~ 2004-06-11 13:50:34.000000000 +0100 -+++ gtk+-2.4.3/gtk/gtklabel.c 2004-07-05 13:33:57.000000000 +0100 -@@ -1623,6 +1623,7 @@ - - /* We have to clear the layout, fonts etc. may have changed */ - gtk_label_clear_layout (label); -+ gtk_widget_queue_resize (GTK_WIDGET (label)); - } - - 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 6cf1c14991f..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+/lower-quality-scaling-in-pixbuf-engine.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c -=================================================================== ---- gtk+-2.6.10.orig/modules/engines/pixbuf/pixbuf-render.c 2005-08-18 14:11:00.000000000 +0000 -+++ gtk+-2.6.10/modules/engines/pixbuf/pixbuf-render.c 2007-05-24 11:16:50.000000000 +0000 -@@ -407,7 +407,7 @@ - 0, 0, rect.width, rect.height, - dest_x - rect.x, dest_y - rect.y, - x_scale, y_scale, -- GDK_INTERP_BILINEAR); -+ GDK_INTERP_NEAREST); - - g_object_unref (partial_src); - 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 f4c7f853ad3..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+/migration.patch +++ /dev/null @@ -1,619 +0,0 @@ -Index: configure.in -=================================================================== -RCS file: /cvs/gnome/gtk+/configure.in,v -retrieving revision 1.419.2.4 -diff -u -r1.419.2.4 configure.in ---- configure.in 8 Feb 2005 21:39:42 -0000 1.419.2.4 -+++ configure.in 27 Feb 2005 13:10:16 -0000 -@@ -1495,6 +1495,16 @@ - 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" - 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" - -+AC_ARG_ENABLE(display-migration, -+ [AC_HELP_STRING([--enable-display-migration], -+ [include support for GPE_CHANGE_DISPLAY protocol])], -+ enable_migration=yes, enable_migration=no) -+if test "$enable_migration" = "yes"; then -+ AC_DEFINE([ENABLE_MIGRATION], 1, [Define if display migration is enabled]) -+ GTK_DEP_LIBS="$GTK_DEP_LIBS -lgcrypt" -+fi -+AM_CONDITIONAL(ENABLE_MIGRATION, test $enable_migration = "yes") -+ - AC_SUBST(GTK_PACKAGES) - AC_SUBST(GTK_EXTRA_LIBS) - AC_SUBST(GTK_EXTRA_CFLAGS) -Index: gtk/Makefile.am -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/Makefile.am,v -retrieving revision 1.266.2.1 -diff -u -r1.266.2.1 Makefile.am ---- gtk/Makefile.am 13 Jan 2005 15:18:21 -0000 1.266.2.1 -+++ gtk/Makefile.am 27 Feb 2005 13:10:17 -0000 -@@ -520,6 +520,10 @@ - gtkwindow.c \ - xembed.h - -+if ENABLE_MIGRATION -+gtk_c_sources += gtkmigration.c -+endif -+ - if OS_UNIX - gtk_private_h_sources += gtkfilesystemunix.h - gtk_c_sources += gtkfilesystemunix.c -Index: gtk/gtkmain.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkmain.c,v -retrieving revision 1.255 -diff -u -r1.255 gtkmain.c ---- gtk/gtkmain.c 27 Dec 2004 05:25:15 -0000 1.255 -+++ gtk/gtkmain.c 27 Feb 2005 13:10:19 -0000 -@@ -491,6 +491,10 @@ - _gtk_accel_map_init (); - _gtk_rc_init (); - -+#ifdef ENABLE_MIGRATION -+ gtk_migration_init (); -+#endif -+ - /* Set the 'initialized' flag. - */ - gtk_initialized = TRUE; -Index: gtk/gtkwindow.c -=================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkwindow.c,v -retrieving revision 1.281.2.4 -diff -u -r1.281.2.4 gtkwindow.c ---- gtk/gtkwindow.c 21 Feb 2005 04:21:49 -0000 1.281.2.4 -+++ gtk/gtkwindow.c 27 Feb 2005 13:10:56 -0000 -@@ -731,6 +731,8 @@ - add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD); - } - -+extern void gtk_migration_mark_window (GtkWidget *w); -+ - static void - gtk_window_init (GtkWindow *window) - { -@@ -790,6 +792,10 @@ - "event", - G_CALLBACK (gtk_window_event), - NULL); -+ -+#ifdef ENABLE_MIGRATION -+ gtk_migration_mark_window (window); -+#endif - } - - static void ---- /dev/null 2005-02-20 01:07:50.714416160 +0000 -+++ gtk/gtkmigration.c 2005-02-27 15:05:04.052757352 +0000 -@@ -0,0 +1,529 @@ -+/* -+ * Copyright (C) 2003, 2005 Philip Blundell <philb@gnu.org> -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include <stdlib.h> -+#include <ctype.h> -+#include <libintl.h> -+#include <string.h> -+#include <assert.h> -+ -+#include <X11/X.h> -+#include <X11/Xlib.h> -+#include <X11/Xatom.h> -+ -+#include <gcrypt.h> -+ -+#include "gtk.h" -+#include "gdk.h" -+#include "x11/gdkx.h" -+ -+#define _(x) gettext(x) -+ -+static GdkAtom string_gdkatom, display_change_gdkatom; -+static GdkAtom rsa_challenge_gdkatom; -+ -+#define DISPLAY_CHANGE_SUCCESS 0 -+#define DISPLAY_CHANGE_UNABLE_TO_CONNECT 1 -+#define DISPLAY_CHANGE_NO_SUCH_SCREEN 2 -+#define DISPLAY_CHANGE_AUTHENTICATION_BAD 3 -+#define DISPLAY_CHANGE_INDETERMINATE_ERROR 4 -+ -+static gboolean no_auth; -+ -+static GSList *all_widgets; -+ -+static gboolean gtk_migration_initialised; -+ -+#define CHALLENGE_LEN 64 -+ -+gchar *gtk_migration_auth_challenge_string; -+ -+static unsigned char challenge_bytes[CHALLENGE_LEN]; -+static unsigned long challenge_seq; -+ -+#define hexbyte(x) ((x) >= 10 ? (x) + 'a' - 10 : (x) + '0') -+ -+struct rsa_key -+{ -+ gcry_mpi_t n, e, d, p, q, u; -+}; -+ -+static gcry_mpi_t -+mpi_from_sexp (gcry_sexp_t r, char *tag) -+{ -+ gcry_sexp_t s = gcry_sexp_find_token (r, tag, 0); -+ return gcry_sexp_nth_mpi (s, 1, GCRYMPI_FMT_USG); -+} -+ -+static char * -+hex_from_mpi (gcry_mpi_t m) -+{ -+ char *buf; -+ gcry_mpi_aprint (GCRYMPI_FMT_HEX, (void *)&buf, NULL, m); -+ return buf; -+} -+ -+static void -+gtk_migration_crypt_create_hash (char *display, char *challenge, size_t len, char *result) -+{ -+ size_t dlen = strlen (display); -+ gchar *buf = g_malloc (dlen + 1 + len); -+ strcpy (buf, display); -+ memcpy (buf + dlen + 1, challenge, len); -+ gcry_md_hash_buffer (GCRY_MD_SHA1, result, buf, len + dlen + 1); -+ g_free (buf); -+} -+ -+static int -+do_encode_md (const unsigned char *digest, size_t digestlen, int algo, -+ unsigned int nbits, gcry_mpi_t *r_val) -+{ -+ int nframe = (nbits+7) / 8; -+ unsigned char *frame; -+ int i, n; -+ unsigned char asn[100]; -+ size_t asnlen; -+ -+ asnlen = sizeof(asn); -+ if (gcry_md_algo_info (algo, GCRYCTL_GET_ASNOID, asn, &asnlen)) -+ return -1; -+ -+ if (digestlen + asnlen + 4 > nframe ) -+ return -1; -+ -+ /* We encode the MD in this way: -+ * -+ * 0 1 PAD(n bytes) 0 ASN(asnlen bytes) MD(len bytes) -+ * -+ * PAD consists of FF bytes. -+ */ -+ frame = g_malloc (nframe); -+ n = 0; -+ frame[n++] = 0; -+ frame[n++] = 1; /* block type */ -+ i = nframe - digestlen - asnlen -3 ; -+ assert ( i > 1 ); -+ memset ( frame+n, 0xff, i ); n += i; -+ frame[n++] = 0; -+ memcpy ( frame+n, asn, asnlen ); n += asnlen; -+ memcpy ( frame+n, digest, digestlen ); n += digestlen; -+ assert ( n == nframe ); -+ -+ gcry_mpi_scan (r_val, GCRYMPI_FMT_USG, frame, nframe, &nframe); -+ g_free (frame); -+ return 0; -+} -+ -+static gboolean -+gtk_migration_crypt_check_signature (struct rsa_key *k, char *hash, char *sigbuf) -+{ -+ gcry_mpi_t mpi, mpi2; -+ gcry_sexp_t data, sig, key; -+ int rc; -+ -+ do_encode_md (hash, 20, GCRY_MD_SHA1, 1024, &mpi); -+ -+ gcry_sexp_build (&data, NULL, "(data (value %m))", mpi); -+ -+ gcry_mpi_release (mpi); -+ -+ gcry_sexp_build (&key, NULL, "(public-key (rsa (n %m) (e %m)))", k->n, k->e); -+ -+ if (gcry_mpi_scan (&mpi2, GCRYMPI_FMT_HEX, sigbuf, 0, NULL)) -+ { -+ gcry_sexp_release (data); -+ return FALSE; -+ } -+ -+ gcry_sexp_build (&sig, NULL, "(sig-val (rsa (s %m)))", mpi2); -+ -+ rc = gcry_pk_verify (sig, data, key); -+ -+ gcry_sexp_release (data); -+ gcry_sexp_release (key); -+ gcry_sexp_release (sig); -+ gcry_mpi_release (mpi2); -+ -+ if (rc) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+gtk_migration_auth_update_challenge (void) -+{ -+ int i; -+ unsigned char *p; -+ -+ if (gtk_migration_auth_challenge_string == NULL) -+ gtk_migration_auth_challenge_string = g_malloc ((CHALLENGE_LEN * 2) + 9); -+ -+ p = gtk_migration_auth_challenge_string; -+ -+ for (i = 0; i < CHALLENGE_LEN; i++) -+ { -+ *p++ = hexbyte (challenge_bytes[i] >> 4); -+ *p++ = hexbyte (challenge_bytes[i] & 15); -+ } -+ -+ sprintf (p, "%08lx", challenge_seq++); -+} -+ -+static void -+gtk_migration_auth_generate_challenge (void) -+{ -+ gcry_randomize (challenge_bytes, sizeof (challenge_bytes), GCRY_STRONG_RANDOM); -+ gtk_migration_auth_update_challenge (); -+} -+ -+static struct rsa_key * -+parse_pubkey (char *s) -+{ -+ struct rsa_key *r; -+ gcry_mpi_t n, e; -+ gchar *sp; -+ -+ sp = strtok (s, " \n"); -+ gcry_mpi_scan (&e, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ sp = strtok (NULL, " \n"); -+ gcry_mpi_scan (&n, GCRYMPI_FMT_HEX, sp, 0, NULL); -+ -+ r = g_malloc0 (sizeof (struct rsa_key)); -+ r->e = e; -+ r->n = n; -+ return r; -+} -+ -+static struct rsa_key * -+lookup_pubkey (u_int32_t id) -+{ -+ const gchar *home_dir = g_get_home_dir (); -+ gchar *filename = g_strdup_printf ("%s/.gpe/migrate/public", home_dir); -+ FILE *fp = fopen (filename, "r"); -+ struct rsa_key *r = NULL; -+ -+ if (fp) -+ { -+ while (!feof (fp)) -+ { -+ char buffer[4096]; -+ if (fgets (buffer, 4096, fp)) -+ { -+ char *p; -+ u_int32_t this_id = strtoul (buffer, &p, 16); -+ if (p != buffer && *p == ' ') -+ { -+#ifdef DEBUG -+ fprintf (stderr, "found id %x\n", this_id); -+#endif -+ if (this_id == id) -+ { -+ r = parse_pubkey (++p); -+ break; -+ } -+ } -+ } -+ } -+ fclose (fp); -+ } -+ -+ g_free (filename); -+ return r; -+} -+ -+static void -+free_pubkey (struct rsa_key *k) -+{ -+ gcry_mpi_release (k->n); -+ gcry_mpi_release (k->e); -+ -+ g_free (k); -+} -+ -+static gboolean -+gtk_migration_auth_validate_request (char *display, char *data) -+{ -+ u_int32_t key_id; -+ char *ep; -+ char *p; -+ struct rsa_key *k; -+ char hash[20]; -+ gboolean rc; -+ -+ p = strchr (data, ' '); -+ if (p == NULL) -+ return FALSE; -+ *p++ = 0; -+ -+ key_id = strtoul (data, &ep, 16); -+ if (*ep) -+ return FALSE; -+ -+ k = lookup_pubkey (key_id); -+ if (k == NULL) -+ return FALSE; -+ -+ gtk_migration_crypt_create_hash (display, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string), hash); -+ -+ rc = gtk_migration_crypt_check_signature (k, hash, p); -+ -+ free_pubkey (k); -+ -+ return rc; -+} -+ -+static int -+do_change_display (GtkWidget *w, char *display_name) -+{ -+ GdkDisplay *newdisplay; -+ guint screen_nr = 1; -+ guint i; -+ -+ if (display_name[0] == 0) -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+ -+ i = strlen (display_name) - 1; -+ while (i > 0 && isdigit (display_name[i])) -+ i--; -+ -+ if (display_name[i] == '.') -+ { -+ screen_nr = atoi (display_name + i + 1); -+ display_name[i] = 0; -+ } -+ -+ newdisplay = gdk_display_open (display_name); -+ if (newdisplay) -+ { -+ GdkScreen *screen = gdk_display_get_screen (newdisplay, screen_nr); -+ if (screen) -+ { -+ gtk_window_set_screen (GTK_WINDOW (w), screen); -+ gdk_display_manager_set_default_display (gdk_display_manager_get (), -+ newdisplay); -+ return DISPLAY_CHANGE_SUCCESS; -+ } -+ else -+ return DISPLAY_CHANGE_NO_SUCH_SCREEN; -+ } -+ -+ return DISPLAY_CHANGE_UNABLE_TO_CONNECT; -+} -+ -+static void -+set_challenge_on_window (GdkWindow *window) -+{ -+ gdk_property_change (window, rsa_challenge_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, gtk_migration_auth_challenge_string, -+ strlen (gtk_migration_auth_challenge_string)); -+} -+ -+static void -+update_challenge_on_windows (void) -+{ -+ GSList *i; -+ -+ gtk_migration_auth_update_challenge (); -+ -+ for (i = all_widgets; i; i = i->next) -+ { -+ GtkWidget *w = GTK_WIDGET (i->data); -+ if (w->window) -+ set_challenge_on_window (w->window); -+ } -+} -+ -+static void -+reset_state (GdkWindow *window) -+{ -+ gdk_property_change (window, display_change_gdkatom, string_gdkatom, -+ 8, GDK_PROP_MODE_REPLACE, NULL, 0); -+} -+ -+static void -+generate_response (GdkDisplay *gdisplay, Display *dpy, Window window, int code) -+{ -+ XClientMessageEvent ev; -+ Atom atom = gdk_x11_atom_to_xatom_for_display (gdisplay, -+ display_change_gdkatom); -+ -+ memset (&ev, 0, sizeof (ev)); -+ -+ ev.type = ClientMessage; -+ ev.window = window; -+ ev.message_type = atom; -+ ev.format = 32; -+ -+ ev.data.l[0] = window; -+ ev.data.l[1] = code; -+ -+ XSendEvent (dpy, DefaultRootWindow (dpy), False, SubstructureNotifyMask, (XEvent *)&ev); -+} -+ -+static int -+handle_request (GdkWindow *gwindow, char *prop) -+{ -+ GtkWidget *widget; -+ char *target, *auth_method, *auth_data; -+ char *p; -+ -+ target = prop; -+ auth_method = "NULL"; -+ auth_data = NULL; -+ -+ p = strchr (prop, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_method = ++p; -+ -+ p = strchr (p, ' '); -+ if (p) -+ { -+ *p = 0; -+ auth_data = ++p; -+ } -+ } -+ -+ if (no_auth == FALSE) -+ { -+ if (!strcasecmp (auth_method, "null")) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ else if (!strcasecmp (auth_method, "rsa-sig")) -+ { -+ if (gtk_migration_auth_validate_request (target, auth_data) == FALSE) -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ else -+ return DISPLAY_CHANGE_AUTHENTICATION_BAD; -+ } -+ -+ gdk_window_get_user_data (gwindow, (gpointer*) &widget); -+ -+ if (widget) -+ return do_change_display (widget, target); -+ -+ return DISPLAY_CHANGE_INDETERMINATE_ERROR; -+} -+ -+static GdkFilterReturn -+filter_func (GdkXEvent *xevp, GdkEvent *ev, gpointer p) -+{ -+ XPropertyEvent *xev = (XPropertyEvent *)xevp; -+ -+ if (xev->type == PropertyNotify) -+ { -+ GdkDisplay *gdisplay; -+ Atom atom; -+ -+ gdisplay = gdk_x11_lookup_xdisplay (xev->display); -+ if (gdisplay) -+ { -+ atom = gdk_x11_atom_to_xatom_for_display (gdisplay, display_change_gdkatom); -+ -+ if (xev->atom == atom) -+ { -+ GdkWindow *gwindow; -+ -+ gwindow = gdk_window_lookup_for_display (gdisplay, xev->window); -+ -+ if (gwindow) -+ { -+ GdkAtom actual_type; -+ gint actual_format; -+ gint actual_length; -+ unsigned char *prop = NULL; -+ -+ if (gdk_property_get (gwindow, display_change_gdkatom, string_gdkatom, -+ 0, G_MAXLONG, FALSE, &actual_type, &actual_format, -+ &actual_length, &prop)) -+ { -+ if (actual_length != 0) -+ { -+ if (actual_type == string_gdkatom && actual_length > 8) -+ { -+ gchar *buf = g_malloc (actual_length + 1); -+ int rc; -+ -+ memcpy (buf, prop, actual_length); -+ buf[actual_length] = 0; -+ -+ rc = handle_request (gwindow, buf); -+ -+ g_free (buf); -+ generate_response (gdisplay, xev->display, xev->window, rc); -+ -+ if (rc == DISPLAY_CHANGE_SUCCESS) -+ update_challenge_on_windows (); -+ } -+ -+ reset_state (gwindow); -+ } -+ } -+ -+ if (prop) -+ g_free (prop); -+ } -+ } -+ -+ return GDK_FILTER_REMOVE; -+ } -+ } -+ -+ return GDK_FILTER_CONTINUE; -+} -+ -+static void -+unrealize_window (GtkWidget *w) -+{ -+ all_widgets = g_slist_remove (all_widgets, w); -+} -+ -+void -+gtk_migration_mark_window (GtkWidget *w) -+{ -+ if (! gtk_migration_initialised) -+ { -+ g_warning ("gtk_migration not initialised yet"); -+ return; -+ } -+ -+ if (GTK_WIDGET_REALIZED (w)) -+ { -+ GdkWindow *window = w->window; -+ -+ gdk_window_add_filter (window, filter_func, NULL); -+ -+ reset_state (window); -+ set_challenge_on_window (window); -+ -+ all_widgets = g_slist_append (all_widgets, w); -+ -+ g_signal_connect (G_OBJECT (w), "unrealize", G_CALLBACK (unrealize_window), NULL); -+ } -+ else -+ g_signal_connect (G_OBJECT (w), "realize", G_CALLBACK (gtk_migration_mark_window), NULL); -+} -+ -+void -+gtk_migration_init (void) -+{ -+ if (getenv ("GPE_DISPLAY_MIGRATION_NO_AUTH") != NULL) -+ no_auth = TRUE; -+ -+ string_gdkatom = gdk_atom_intern ("STRING", FALSE); -+ display_change_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE", FALSE); -+ rsa_challenge_gdkatom = gdk_atom_intern ("_GPE_DISPLAY_CHANGE_RSA_CHALLENGE", FALSE); -+ -+ gtk_migration_auth_generate_challenge (); -+ -+ gtk_migration_initialised = TRUE; -+} 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 b74d9c9639c..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+/xkb-ifdef.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit eff1fe2500f07fa2b4683ff52fe92e39e6487b05 -Author: Matthias Clasen <mclasen@redhat.com> -Date: Fri May 21 12:13:05 2010 -0400 - - Make the !xkb build survive a little longer - - This fixes bug 619114. - -diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index c0cbc99..6cded79 100644 ---- a/gdk/x11/gdkdisplay-x11.c -+++ b/gdk/x11/gdkdisplay-x11.c -@@ -690,7 +690,11 @@ gdk_display_beep (GdkDisplay *display) - { - g_return_if_fail (GDK_IS_DISPLAY (display)); - -+#ifdef HAVE_XKB - XkbBell (GDK_DISPLAY_XDISPLAY (display), None, 0, None); -+#else -+ XBell (GDK_DISPLAY_XDISPLAY (display), 0); -+#endif - } - - /** 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 b63e262d34d..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+/xsettings.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- gtk+-2.4.4/gdk/x11/gdkevents-x11.c.old Sun Aug 22 17:14:00 2004 -+++ gtk+-2.4.4/gdk/x11/gdkevents-x11.c Sun Aug 22 17:14:00 2004 -@@ -2827,10 +2827,9 @@ - { - GdkScreenX11 *screen = data; - -- if (xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent)) -- return GDK_FILTER_REMOVE; -- else -- return GDK_FILTER_CONTINUE; -+ xsettings_client_process_event (screen->xsettings_client, (XEvent *)xevent); -+ -+ return GDK_FILTER_CONTINUE; - } - - 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 c565514a195..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk+_2.20.1.bb +++ /dev/null @@ -1,71 +0,0 @@ -require gtk+.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ - file://gtk/gtk.h;endline=27;md5=c59e0b4490dd135a5726ebf851f9b17f \ - file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \ - file://tests/testgtk.c;endline=27;md5=262db5db5f776f9863e56df31423e24c" - -SRC_URI_append_virtclass-native = " file://no-demos.patch \ -" -SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \ - file://cross-nm.patch \ - file://xkb-ifdef.patch \ - " - -SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa" -SRC_URI[gtk.sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65" - -PR = "${INC_PR}.4" - -BBCLASSEXTEND = "native" - -ARM_INSTRUCTION_SET = "arm" - -DEPENDS_virtclass-native = "libpng-native atk-native pango-native cairo-native libxrender-native libxext-native libgcrypt-native" -PROVIDES_virtclass-native = "gdk-pixbuf-csource-native" - -# Enable xkb selectively -XKBTOGGLE = " --disable-xkb" -XKBTOGGLE_angstrom = "" - -EXTRA_OECONF = " --enable-introspection=no --with-libtiff ${XKBTOGGLE} --disable-glibtest gio_can_sniff=yes" -EXTRA_OECONF_append_virtclass-native = " --without-libtiff --without-libjpeg --disable-cups" - -PACKAGES_DYNAMIC = "gtk-module-* gdk-pixbuf-loader-* gtk-immodule-* gtk-printbackend-*" - -python populate_packages_prepend () { - import os.path - - prologue = bb.data.getVar("postinst_prologue", d, 1) - - gtk_libdir = bb.data.expand('${libdir}/gtk-2.0/${LIBV}', d) - loaders_root = os.path.join(gtk_libdir, 'loaders') - immodules_root = os.path.join(gtk_libdir, 'immodules') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - modules_root = bb.data.expand('${libdir}/gtk-2.0/modules/',d) - - 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='') - 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='') - do_split_packages(d, printmodules_root, '^libprintbackend-(.*)\.so$', 'gtk-printbackend-%s', 'GTK printbackend module for %s', extra_depends='') - do_split_packages(d, modules_root, '^lib(.*)\.so$', 'gtk-module-%s', 'GTK module for %s', extra_depends='') - - if (bb.data.getVar('DEBIAN_NAMES', d, 1)): - bb.data.setVar('PKG_${PN}', 'libgtk-2.0', d) -} - -# gail is part of gtk+ since gtk+-2.13.0 (targetting >=GNOME 2.23): -PROVIDES = "virtual/gail" -RPROVIDES_${PN} = "libgailutil18" -RCONFLICTS_${PN} = "libgailutil18" -RREPLACES_${PN} = "libgailutil18" -RPROVIDES_${PN}-dev = "libgailutil-dev" -RCONFLICTS_${PN}-dev = "libgailutil-dev" -RREPLACES_${PN}-dev = "libgailutil-dev" -RPROVIDES_${PN}-doc = "libgailutil-doc" -RCONFLICTS_${PN}-doc = "libgailutil-doc" -RREPLACES_${PN}-doc = "libgailutil-doc" -RPROVIDES_${PN}-dbg = "libgailutil-dbg" -RCONFLICTS_${PN}-dbg = "libgailutil-dbg" -RREPLACES_${PN}-dbg = "libgailutil-dbg" -# FIXME: replace locales as well - 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 52cdc3b4466..00000000000 --- a/meta-oe/recipes-gnome/gtk+/gtk-fpu.inc +++ /dev/null @@ -1,6 +0,0 @@ - -def get_gtk_fpu_setting(bb, d): - if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]: - return "--enable-integer-pixops" - return "" - |