<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# add_file "packages/efl1/imlib2/remove-local-includes-20080421.patch"
#  content [6cb1af5e1d744afaed49d06493a112c10cf8210b]
# 
# add_file "packages/hal/hal-info_20080313.bb"
#  content [5389659078578f1501bf847f45a6a405058621b7]
# 
# add_file "packages/notification-daemon/files/notification-daemon-fix-text-color.diff"
#  content [4dd28f5a824b69e10af37851a3ddb38462a9e6bd]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [874414ea97223b337c23ffb66e4cbd28401832db]
#    to [03bc5e80481dfb6e8ef93d0031d1191c9031db0b]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [a17c1b9159d6d9366cdc117a292f24ae0ad7b4fe]
#    to [08a36f5f6e39c385d9c689389a96689cc687ad5b]
# 
# patch "packages/efl1/imlib2_cvs.bb"
#  from [90324b9d8bfadfca430da3b72c2b1f9c7089ee52]
#    to [41b7537a6af77e700c6236af3c40b2b7a8d80604]
# 
# patch "packages/notification-daemon/notification-daemon_0.3.7.bb"
#  from [2651b1bc5c5efb73799947ba1466e4ad1dec44cc]
#    to [a7ebdf98090ed6e927affd6bbb3854a3ee53174d]
#
============================================================
<font color="#FF6600">--- packages/efl1/imlib2/remove-local-includes-20080421.patch        6cb1af5e1d744afaed49d06493a112c10cf8210b</font>
<font color="#009900">+++ packages/efl1/imlib2/remove-local-includes-20080421.patch        6cb1af5e1d744afaed49d06493a112c10cf8210b</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+Index: imlib2/configure.in</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- imlib2.orig/configure.in        2008-04-21 14:28:58.000000000 +0800</font>
<font color="#009900">++++ imlib2/configure.in        2008-04-21 14:30:07.000000000 +0800</font>
<font color="#009900">+@@ -191,9 +191,7 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ if test "x$have_x" = "xyes"; then</font>
<font color="#009900">+   AC_PATH_XTRA</font>
<font color="#009900">+-  x_dir=${x_dir:-/usr/X11R6}</font>
<font color="#009900">+-  x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}</font>
<font color="#009900">+-  x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"</font>
<font color="#009900">++  x_libs="-lX11 -lXext"</font>
<font color="#009900">+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])</font>
<font color="#009900">+ else</font>
<font color="#009900">+   x_cflags=""</font>
============================================================
<font color="#FF6600">--- packages/hal/hal-info_20080313.bb        5389659078578f1501bf847f45a6a405058621b7</font>
<font color="#009900">+++ packages/hal/hal-info_20080313.bb        5389659078578f1501bf847f45a6a405058621b7</font>
<font color="#0000FF">@@ -0,0 +1,20 @@</font>
<font color="#009900">+DESCRIPTION = "Hardware Abstraction Layer device information"</font>
<font color="#009900">+HOMEPAGE = "http://hal.freedesktop.org/"</font>
<font color="#009900">+SECTION = "unknown"</font>
<font color="#009900">+LICENSE = "GPL AFL"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz"</font>
<font color="#009900">+S = "${WORKDIR}/${PN}-${PV}"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF = "--disable-recall --disable-video"</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure() {</font>
<font color="#009900">+        gnu-configize</font>
<font color="#009900">+        libtoolize --force</font>
<font color="#009900">+        oe_runconf</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGE_ARCH = "all"</font>
<font color="#009900">+FILES_${PN} += "${datadir}/hal/"</font>
============================================================
<font color="#FF6600">--- packages/notification-daemon/files/notification-daemon-fix-text-color.diff        4dd28f5a824b69e10af37851a3ddb38462a9e6bd</font>
<font color="#009900">+++ packages/notification-daemon/files/notification-daemon-fix-text-color.diff        4dd28f5a824b69e10af37851a3ddb38462a9e6bd</font>
<font color="#0000FF">@@ -0,0 +1,44 @@</font>
<font color="#009900">+--- notification-daemon-0.3.7.orig/src/themes/standard/theme.c        2007-01-26 04:20:15.000000000 +0000</font>
<font color="#009900">++++ notification-daemon-0.3.7/src/themes/standard/theme.c        2008-04-18 12:14:33.000000000 +0100</font>
<font color="#009900">+@@ -653,6 +653,23 @@</font>
<font color="#009900">+         return FALSE;</font>
<font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++</font>
<font color="#009900">++static void</font>
<font color="#009900">++style_set_cb (GtkWidget *label, GtkStyle *previous_style, WindowData *windata)</font>
<font color="#009900">++{</font>
<font color="#009900">++        static gboolean in_style_set_cb;</font>
<font color="#009900">++</font>
<font color="#009900">++        if (in_style_set_cb)</font>
<font color="#009900">++                return;</font>
<font color="#009900">++</font>
<font color="#009900">++        in_style_set_cb = TRUE;</font>
<font color="#009900">++</font>
<font color="#009900">++        gtk_widget_modify_fg (label, GTK_STATE_NORMAL,</font>
<font color="#009900">++                              &amp;label-&gt;style-&gt;text[GTK_STATE_NORMAL]);</font>
<font color="#009900">++</font>
<font color="#009900">++        in_style_set_cb = FALSE;</font>
<font color="#009900">++}</font>
<font color="#009900">++</font>
<font color="#009900">+ GtkWindow *</font>
<font color="#009900">+ create_notification(UrlClickedCb url_clicked)</font>
<font color="#009900">+ {</font>
<font color="#009900">+@@ -753,6 +770,8 @@</font>
<font color="#009900">+         gtk_widget_set_size_request(spacer, SPACER_LEFT, -1);</font>
<font color="#009900">+ </font>
<font color="#009900">+         windata-&gt;summary_label = gtk_label_new(NULL);</font>
<font color="#009900">++        g_signal_connect(windata-&gt;summary_label, "style-set",</font>
<font color="#009900">++                         G_CALLBACK(style_set_cb), windata);</font>
<font color="#009900">+         gtk_widget_show(windata-&gt;summary_label);</font>
<font color="#009900">+         gtk_box_pack_start(GTK_BOX(hbox), windata-&gt;summary_label, TRUE, TRUE, 0);</font>
<font color="#009900">+         gtk_misc_set_alignment(GTK_MISC(windata-&gt;summary_label), 0, 0);</font>
<font color="#009900">+@@ -800,6 +819,8 @@</font>
<font color="#009900">+         gtk_box_pack_start(GTK_BOX(windata-&gt;content_hbox), vbox, TRUE, TRUE, 0);</font>
<font color="#009900">+ </font>
<font color="#009900">+         windata-&gt;body_label = sexy_url_label_new();</font>
<font color="#009900">++        g_signal_connect(windata-&gt;body_label, "style-set",</font>
<font color="#009900">++                         G_CALLBACK(style_set_cb), windata);</font>
<font color="#009900">+         gtk_box_pack_start(GTK_BOX(vbox), windata-&gt;body_label, TRUE, TRUE, 0);</font>
<font color="#009900">+         gtk_misc_set_alignment(GTK_MISC(windata-&gt;body_label), 0, 0);</font>
<font color="#009900">+         gtk_label_set_line_wrap(GTK_LABEL(windata-&gt;body_label), TRUE);</font>
============================================================
<font color="#FF6600">--- conf/distro/include/moko-autorev.inc        874414ea97223b337c23ffb66e4cbd28401832db</font>
<font color="#009900">+++ conf/distro/include/moko-autorev.inc        03bc5e80481dfb6e8ef93d0031d1191c9031db0b</font>
<font color="#0000FF">@@ -22,8 +22,8 @@ SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}</font>
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 SRCREV_pn-openmoko-agpsui ?= "${AUTOREV}"
<font color="#FF6600">-SRCREV_pn-opkg ?= "${AUTOREV}"</font>
<font color="#FF6600">-SRCREV_pn-opkg-native ?= "${AUTOREV}"</font>
<font color="#009900">+#SRCREV_pn-opkg ?= "${AUTOREV}"</font>
<font color="#009900">+#SRCREV_pn-opkg-native ?= "${AUTOREV}"</font>
 
 SRCREV_pn-multitap-pad ?= "${AUTOREV}"
 
============================================================
<font color="#FF6600">--- conf/distro/include/sane-srcrevs.inc        a17c1b9159d6d9366cdc117a292f24ae0ad7b4fe</font>
<font color="#009900">+++ conf/distro/include/sane-srcrevs.inc        08a36f5f6e39c385d9c689389a96689cc687ad5b</font>
<font color="#0000FF">@@ -147,9 +147,9 @@ SRCREV_pn-openocd-native ?= "517"</font>
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
<font color="#FF6600">-SRCREV_pn-opkg ?= "4345"</font>
<font color="#FF6600">-SRCREV_pn-opkg-native ?= "4345"</font>
<font color="#FF6600">-SRCREV_pn-opkg-sdk ?= "4235"</font>
<font color="#009900">+SRCREV_pn-opkg ?= "4247"</font>
<font color="#009900">+SRCREV_pn-opkg-native ?= "4247"</font>
<font color="#009900">+SRCREV_pn-opkg-sdk ?= "4247"</font>
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
 SRCREV_pn-psplash ?= "249"
============================================================
<font color="#FF6600">--- packages/efl1/imlib2_cvs.bb        90324b9d8bfadfca430da3b72c2b1f9c7089ee52</font>
<font color="#009900">+++ packages/efl1/imlib2_cvs.bb        41b7537a6af77e700c6236af3c40b2b7a8d80604</font>
<font color="#0000FF">@@ -3,11 +3,13 @@ PV = "1.4.1.000+cvs${SRCDATE}"</font>
 # can also depend on tiff34, ungif or gif, z, bz2, id3tag
 DEPENDS = "freetype libpng jpeg virtual/libx11 libxext"
 PV = "1.4.1.000+cvs${SRCDATE}"
<font color="#FF6600">-PR = "r0"</font>
<font color="#009900">+PR = "r0.01"</font>
 
 inherit efl
 
<font color="#FF6600">-SRC_URI += "file://remove-local-includes.patch;patch=1"</font>
<font color="#009900">+# The original patch was out of date in 20080420</font>
<font color="#009900">+SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \</font>
<font color="#009900">+            file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 "</font>
 
 EXTRA_OECONF = "--with-x"
 
============================================================
<font color="#FF6600">--- packages/notification-daemon/notification-daemon_0.3.7.bb        2651b1bc5c5efb73799947ba1466e4ad1dec44cc</font>
<font color="#009900">+++ packages/notification-daemon/notification-daemon_0.3.7.bb        a7ebdf98090ed6e927affd6bbb3854a3ee53174d</font>
<font color="#0000FF">@@ -3,8 +3,10 @@ DEPENDS = "gettext dbus gtk+ libsexy gco</font>
 SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
<font color="#009900">+PR = "r1"</font>
 
<font color="#FF6600">-SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"</font>
<font color="#009900">+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \</font>
<font color="#009900">+           file://notification-daemon-fix-text-color.diff;patch=1"</font>
 
 EXTRA_OECONF = "--disable-binreloc"
 
</tt></pre>