[oe-commits] org.oe.dev merge of '5190e4eb0827b8bfe3f72475ad62fd98585e8bfa'
mickeyl commit
openembedded-commits at lists.openembedded.org
Thu Aug 23 12:44:46 UTC 2007
merge of '5190e4eb0827b8bfe3f72475ad62fd98585e8bfa'
and 'e30e879439bfeb0f5e33edf2a3e8bfa1828eed4f'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 57097c5f7112c41b7466c7f14c1b99593a6d65ae
ViewMTN: http://monotone.openembedded.org/revision.psp?id=57097c5f7112c41b7466c7f14c1b99593a6d65ae
Files:
1
packages/libxslt/libxslt_1.1.12.bb
packages/twisted/twisted_1.2.0.bb
packages/qmake/qmake2-native-2.01a
packages/qmake/qmake2-native-2.10a
packages/qmake/qmake2-native_2.01a.bb
packages/qmake/qmake2-native_2.10a.bb
packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch
packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch
packages/uicmoc/uicmoc4-native_4.3.1.bb
packages/e17/exhibit_cvs.bb
packages/e17/expedite_cvs.bb
packages/gstreamer/gst-plugins-bad_0.10.3.bb
packages/gstreamer/gstreamer.inc
packages/gtk+/gtk+_2.10.14.bb
packages/uicmoc/uicmoc4-native_4.2.3.bb
packages/uicmoc/uicmoc4-native_4.3.0.bb
packages/avahi/avahi-0.6.15
packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch
packages/avahi/avahi_0.6.15.bb
packages/avahi/avahi_0.6.16.bb
packages/avahi/avahi_0.6.17.bb
packages/avahi/avahi_0.6.18.bb
packages/avahi/avahi-python_0.6.21.bb
packages/avahi/files/configure-check-pymod.patch
packages/xorg-app/sessreg_1.0.3.bb
packages/xorg-app/setxkbmap_1.0.4.bb
packages/xorg-app/xdm_1.1.6.bb
packages/xorg-app/xmodmap_1.0.3.bb
packages/xorg-app/xprop_1.0.3.bb
packages/xorg-app/xrdb_1.0.4.bb
packages/xorg-app/xsetroot_1.0.2.bb
packages/xorg-app/xvinfo_1.0.2.bb
packages/xorg-doc/xorg-sgml-doctools_1.2.bb
packages/xorg-driver/xf86-input-mouse_1.2.2.bb
packages/xorg-driver/xf86-video-ati_6.6.193.bb
packages/xorg-driver/xf86-video-nv_2.1.3.bb
packages/xorg-driver/xf86-video-savage_2.1.3.bb
packages/xorg-lib/diet-x11_1.1.3.bb
packages/xorg-lib/libice_1.0.4.bb
packages/xorg-lib/libx11_1.1.3.bb
packages/xorg-lib/libxaw_1.0.4.bb
packages/xorg-lib/libxpm_3.5.7.bb
packages/xorg-lib/libxrender_0.9.3.bb
packages/xorg-lib/libxtst_1.0.3.bb
packages/xorg-lib/xtrans_1.0.4.bb
MAINTAINERS
packages/angstrom/angstrom-gpe-task-apps.bb
packages/angstrom/angstrom-gpe-task-base.bb
packages/angstrom/angstrom-gpe-task-game.bb
packages/angstrom/angstrom-gpe-task-pim.bb
packages/angstrom/angstrom-gpe-task-settings.bb
packages/angstrom/angstrom-ohand-task-pim.bb
packages/angstrom/angstrom-task-office.bb
packages/angstrom/angstrom-task-printing.bb
packages/angstrom/angstrom-task-sectest.bb
packages/avahi/avahi.inc
packages/avahi/avahi_0.6.19.bb
packages/avahi/avahi_0.6.20.bb
packages/avahi/avahi_0.6.21.bb
packages/linux/linux-2.6.21/gumstix-verdex/defconfig
packages/linux/linux_2.6.21.bb
packages/ltp/ltp-20070228/runltp-path.patch
packages/tasks/task-base.bb
packages/tasks/task-boot.bb
packages/tasks/task-dvb.bb
packages/tasks/task-e-x11.bb
packages/tasks/task-gmae.bb
packages/tasks/task-gpe-apps.bb
packages/tasks/task-gpe-base.bb
packages/tasks/task-gpe-connectivity.bb
packages/tasks/task-gpe-desktopapps.bb
packages/tasks/task-gpe-games.bb
packages/tasks/task-gpe-pim.bb
packages/tasks/task-gpe-sectest.bb
packages/tasks/task-gpe-settings.bb
packages/tasks/task-gpe-web.bb
packages/tasks/task-gpe.bb
packages/tasks/task-gpephone.bb
packages/tasks/task-mokogateway.bb
packages/tasks/task-mythfront.bb
packages/tasks/task-opie-16mb.bb
packages/tasks/task-opie-all.bb
packages/tasks/task-opie-apps.bb
packages/tasks/task-opie-games.bb
packages/tasks/task-opie.bb
packages/tasks/task-proper-tools.bb
packages/tasks/task-qpe.bb
packages/tasks/task-sdl.bb
packages/tasks/task-xfce-base.bb
packages/tasks/task-xterminal.bb
Diffs:
#
# mt diff -r5190e4eb0827b8bfe3f72475ad62fd98585e8bfa -r57097c5f7112c41b7466c7f14c1b99593a6d65ae
#
#
#
# delete "packages/libxslt/libxslt_1.1.12.bb"
#
# delete "packages/twisted/twisted_1.2.0.bb"
#
# rename "packages/qmake/qmake2-native-2.01a"
# to "packages/qmake/qmake2-native-2.10a"
#
# rename "packages/qmake/qmake2-native_2.01a.bb"
# to "packages/qmake/qmake2-native_2.10a.bb"
#
# add_file "packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch"
# content [a6b4fce6163979c9ab25466b6441bb3449e61352]
#
# add_file "packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch"
# content [9f82aa13d680670f6f41c683f61e814cae67d056]
#
# add_file "packages/uicmoc/uicmoc4-native_4.3.1.bb"
# content [9a5b3e0cf118671e949e94f3ccdfdc0106bf1511]
#
# patch "packages/e17/exhibit_cvs.bb"
# from [29fad610360202f480fede26fb0c3c7c81eca8e7]
# to [fd141a172c394c58b0e20dad078fce7046c83fc4]
#
# patch "packages/e17/expedite_cvs.bb"
# from [bc914a4638fd17187a62865f8ef6eabe671cb56f]
# to [d6c491e48f867162a8690fce0bf8044dcb7136bc]
#
# patch "packages/gstreamer/gst-plugins-bad_0.10.3.bb"
# from [091c86318da723ac2f5b9708ab9e4cfc39377038]
# to [60a05cd17775d229c49cc169df51e4e7b5ff222b]
#
# patch "packages/gstreamer/gstreamer.inc"
# from [4373e3c63e98e5e7231ff03f8d1ae556374e045f]
# to [a0978cb2802d28b839bb88552a3c5a57a9bf1d23]
#
# patch "packages/gtk+/gtk+_2.10.14.bb"
# from [b7a85a029e4d690ccbcfaae174f1f1950723c46d]
# to [8ae4f9f76c8a1af983ec950a2c99047c7a8a0cc2]
#
# patch "packages/qmake/qmake2-native_2.10a.bb"
# from [b58e6dceed352069e13fc28ed8c4120809744506]
# to [cdb348a27145a7e57dc38436ead198f972573f04]
#
# patch "packages/uicmoc/uicmoc4-native_4.2.3.bb"
# from [bb258bfafd5b03ee012d8e4530a8f4219b862463]
# to [80dd401b3668e6f4f71b2e43bfff330d9196e7a9]
#
# patch "packages/uicmoc/uicmoc4-native_4.3.0.bb"
# from [8520da26a06ef5cd286a9749b5a8e78337c3f665]
# to [bd07c0050ef051ca21f2712499797670879d8879]
#
============================================================
--- packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch a6b4fce6163979c9ab25466b6441bb3449e61352
+++ packages/gtk+/gtk+-2.10.14/cell-renderer-edit-focus.patch a6b4fce6163979c9ab25466b6441bb3449e61352
@@ -0,0 +1,30 @@
+Index: gtk/gtkcellrenderertext.c
+===================================================================
+--- gtk/gtkcellrenderertext.c (revision 18557)
++++ gtk/gtkcellrenderertext.c (working copy)
+@@ -1794,13 +1794,24 @@ gtk_cell_renderer_text_focus_out_event (
+ gpointer data)
+ {
+ GtkCellRendererTextPrivate *priv;
++ GtkSettings *settings;
++ gboolean in_touchscreen_mode = FALSE;
+
+ priv = GTK_CELL_RENDERER_TEXT_GET_PRIVATE (data);
+
+ if (priv->in_entry_menu)
+ return FALSE;
+
+- GTK_ENTRY (entry)->editing_canceled = TRUE;
++ if (gtk_widget_has_screen (entry))
++ settings = gtk_settings_get_for_screen (gtk_widget_get_screen (entry));
++ else
++ settings = gtk_settings_get_default ();
++
++ g_object_get (G_OBJECT (settings),
++ "gtk-touchscreen-mode", &in_touchscreen_mode,
++ NULL);
++
++ GTK_ENTRY (entry)->editing_canceled = !in_touchscreen_mode;
+ gtk_cell_editable_editing_done (GTK_CELL_EDITABLE (entry));
+ gtk_cell_editable_remove_widget (GTK_CELL_EDITABLE (entry));
+
============================================================
--- packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch 9f82aa13d680670f6f41c683f61e814cae67d056
+++ packages/gtk+/gtk+-2.10.14/treeview-checkbox-size.patch 9f82aa13d680670f6f41c683f61e814cae67d056
@@ -0,0 +1,100 @@
+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 12
+
+ 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 (G_OBJECT (widget), (gpointer*)&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 (G_OBJECT (widget), (gpointer*)&priv->cached_widget);
++ g_signal_connect (widget, "style-set", G_CALLBACK (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;
+
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb 9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb 9a5b3e0cf118671e949e94f3ccdfdc0106bf1511
@@ -0,0 +1,59 @@
+DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+SECTION = "libs"
+HOMEPAGE = "http://www.trolltech.com"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz"
+S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
+
+inherit native
+
+EXTRA_OECONF = "-prefix ${STAGING_DIR}/${BUILD_SYS}/qt4 \
+ -qt-libjpeg -qt-gif -system-zlib \
+ -no-nis -no-cups -no-exceptions \
+ -no-accessibility -no-libjpeg \
+ -no-nas-sound -no-sm \
+ -no-xshape -no-xinerama \
+ -no-xcursor -no-xrandr \
+ -no-xrender -no-fontconfig \
+ -no-tablet -no-xkb \
+ -no-libpng \
+ -verbose -release -fast -static \
+ -qt3support "
+# yank default -e
+EXTRA_OEMAKE = " "
+
+do_configure() {
+ echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
+}
+
+TOBUILD = "\
+ src/tools/moc \
+ src/corelib \
+ src/sql \
+ src/qt3support \
+ src/xml \
+ src/tools/uic \
+ src/tools/rcc \
+ src/network \
+ src/gui \
+ src/tools/uic3 \
+"
+
+do_compile() {
+ unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
+ for i in ${TOBUILD}; do
+ cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
+ done
+}
+
+do_stage() {
+ install -m 0755 bin/moc ${STAGING_BINDIR}/moc4
+ install -m 0755 bin/uic ${STAGING_BINDIR}/uic4
+ install -m 0755 bin/uic3 ${STAGING_BINDIR}/uic34
+ install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4
+ install -d ${STAGING_DIR}/${BUILD_SYS}/qt4/
+ install -m 0644 tools/porting/src/q3porting.xml ${STAGING_DIR}/${BUILD_SYS}/qt4/
+}
============================================================
--- packages/e17/exhibit_cvs.bb 29fad610360202f480fede26fb0c3c7c81eca8e7
+++ packages/e17/exhibit_cvs.bb fd141a172c394c58b0e20dad078fce7046c83fc4
@@ -6,5 +6,5 @@ inherit e
inherit e
-SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/exhibit"
+SRC_URI = "${E_CVS};module=e17/apps/exhibit"
S = "${WORKDIR}/${PN}"
============================================================
--- packages/e17/expedite_cvs.bb bc914a4638fd17187a62865f8ef6eabe671cb56f
+++ packages/e17/expedite_cvs.bb d6c491e48f867162a8690fce0bf8044dcb7136bc
@@ -6,7 +6,7 @@ inherit e
inherit e
-SRC_URI = "cvs://anonymous@anoncvs.enlightenment.org/var/cvs/e;module=e17/apps/expedite"
+SRC_URI = "${E_CVS};module=e17/apps/expedite"
S = "${WORKDIR}/${PN}"
do_configure_append() {
============================================================
--- packages/gstreamer/gst-plugins-bad_0.10.3.bb 091c86318da723ac2f5b9708ab9e4cfc39377038
+++ packages/gstreamer/gst-plugins-bad_0.10.3.bb 60a05cd17775d229c49cc169df51e4e7b5ff222b
@@ -1,5 +1,5 @@ require gst-plugins.inc
require gst-plugins.inc
-DEPENDS += "gst-plugins-base"
+DEPENDS += "gst-plugins-base directfb"
SRC_URI += "file://cross-compile.patch;patch=1"
+PR = "r6"
-PR = "r4"
============================================================
--- packages/gstreamer/gstreamer.inc 4373e3c63e98e5e7231ff03f8d1ae556374e045f
+++ packages/gstreamer/gstreamer.inc a0978cb2802d28b839bb88552a3c5a57a9bf1d23
@@ -10,3 +10,5 @@ FILES_${PN}-dev += " ${libdir}/gstreamer
FILES_${PN} += " ${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dev += " ${libdir}/gstreamer-0.10/*.la ${libdir}/gstreamer-0.10/*.a"
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+
============================================================
--- packages/gtk+/gtk+_2.10.14.bb b7a85a029e4d690ccbcfaae174f1f1950723c46d
+++ packages/gtk+/gtk+_2.10.14.bb 8ae4f9f76c8a1af983ec950a2c99047c7a8a0cc2
@@ -1,6 +1,6 @@ require gtk-2.10.inc
require gtk-2.10.inc
-PR = "r5"
+PR = "r6"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
file://no-xwc.patch;patch=1 \
@@ -19,19 +19,21 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
file://spinbutton.patch;patch=1 \
file://gtk+-handhelds.patch;patch=1 \
file://filesel-fix-segfault.patch;patch=1 \
- file://toggle-font.diff;patch=1;pnum=0 \
file://combo-arrow-size.patch;patch=1;pnum=0 \
file://range-no-redraw.patch;patch=1;pnum=0 \
file://scrolled-placement.patch;patch=1;pnum=0 \
+ file://treeview-checkbox-size.patch;patch=1;pnum=0 \
+ file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
"
-#check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
require gtk-fpu.inc
EXTRA_OECONF += "${@get_gtk_fpu_setting(bb, d)}"
# try to squeeze some more performance out of it
SRC_URI_append_fic-gta01 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
SRC_URI_append_fic-gta02 = " file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+
# this doesn't seem to work
SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
# let's do it manually then
============================================================
--- packages/qmake/qmake2-native_2.01a.bb b58e6dceed352069e13fc28ed8c4120809744506
+++ packages/qmake/qmake2-native_2.10a.bb cdb348a27145a7e57dc38436ead198f972573f04
@@ -1,13 +1,12 @@ LICENSE = "GPL QPL"
DESCRIPTION = "TrollTech Makefile Generator"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
SECTION = "devel"
LICENSE = "GPL QPL"
+PR = "r0"
-PR = "r2"
+QTVER = "qtopia-core-opensource-src-4.3.1"
-QTVER = "qt-x11-opensource-src-4.3.0"
-
SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
file://0001-fix-mkspecs.patch;patch=1 \
file://linux-oe-qmake.conf"
============================================================
--- packages/uicmoc/uicmoc4-native_4.2.3.bb bb258bfafd5b03ee012d8e4530a8f4219b862463
+++ packages/uicmoc/uicmoc4-native_4.2.3.bb 80dd401b3668e6f4f71b2e43bfff330d9196e7a9
@@ -1,7 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
+PR = "r1"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.0.bb 8520da26a06ef5cd286a9749b5a8e78337c3f665
+++ packages/uicmoc/uicmoc4-native_4.3.0.bb bd07c0050ef051ca21f2712499797670879d8879
@@ -1,8 +1,9 @@ DESCRIPTION = "User-Interface-, Meta-Obj
DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x"
+DEPENDS = "libx11-native libxext-native"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
#
# mt diff -re30e879439bfeb0f5e33edf2a3e8bfa1828eed4f -r57097c5f7112c41b7466c7f14c1b99593a6d65ae
#
#
#
# delete "packages/avahi/avahi-0.6.15"
#
# delete "packages/avahi/avahi-0.6.15/patch-avahi-daemon_dbus-protocol.c.patch"
#
# delete "packages/avahi/avahi_0.6.15.bb"
#
# delete "packages/avahi/avahi_0.6.16.bb"
#
# delete "packages/avahi/avahi_0.6.17.bb"
#
# delete "packages/avahi/avahi_0.6.18.bb"
#
# add_file "packages/avahi/avahi-python_0.6.21.bb"
# content [3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56]
#
# add_file "packages/avahi/files/configure-check-pymod.patch"
# content [fb42206ea64396e348587b85e86e397a4a94004a]
#
# add_file "packages/xorg-app/sessreg_1.0.3.bb"
# content [01867a4953d810e2f0804b3354cfcb2a2ff73954]
#
# add_file "packages/xorg-app/setxkbmap_1.0.4.bb"
# content [51d21b1d9395a9a3c45b74eb2f35d90d14b6f258]
#
# add_file "packages/xorg-app/xdm_1.1.6.bb"
# content [13b745771af2f8c3b3752f2d1017ad34f48d91bc]
#
# add_file "packages/xorg-app/xmodmap_1.0.3.bb"
# content [3fab59376a8e08e17227a84ab1610760fca1276d]
#
# add_file "packages/xorg-app/xprop_1.0.3.bb"
# content [8572c25f6c26e8e8d5512f4b8183271f3cb8a081]
#
# add_file "packages/xorg-app/xrdb_1.0.4.bb"
# content [50cb61f5911a30c66e5aa43a50bad7edfac2a5f7]
#
# add_file "packages/xorg-app/xsetroot_1.0.2.bb"
# content [c84c12a9d20aa36a5ccb5fc39af4a91c858026d5]
#
# add_file "packages/xorg-app/xvinfo_1.0.2.bb"
# content [fe0a792dccad6a93c31149fed9582885467428e6]
#
# add_file "packages/xorg-doc/xorg-sgml-doctools_1.2.bb"
# content [7a47d59f2ede9eabf6bd8d30f45dcc020b0dea84]
#
# add_file "packages/xorg-driver/xf86-input-mouse_1.2.2.bb"
# content [af8eb32d6b4525f9c5962de994c8bbb87154b4af]
#
# add_file "packages/xorg-driver/xf86-video-ati_6.6.193.bb"
# content [a5d730e0a406f5ff8c5e5388053285718be0b15d]
#
# add_file "packages/xorg-driver/xf86-video-nv_2.1.3.bb"
# content [7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19]
#
# add_file "packages/xorg-driver/xf86-video-savage_2.1.3.bb"
# content [431c6f688a9a38de51d5980ebe5f0bfd1693d54b]
#
# add_file "packages/xorg-lib/diet-x11_1.1.3.bb"
# content [0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e]
#
# add_file "packages/xorg-lib/libice_1.0.4.bb"
# content [fccec7b08bd14f0a08f831b0716cf3130db09a1e]
#
# add_file "packages/xorg-lib/libx11_1.1.3.bb"
# content [54883ca7615919e5526df001f747727753b7c581]
#
# add_file "packages/xorg-lib/libxaw_1.0.4.bb"
# content [6bbfc6ccb9ebb2dd0386423df1b2f7061c5b3870]
#
# add_file "packages/xorg-lib/libxpm_3.5.7.bb"
# content [ae7544893d044dd97a8dd5a5c39383e3961707f3]
#
# add_file "packages/xorg-lib/libxrender_0.9.3.bb"
# content [4fa851509027bb6c796e012747ddcf719eded455]
#
# add_file "packages/xorg-lib/libxtst_1.0.3.bb"
# content [37a48e5c85460c1182084d396c7e2cd90cc8e227]
#
# add_file "packages/xorg-lib/xtrans_1.0.4.bb"
# content [5adfa3a5c753b71a9a61e266569ccbd26e940b09]
#
# patch "MAINTAINERS"
# from [78ace1245c132c22dcfc3a54a4a76692d9d0259a]
# to [2b82e9a7ab1b0bd1c997519a4297c0fee2ec2ec7]
#
# patch "packages/angstrom/angstrom-gpe-task-apps.bb"
# from [43aa72a3f7bfd92362d682fdd4919d1bc0233364]
# to [4e9cfc056a3b0448c82b619628fae2c396889c5f]
#
# patch "packages/angstrom/angstrom-gpe-task-base.bb"
# from [0bf76d6738a5513300fb44b9e760c30e6afefb63]
# to [30a23f6dee4925d21a3bf27405e8f4c25f29be2c]
#
# patch "packages/angstrom/angstrom-gpe-task-game.bb"
# from [574b4b40ba91344f20ee266f571947eaf0bfabbf]
# to [71196080803ea00dd59109c8bfa62ada41174b88]
#
# patch "packages/angstrom/angstrom-gpe-task-pim.bb"
# from [f95eb6c7ed13685671dbf9265a2096da41d4ec9a]
# to [4720d5f026284dfb4a8f89cf99a2292cde8f4146]
#
# patch "packages/angstrom/angstrom-gpe-task-settings.bb"
# from [56e2c9ad5b4b1f6a1e92d8cd9ba55e2686f6cdcc]
# to [04963f41f9195b2a20bddc9409a53ad153e779ff]
#
# patch "packages/angstrom/angstrom-ohand-task-pim.bb"
# from [6bd39e8996516c93fbf18298e7db73e5d6c7b5d2]
# to [29117cd156e8860200d303c5d915d94029800006]
#
# patch "packages/angstrom/angstrom-task-office.bb"
# from [00b86208ff79a87aa59575a1613ff5dd050b9455]
# to [68c13e992cbf4346142df95f6e0603b303c26778]
#
# patch "packages/angstrom/angstrom-task-printing.bb"
# from [1ed146611164572e7746082b18da64219484cd54]
# to [37b5d726438ed3ba8ab86c1f272d8150c4e2dd8d]
#
# patch "packages/angstrom/angstrom-task-sectest.bb"
# from [0b52dec0b07a55dc09bbd4baefb5ac4ec3cab5b7]
# to [0df8c6eb7d44b4b09ee6daecc100e47abb3ede24]
#
# patch "packages/avahi/avahi.inc"
# from [03b0814e1e63c9be9351f7fae999fbddef477289]
# to [8b9c1e9f1c3c321d890f95dad3f772fd5e727b12]
#
# patch "packages/avahi/avahi_0.6.19.bb"
# from [d05ccdc8b01300ebcd02a122fc5e269a287b8749]
# to [80d86f2e2b46546f508edb4d277fa1ef7bceb3b7]
#
# patch "packages/avahi/avahi_0.6.20.bb"
# from [efe6d7c1e1a4684e2c363eb2dd156224be266a30]
# to [617eee50014403513ca14be25fd16c61c19bac14]
#
# patch "packages/avahi/avahi_0.6.21.bb"
# from [cac0fe1735df745ea9c7a235c47d4a31fcf7f7e1]
# to [5650246fb735e81ed906707d2b67bb821765b83c]
#
# patch "packages/linux/linux-2.6.21/gumstix-verdex/defconfig"
# from [7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7]
# to [62c342f45eeb5b3ed2ad8b3df1ba17710c322b17]
#
# patch "packages/linux/linux_2.6.21.bb"
# from [ba51fa252ec8e5f423145d8b34259d0a8a42c124]
# to [334365c6be19ebecd953842a2dbbabc7b9c4dc98]
#
# patch "packages/ltp/ltp-20070228/runltp-path.patch"
# from [05229a3d38d01cb102e5d9c2479b7e3c3c6e244c]
# to [60b2f63bed93e45d756fb82a7caa59d7180f79e3]
#
# patch "packages/tasks/task-base.bb"
# from [fe2979cb73be668163bfcc4d8438f2aef96d197b]
# to [f226a9b74f22d388d492ca278393475a549a6469]
#
# patch "packages/tasks/task-boot.bb"
# from [0a607d5e5b7ae509d565fbbb3b925a3b21b28292]
# to [c23c7a613f0b88d6f60bc742ec8af93640b7ebc7]
#
# patch "packages/tasks/task-dvb.bb"
# from [e97311dda09c583e443eb8d584d70013d5a9752a]
# to [d0b580515a75dbbdb39c4b7e4f845033652fca41]
#
# patch "packages/tasks/task-e-x11.bb"
# from [5d4cab35fb3d671aabdf25040e26d1b8c29ae706]
# to [6b5175734cf987a2e61042f94659d72151ac8838]
#
# patch "packages/tasks/task-gmae.bb"
# from [da0fc8581e2e382338b0673b4e59d4d4af906fff]
# to [bc361109a67390638c62cd8ad9951d21c26a3f06]
#
# patch "packages/tasks/task-gpe-apps.bb"
# from [f9b0521eb9c70cf4c727468de9f158d4862e3913]
# to [441eab197bd9798e82d054b10892ef79ea23c9c4]
#
# patch "packages/tasks/task-gpe-base.bb"
# from [248daeca565cf97b75e833c4dcd52f3d687f634e]
# to [ab132c0f7f2cb6b6cfb49188855c0c5345502b81]
#
# patch "packages/tasks/task-gpe-connectivity.bb"
# from [56c43e4bde77ad931eb095aadde525e8c8a325e4]
# to [66a16f3b25fa29c93f5f8c58dfcb6eb17ae71761]
#
# patch "packages/tasks/task-gpe-desktopapps.bb"
# from [81a2bc87d3c4d7f54827c23561a6a3d789f7db2b]
# to [fb7ce22094506055002c2309838eeeff2877f5eb]
#
# patch "packages/tasks/task-gpe-games.bb"
# from [5c5d0cd44736fa92600e96f9cbf0183021fa85dd]
# to [f2538ca710d41e9be3bce81471173111863558a2]
#
# patch "packages/tasks/task-gpe-pim.bb"
# from [820d21530a16077c66ee1e05f9b90d472c4829ff]
# to [45b2dc91fcf50d2b57117f70a762176a664f6ae4]
#
# patch "packages/tasks/task-gpe-sectest.bb"
# from [84fa13529206a1c3f88d6fdffc5da80b79bcd10c]
# to [01b6679530b92aa7e2abffbbd20421ac63960b09]
#
# patch "packages/tasks/task-gpe-settings.bb"
# from [e2954cba1dede6e2a966fbf9589afbd2de1cb6d7]
# to [22acf3e3699630d32f32ad8c00db79dd9bca992d]
#
# patch "packages/tasks/task-gpe-web.bb"
# from [0a675047bd8b7c48761317cbcded83167b1800d4]
# to [c8f046b12c0ba8dbf6d7510848ea437f21929e91]
#
# patch "packages/tasks/task-gpe.bb"
# from [cb4baeeea50ecdf6485cc9fdd8b4a96b6f2b00e2]
# to [6d67c2a586f7786deaf06a8760041f2b4f96e72e]
#
# patch "packages/tasks/task-gpephone.bb"
# from [8ad1cb7e128bf7c713a3601294598f2f45cbdbf2]
# to [32f3ddece27b455887f907603ffe167f70aaadd7]
#
# patch "packages/tasks/task-mokogateway.bb"
# from [cca68ea72f5d84032e651bc005390558dc96dcb5]
# to [5e12100a7a593a84f09f7bd4ebce36d0ba4865f8]
#
# patch "packages/tasks/task-mythfront.bb"
# from [99f682fdb8786fe44425466c0e958e57d9f4d0cf]
# to [9f4ca916db04dc5d9df509fd4ea8b7cbd368bfb9]
#
# patch "packages/tasks/task-opie-16mb.bb"
# from [c0a18727fc19ff18cf71d626b50d65ff16793273]
# to [3573b05667876fc3c7747ce95d4433bd8d14b416]
#
# patch "packages/tasks/task-opie-all.bb"
# from [f882913a23b727a2f228423837f49cd69400af8b]
# to [86ca8dc0275a5b8803e7637f1535121d73aa1fbb]
#
# patch "packages/tasks/task-opie-apps.bb"
# from [e192666adc8ea55dfd2d13880e39567451ff691b]
# to [a0cf1520578fa36ea0181cd808c6885c6cf7d8b5]
#
# patch "packages/tasks/task-opie-games.bb"
# from [16c0e4e90b8f2a1107b929ac2cb5ddb8abd15f10]
# to [62413c817012ca1ca8a7342ea3fae26b92672e23]
#
# patch "packages/tasks/task-opie.bb"
# from [3dd6719f9c7ba4832d9d3d9e23b649733e187673]
# to [33f680faf713d2b125f51eb210a4b761bb5784c2]
#
# patch "packages/tasks/task-proper-tools.bb"
# from [ef2689130c9052ea04a979f29a265f575b783aa0]
# to [19579ef6eea2dd2ffcf3fc6b9647a580c5f51cab]
#
# patch "packages/tasks/task-qpe.bb"
# from [067b3304f1e3f987b06d5928cff877b86572bc8e]
# to [3c20204c3ba7122687a68e5d4dcb334d32570826]
#
# patch "packages/tasks/task-sdl.bb"
# from [149ccaa5d730299d35fb73acc6d38481deba29ea]
# to [ccc842048039b23bb776391ae8290cc24e96148b]
#
# patch "packages/tasks/task-xfce-base.bb"
# from [2ba45c027c2fde294c2bb4ad584d788bc330038d]
# to [addec9b6129ccc1aa3a126f2d93a26c0dcc691ce]
#
# patch "packages/tasks/task-xterminal.bb"
# from [a90c170fd1a87a96fd18a14180b2abbc80d180c7]
# to [3d1ffb522b93aa212cfa3b349e262727063ac56c]
#
============================================================
--- packages/avahi/avahi-python_0.6.21.bb 3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
+++ packages/avahi/avahi-python_0.6.21.bb 3d4b1b5c3ed23ff0bab2bd72c1cdb67561178a56
@@ -0,0 +1,14 @@
+require avahi.inc
+PR = "r0"
+
+# FIXME: without --enable-gtk, avahi-discover (pygtk) won't be built
+FILES_avahi-discover = ""
+
+PROVIDES = "avahi"
+DEPENDS += "python-native"
+
+SRC_URI += "file://dbus-pre-1.1.1-support.patch;patch=1 \
+ file://configure-check-pymod.patch;patch=1"
+S = "${WORKDIR}/avahi-${PV}"
+
+AVAHI_PYTHON = "--enable-python"
============================================================
--- packages/avahi/files/configure-check-pymod.patch fb42206ea64396e348587b85e86e397a4a94004a
+++ packages/avahi/files/configure-check-pymod.patch fb42206ea64396e348587b85e86e397a4a94004a
@@ -0,0 +1,27 @@
+Index: avahi-0.6.21/configure.ac
+===================================================================
+--- avahi-0.6.21.orig/configure.ac 2007-08-16 21:36:12.000000000 +0200
++++ avahi-0.6.21/configure.ac 2007-08-16 21:45:14.000000000 +0200
+@@ -700,10 +700,6 @@
+ esac],
+ [HAVE_PYGTK=yes])
+
+- if test "x$HAVE_PYGTK" = "xyes" ; then
+- AM_CHECK_PYMOD(gtk,,,[AC_MSG_ERROR(Could not find Python module gtk)])
+- fi
+-
+
+ if test "x$HAVE_DBUS" = "xyes" ; then
+ AC_ARG_ENABLE(python-dbus,
+@@ -715,11 +711,6 @@
+ esac],
+ [HAVE_PYTHON_DBUS=yes])
+
+- if test "x$HAVE_PYTHON_DBUS" = "xyes"; then
+- AM_CHECK_PYMOD(dbus,,,[AC_MSG_ERROR(Could not find Python module dbus)])
+- fi
+-
+- AM_CHECK_PYMOD(socket,,,[AC_MSG_ERROR(Could not find Python module socket)])
+ if test "x$HAVE_GDBM" = "xyes"; then
+ AM_CHECK_PYMOD(gdbm,,,[AC_MSG_ERROR(Could not find Python module gdbm)])
+ fi
============================================================
--- packages/xorg-app/sessreg_1.0.3.bb 01867a4953d810e2f0804b3354cfcb2a2ff73954
+++ packages/xorg-app/sessreg_1.0.3.bb 01867a4953d810e2f0804b3354cfcb2a2ff73954
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " virtual/libx11"
+
============================================================
--- packages/xorg-app/setxkbmap_1.0.4.bb 51d21b1d9395a9a3c45b74eb2f35d90d14b6f258
+++ packages/xorg-app/setxkbmap_1.0.4.bb 51d21b1d9395a9a3c45b74eb2f35d90d14b6f258
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxkbfile virtual/libx11"
+
============================================================
--- packages/xorg-app/xdm_1.1.6.bb 13b745771af2f8c3b3752f2d1017ad34f48d91bc
+++ packages/xorg-app/xdm_1.1.6.bb 13b745771af2f8c3b3752f2d1017ad34f48d91bc
@@ -0,0 +1,8 @@
+require xorg-app-common.inc
+PE = "1"
+
+DESCRIPTION = "X display manager"
+
+DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt"
+
+EXTRA_OECONF += " --with-random-device=/dev/urandom"
============================================================
--- packages/xorg-app/xmodmap_1.0.3.bb 3fab59376a8e08e17227a84ab1610760fca1276d
+++ packages/xorg-app/xmodmap_1.0.3.bb 3fab59376a8e08e17227a84ab1610760fca1276d
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "utility for modifying keymaps and pointer button mappings in X"
+LICENSE = "MIT"
+PE = "1"
============================================================
--- packages/xorg-app/xprop_1.0.3.bb 8572c25f6c26e8e8d5512f4b8183271f3cb8a081
+++ packages/xorg-app/xprop_1.0.3.bb 8572c25f6c26e8e8d5512f4b8183271f3cb8a081
@@ -0,0 +1,7 @@
+require xorg-app-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " libxmu virtual/libx11"
+
============================================================
--- packages/xorg-app/xrdb_1.0.4.bb 50cb61f5911a30c66e5aa43a50bad7edfac2a5f7
+++ packages/xorg-app/xrdb_1.0.4.bb 50cb61f5911a30c66e5aa43a50bad7edfac2a5f7
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "X server resource database utility"
+LICENSE = "xrdb"
+DEPENDS += "libxmu"
+PE = "1"
============================================================
--- packages/xorg-app/xsetroot_1.0.2.bb c84c12a9d20aa36a5ccb5fc39af4a91c858026d5
+++ packages/xorg-app/xsetroot_1.0.2.bb c84c12a9d20aa36a5ccb5fc39af4a91c858026d5
@@ -0,0 +1,6 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Sets the visual appearance of the X root window"
+LICENSE = "MIT"
+DEPENDS += "libxmu xbitmaps"
+PE = "1"
============================================================
--- packages/xorg-app/xvinfo_1.0.2.bb fe0a792dccad6a93c31149fed9582885467428e6
+++ packages/xorg-app/xvinfo_1.0.2.bb fe0a792dccad6a93c31149fed9582885467428e6
@@ -0,0 +1,5 @@
+require xorg-app-common.inc
+
+DESCRIPTION = "Print out X-Video extension adaptor information"
+DEPENDS += " libxv"
+PE = "1"
============================================================
--- packages/xorg-doc/xorg-sgml-doctools_1.2.bb 7a47d59f2ede9eabf6bd8d30f45dcc020b0dea84
+++ packages/xorg-doc/xorg-sgml-doctools_1.2.bb 7a47d59f2ede9eabf6bd8d30f45dcc020b0dea84
@@ -0,0 +1,8 @@
+require xorg-doc-common.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
+
+FILES_${PN} += " /usr/share/X11/sgml"
============================================================
--- packages/xorg-driver/xf86-input-mouse_1.2.2.bb af8eb32d6b4525f9c5962de994c8bbb87154b4af
+++ packages/xorg-driver/xf86-input-mouse_1.2.2.bb af8eb32d6b4525f9c5962de994c8bbb87154b4af
@@ -0,0 +1,7 @@
+require xorg-driver-input.inc
+PE = "1"
+
+DESCRIPTION = "Mouse Support in X11"
+
+#DEPENDS += " "
+
============================================================
--- packages/xorg-driver/xf86-video-ati_6.6.193.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
+++ packages/xorg-driver/xf86-video-ati_6.6.193.bb a5d730e0a406f5ff8c5e5388053285718be0b15d
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
============================================================
--- packages/xorg-driver/xf86-video-nv_2.1.3.bb 7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19
+++ packages/xorg-driver/xf86-video-nv_2.1.3.bb 7e13fbaf1644b16fa1b4445ea7812bbe2b0c1a19
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+#DEPENDS += " "
============================================================
--- packages/xorg-driver/xf86-video-savage_2.1.3.bb 431c6f688a9a38de51d5980ebe5f0bfd1693d54b
+++ packages/xorg-driver/xf86-video-savage_2.1.3.bb 431c6f688a9a38de51d5980ebe5f0bfd1693d54b
@@ -0,0 +1,6 @@
+require xorg-driver-video.inc
+PE = "1"
+
+#DESCRIPTION = ""
+
+DEPENDS += " drm xf86driproto"
============================================================
--- packages/xorg-lib/diet-x11_1.1.3.bb 0b9ad63b2f6a6a514ffed24a05cbc8a348bbf82e
+++ packages/xorg-lib/diet-x11_1.1.3.bb 0b9ad63b2f6a6a514ffed%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list