<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# delete "conf/distro/include/preferred-om-2008-versions.inc"

# delete "packages/gnash/gnash.inc"

# delete "packages/gnash/gnash_0.8.1.bb"

# delete "packages/gpsdrive/gpsdrive-2.10pre4"

# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"

# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"

# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"

# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"

# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"

# delete "packages/ipkg/files/ipkg_bugfix.patch"

# delete "packages/multitap-pad"

# delete "packages/multitap-pad/files"

# delete "packages/multitap-pad/files/80multitappad"

# delete "packages/multitap-pad/multitap-pad_svn.bb"

# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"

# delete "packages/perl/libwww-perl-native_5.808.bb"

# delete "packages/perl/libwww-perl_5.808.bb"

# delete "packages/wpa-supplicant/wpa-supplicant"

# delete "packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch"

# delete "packages/wpa-supplicant/wpa-supplicant-0.5.inc"

# delete "packages/wpa-supplicant/wpa-supplicant-nossl"

# delete "packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig"

# delete "packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb"

# delete "packages/wpa-supplicant/wpa-supplicant-ssl"

# delete "packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig"

# delete "packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb"

# delete "packages/wpa-supplicant/wpa-supplicant_0.2.6.inc"

# delete "packages/wpa-supplicant/wpa-supplicant_0.3.6.bb"

# delete "packages/wpa-supplicant/wpa-supplicant_0.3.8.bb"

# delete "packages/wpa-supplicant/wpa-supplicant_0.5.5.bb"

# delete "packages/wpa-supplicant/wpa-supplicant_0.5.7.bb"

# delete "packages/wpa-supplicant/wpa-supplicant_cvs.bb"

# add_dir "packages/gpsdrive/gpsdrive-2.10pre4"

# add_dir "packages/multitap-pad"

# add_dir "packages/multitap-pad/files"

# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta01"

# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta02"

# add_dir "packages/qtopia-phone"

# add_dir "packages/qtopia-phone/files"

# add_dir "packages/qtopia-phone/files/fic-gta01"

# add_dir "packages/qtopia-phone/files/fic-gta02"

# add_dir "packages/qtopia-phone/qtopia-phone-x11"

# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"

# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"

# add_file "conf/distro/include/preferred-om-2008-versions.inc"
#  content [0741783d8c451adac5e47265611069ee7296c2d7]

# add_file "conf/machine/htckaiser.conf"
#  content [8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b]

# add_file "packages/gnash/gnash.inc"
#  content [66c805eb5cfd0e18a89770e022d4420ee9013566]

# add_file "packages/gnash/gnash_0.8.1.bb"
#  content [50014de2c3904a6950c775be0eda4815399cb573]

# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#  content [f7d05fac53703548b59b528f752366847140744e]

# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#  content [47e014d89d9957ea970e01aced2dc553d3722236]

# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#  content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]

# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#  content [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]

# add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  content [9e4cea32b63aa093d54c9b1039cfa8dd87790322]

# add_file "packages/images/openmoko-qtopia-image.bb"
#  content [85858c01bf04fa98f230120b45029c9ffc41a05c]

# add_file "packages/images/openmoko-qtopia-x11-image.bb"
#  content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]

# add_file "packages/linux/linux-kaiser_2.6.24+git.bb"
#  content [f35b44d6d3ebfde341c328a3b1e8362f8dec89de]

# add_file "packages/multitap-pad/files/80multitappad"
#  content [b613cc7c89d800c205b89dd7013c4b3ba309b319]

# add_file "packages/multitap-pad/multitap-pad_svn.bb"
#  content [8f2b626f58690dd52e509cacab5977c5f52270e2]

# add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#  content [4e424e0c74d42282c80ac2738e417b8dc7014e80]

# add_file "packages/openmoko-tools/pty-forward-native.bb"
#  content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]

# add_file "packages/openmoko-tools/serial-forward.bb"
#  content [32434a87a886be4c262ea2f13af0375bae297e48]

# add_file "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
#  content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]

# add_file "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
#  content [d1c708f7f915fa250e20a84fa9d4512440442a4f]

# add_file "packages/perl/libwww-perl-native_5.808.bb"
#  content [66723b8808de2c5758435a88b9640bc8777d89be]

# add_file "packages/perl/libwww-perl_5.808.bb"
#  content [c76a162b7e6844022d4b9826386bfeed71c6328e]

# add_file "packages/qtopia-phone/files/fic-gta01/device-conf"
#  content [33f77c8d4d680c25796f493f054c0e6581439476]

# add_file "packages/qtopia-phone/files/fic-gta01/device-conf.old"
#  content [7cf2ef99b35315048f286f7f0027ed5c6d609862]

# add_file "packages/qtopia-phone/files/fic-gta01/qplatformdefs.h"
#  content [4548b7c6203d64cb5ba410f46ff363427f46e675]

# add_file "packages/qtopia-phone/files/fic-gta02/device-conf"
#  content [33f77c8d4d680c25796f493f054c0e6581439476]

# add_file "packages/qtopia-phone/files/fic-gta02/device-conf.old"
#  content [7cf2ef99b35315048f286f7f0027ed5c6d609862]

# add_file "packages/qtopia-phone/files/fic-gta02/qplatformdefs.h"
#  content [4548b7c6203d64cb5ba410f46ff363427f46e675]

# add_file "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
#  content [54bf1406f00aebb9f05186ae64e99cd38f45ef0b]

# add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
#  content [14600d791e31540ce23ce74084b05c424a136b7f]

# add_file "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
#  content [8d6511f3785b690662798bf6a7814f77ef203bca]

# add_file "packages/qtopia-phone/qtopia-phone.inc"
#  content [3a88780f98fdd8af1ad280d0c3e688bf14e81001]

# add_file "packages/qtopia-phone/qtopia-phone_4.3.0.bb"
#  content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]

# add_file "packages/qtopia-phone/qtopia-phone_4.3.1.bb"
#  content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]

# add_file "packages/qtopia-phone/qtopia-phone_arch.inc"
#  content [15641411049adbe933692115529c6bac3f43cfef]

# add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
#  content [38da0e6335542addd488373f6e8cee974a877a58]

# add_file "packages/tasks/task-openmoko-qtopia.bb"
#  content [4367872d7b461db04275d0f119b597e45eb0811b]

# add_file "packages/wpa-supplicant/wpa-supplicant_0.5.10.bb"
#  content [96f91121be0d1a9fb9a7bbe2872fa7da5b580c83]

# patch "classes/kernel.bbclass"
#  from [0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21]
#    to [8d92c5a7b6420490dd6b3115e8146b3fc0a0f854]

# patch "classes/sourcepkg.bbclass"
#  from [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
#    to [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]

# patch "conf/distro/include/sane-srcrevs.inc"
#  from [521cedb389bc68d1f7ab5ea2240153394d425295]
#    to [7314e35801b572c3e3928395538ae79453852b2f]

# patch "conf/machine/at32stk1000.conf"
#  from [3d5142529536576aea6056c6d761540974caa5ac]
#    to [163fd78fdfe07eb3befe4b759102820ed434730b]

# patch "conf/machine/om-gta02.conf"
#  from [bb34d745d24d709bd9a6fe113c95e816ba6c788a]
#    to [8a81b5b7224a98d62de1611265a26386dc77b5f2]

# patch "packages/alsa/alsa-state.bb"
#  from [fa1e4194e6ae098938b0dfb04b2a91debdf76cd9]
#    to [f5ed106d3dce9fc8b495243ae43e56a3127b312e]

# patch "packages/images/unslung-image.bb"
#  from [e4cf81045fb8a8e211e464905d1b307c49987663]
#    to [738ce981801bef8a0c76499a9524887eeb1547ff]

# patch "packages/meta/slugos-packages.bb"
#  from [a8de050f9b9bde46ec2fe91cdf9d93c69da445cb]
#    to [46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb]

# patch "packages/openocd/openocd_svn.bb"
#  from [ff4b08ed923a74c3efa4730980288907a11baeb7]
#    to [5863de22800841c9bcd0fe5b4014ef3d911f91a2]

# patch "packages/rsync/rsync.inc"
#  from [7c3e306cf41e043732b6fedbc8c41ebc491fedaf]
#    to [1d1f2cbe00f4779bdc3dc7f9689611d817e90259]

# patch "packages/rsync/rsync_2.6.9.bb"
#  from [46d56c1ae65397da35a2b8871cfecde62e0a382e]
#    to [1b1f42efd8d5dc944a9638cd0678259c995c08dd]

# patch "packages/rsync/rsync_3.0.0.bb"
#  from [265d3e5b7ec96ad6b092880621ccd67844dd9dc7]
#    to [dd9114bcedbdbe8b612946916a35fe4a662cd34c]
#
============================================================
<font color="#FF6600">--- conf/distro/include/preferred-om-2008-versions.inc        0741783d8c451adac5e47265611069ee7296c2d7</font>
<font color="#009900">+++ conf/distro/include/preferred-om-2008-versions.inc        0741783d8c451adac5e47265611069ee7296c2d7</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+PREFERRED_VERSION_asterisk = "1.4.17"</font>
<font color="#009900">+PREFERRED_VERSION_busybox = "1.9.1"</font>
<font color="#009900">+PREFERRED_VERSION_dbus = "1.2.1"</font>
<font color="#009900">+PREFERRED_VERSION_dbus-glib = "0.74"</font>
<font color="#009900">+PREFERRED_VERSION_glib-2.0 = "2.16.1"</font>
<font color="#009900">+PREFERRED_VERSION_gnash = "0.8.2"</font>
<font color="#009900">+PREFERRED_VERSION_gpsdrive = "2.10pre4"</font>
<font color="#009900">+PREFERRED_VERSION_gst-pulse = "0.9.7"</font>
<font color="#009900">+PREFERRED_VERSION_intltool = "0.35.5"</font>
<font color="#009900">+PREFERRED_VERSION_intltool-native = "0.35.5"</font>
<font color="#009900">+PREFERRED_VERSION_libtool = "1.5.24"</font>
<font color="#009900">+PREFERRED_VERSION_midori = "0.0.17"</font>
<font color="#009900">+PREFERRED_VERSION_pulseaudio = "0.9.9"</font>
<font color="#009900">+PREFERRED_VERSION_udev = "118"</font>
<font color="#009900">+PREFERRED_VERSION_vte = "0.16.9"</font>
============================================================
<font color="#FF6600">--- conf/machine/htckaiser.conf        8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b</font>
<font color="#009900">+++ conf/machine/htckaiser.conf        8ecec3cc2692888e23f7f4ac09f4cb55c7234e4b</font>
<font color="#0000FF">@@ -0,0 +1,25 @@</font>
<font color="#009900">+#@TYPE: Machine</font>
<font color="#009900">+#@NAME: HTC Kaiser phone</font>
<font color="#009900">+#@DESCRIPTION: Machine configuration for HTC Kaiser phone</font>
<font color="#009900">+TARGET_ARCH = "arm"</font>
<font color="#009900">+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6"</font>
<font color="#009900">+ </font>
<font color="#009900">+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"</font>
<font color="#009900">+XSERVER = "xserver-kdrive-fbdev"</font>
<font color="#009900">+ </font>
<font color="#009900">+GUI_MACHINE_CLASS = "smallscreen"</font>
<font color="#009900">+MACHINE_DISPLAY_WIDTH_PIXELS = "240"</font>
<font color="#009900">+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"</font>
<font color="#009900">+ </font>
<font color="#009900">+TARGET_FPU = "soft"</font>
<font color="#009900">+TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s"</font>
<font color="#009900">+FEED_ARCH = "armv6"</font>
<font color="#009900">+PACKAGE_ARCH = "armv6"</font>
<font color="#009900">+ </font>
<font color="#009900">+</font>
<font color="#009900">+IMAGE_FSTYPES ?= "tar.gz cpio.gz"</font>
<font color="#009900">+ </font>
<font color="#009900">+PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser"</font>
<font color="#009900">+ </font>
<font color="#009900">+MACHINE_FEATURES = "kernel26 touchscreen screen keyboard"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/gnash/gnash.inc        66c805eb5cfd0e18a89770e022d4420ee9013566</font>
<font color="#009900">+++ packages/gnash/gnash.inc        66c805eb5cfd0e18a89770e022d4420ee9013566</font>
<font color="#0000FF">@@ -0,0 +1,38 @@</font>
<font color="#009900">+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"</font>
<font color="#009900">+HOMEPAGE = "http://www.gnu.org/software/gnash"</font>
<font color="#009900">+LICENSE = "GPL-2"</font>
<font color="#009900">+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"</font>
<font color="#009900">+PR = "r1"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \</font>
<font color="#009900">+          "</font>
<font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+EXTRA_OECONF = "--enable-gui=gtk \</font>
<font color="#009900">+                --enable-renderer=cairo \</font>
<font color="#009900">+                --enable-media=none \</font>
<font color="#009900">+                --disable-klash \</font>
<font color="#009900">+                --enable-z \</font>
<font color="#009900">+                --enable-jpeg \</font>
<font color="#009900">+                --disable-glext \</font>
<font color="#009900">+                --enable-Xft \</font>
<font color="#009900">+                --enable-expat \</font>
<font color="#009900">+                --enable-mad \</font>
<font color="#009900">+                --enable-cairo \</font>
<font color="#009900">+                --disable-plugin \</font>
<font color="#009900">+                --disable-cygnal \</font>
<font color="#009900">+                --with-top-level=${STAGING_DIR_HOST}/usr \</font>
<font color="#009900">+                "</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"</font>
<font color="#009900">+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"</font>
<font color="#009900">+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"</font>
<font color="#009900">+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"</font>
<font color="#009900">+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"</font>
<font color="#009900">+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"</font>
<font color="#009900">+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"</font>
<font color="#009900">+</font>
<font color="#009900">+PARALLEL_MAKE = ""</font>
============================================================
<font color="#FF6600">--- packages/gnash/gnash_0.8.1.bb        50014de2c3904a6950c775be0eda4815399cb573</font>
<font color="#009900">+++ packages/gnash/gnash_0.8.1.bb        50014de2c3904a6950c775be0eda4815399cb573</font>
<font color="#0000FF">@@ -0,0 +1 @@</font>
<font color="#009900">+require gnash.inc</font>
============================================================
<font color="#FF6600">--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch        f7d05fac53703548b59b528f752366847140744e</font>
<font color="#009900">+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch        f7d05fac53703548b59b528f752366847140744e</font>
<font color="#0000FF">@@ -0,0 +1,128 @@</font>
<font color="#009900">+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl</font>
<font color="#009900">+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl        2007-12-28 18:49:44.000000000 +0100</font>
<font color="#009900">++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl        2008-01-04 19:01:35.000000000 +0100</font>
<font color="#009900">+@@ -35,6 +35,7 @@</font>
<font color="#009900">+ modified (Jul 2005) by Jaroslaw Zachwieja &lt;grok\@filippa.org.uk&gt;</font>
<font color="#009900">+ modified (Dec 2005) by David Pollard &lt;david dot pollard\@optusnet.com.au&gt;</font>
<font color="#009900">+ modified (Jul 2007) by Maciek Kaliszewski &lt;mkalkal\@interia.pl&gt;</font>
<font color="#009900">++modified (Jan 2008) by Gernot Hillier &lt;gernot\@hillier.de&gt; (added Openstreetmap support)</font>
<font color="#009900">+ Version svn-$Version</font>
<font color="#009900">+ ";</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -176,6 +177,25 @@</font>
<font color="#009900">+       15812 =&gt; 3 ,</font>
<font color="#009900">+       7906  =&gt; 2,</font>
<font color="#009900">+       3953 =&gt; 1</font>
<font color="#009900">++    },</font>
<font color="#009900">++    openstreetmap_tah =&gt; {</font>
<font color="#009900">++      256*576000 =&gt;  1,</font>
<font color="#009900">++      128*576000 =&gt;  2,</font>
<font color="#009900">++       64*576000 =&gt;  3,</font>
<font color="#009900">++       32*576000 =&gt;  4,</font>
<font color="#009900">++       16*576000 =&gt;  5,</font>
<font color="#009900">++        8*576000 =&gt;  6,</font>
<font color="#009900">++        4*576000 =&gt;  7,</font>
<font color="#009900">++        2*576000 =&gt;  8,</font>
<font color="#009900">++          576000 =&gt;  9,</font>
<font color="#009900">++          288000 =&gt; 10,</font>
<font color="#009900">++          144000 =&gt; 11,</font>
<font color="#009900">++           72000 =&gt; 12,</font>
<font color="#009900">++           36000 =&gt; 13,</font>
<font color="#009900">++           18000 =&gt; 14,</font>
<font color="#009900">++           9000  =&gt; 15,</font>
<font color="#009900">++            4500 =&gt; 16,</font>
<font color="#009900">++            2250 =&gt; 17</font>
<font color="#009900">+     }</font>
<font color="#009900">+ };</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -331,7 +351,6 @@</font>
<font color="#009900">+     exit();</font>
<font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">+-</font>
<font color="#009900">+ # Verify that we have the options that we need </font>
<font color="#009900">+ pod2usage(1) if (&amp;error_check);</font>
<font color="#009900">+ </font>
<font color="#009900">+@@ -417,6 +436,13 @@</font>
<font color="#009900">+     print "+-----------------------------------------------------------+\n";</font>
<font color="#009900">+     print "| Landsat Maps are Copyright, .....   |\n";</font>
<font color="#009900">+     print "| They are free for non commercial use.                     |\n";</font>
<font color="#009900">++}elsif ( $mapserver eq 'openstreetmap_tah' ){</font>
<font color="#009900">++    print "+-----------------------------------------------------------+\n";</font>
<font color="#009900">++    print "| OpenStreetmap Maps are Copyright by the OpenStreetmap     |\n";</font>
<font color="#009900">++    print "| project.                                                  |\n";</font>
<font color="#009900">++    print "| They are free for use under the terms of the              |\n";</font>
<font color="#009900">++    print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";</font>
<font color="#009900">++    print "| license. See http://www.openstreetmap.org for details.    |\n";</font>
<font color="#009900">+ } elsif ( ! $force) {</font>
<font color="#009900">+     print "You are violating the map servers copyright!\n";</font>
<font color="#009900">+     print "Are you sure you want to continue? [y|n] ";</font>
<font color="#009900">+@@ -700,6 +726,11 @@</font>
<font color="#009900">+     {</font>
<font color="#009900">+         ($url,$mapscale)=googlemap_url($lati,$long,$scale);</font>
<font color="#009900">+     } </font>
<font color="#009900">++    elsif ( $mapserver eq 'openstreetmap_tah') </font>
<font color="#009900">++    {        </font>
<font color="#009900">++        $filename=~s/\.gif/.png/;</font>
<font color="#009900">++        ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);</font>
<font color="#009900">++    } </font>
<font color="#009900">+     else </font>
<font color="#009900">+     {</font>
<font color="#009900">+         print "Unknown map sever :", $mapserver, "\n"; </font>
<font color="#009900">+@@ -935,6 +966,37 @@</font>
<font color="#009900">+     return ($url,$mapscale);</font>
<font color="#009900">+ }</font>
<font color="#009900">+ </font>
<font color="#009900">++#############################################################################</font>
<font color="#009900">++sub openstreetmap_tah_url($$$){</font>
<font color="#009900">++    my $lati = shift;</font>
<font color="#009900">++    my $long = shift;</font>
<font color="#009900">++    my $scale = shift;</font>
<font color="#009900">++</font>
<font color="#009900">++    my $mapscale = $scale;</font>
<font color="#009900">++    my $zoom = undef;</font>
<font color="#009900">++    for my $s ( sort keys %{$Scale2Zoom-&gt;{openstreetmap_tah}} ) {</font>
<font color="#009900">++        next unless $s == $scale;</font>
<font color="#009900">++        $zoom = $Scale2Zoom-&gt;{openstreetmap_tah}-&gt;{$s};</font>
<font color="#009900">++        $mapscale = $s;</font>
<font color="#009900">++        last;</font>
<font color="#009900">++    }</font>
<font color="#009900">++</font>
<font color="#009900">++    unless ( $zoom ) {</font>
<font color="#009900">++        print "Error calculating Zoomlevel for Scale: $scale\n";</font>
<font color="#009900">++        return (undef,undef);</font>
<font color="#009900">++    }</font>
<font color="#009900">++</font>
<font color="#009900">++    if ($debug) {</font>
<font color="#009900">++        print "\n";</font>
<font color="#009900">++        print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";</font>
<font color="#009900">++        print "lat: $lati\n";</font>
<font color="#009900">++        print "lon: $long\n";</font>
<font color="#009900">++    }</font>
<font color="#009900">++</font>
<font color="#009900">++    my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&amp;long=$long&amp;z=$zoom&amp;w=1280&amp;h=1024&amp;format=png";</font>
<font color="#009900">++#   print "$url\n";</font>
<font color="#009900">++    return ($url,$mapscale);</font>
<font color="#009900">++}</font>
<font color="#009900">+ </font>
<font color="#009900">+ #############################################################################</font>
<font color="#009900">+ sub eniro_url($$$){</font>
<font color="#009900">+@@ -2284,7 +2346,7 @@</font>
<font color="#009900">+ =item B&lt;--mapserver &lt;MAPSERVER&gt;&gt;</font>
<font color="#009900">+ </font>
<font color="#009900">+ Mapserver to download from. Default: 'expedia'.</font>
<font color="#009900">+-Currently can use: landsat or expedia.</font>
<font color="#009900">++Currently usable: landsat, expedia or openstreetmap_tah.</font>
<font color="#009900">+ </font>
<font color="#009900">+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, </font>
<font color="#009900">+ but they are !!!NOT!!!! in the right scale.</font>
<font color="#009900">+@@ -2294,6 +2356,9 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ landsat covers the whole world with satelite Photos</font>
<font color="#009900">+ </font>
<font color="#009900">++openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see </font>
<font color="#009900">++                   http://www.openstreetmap.org and http://tah.openstreetmap.org.</font>
<font color="#009900">++</font>
<font color="#009900">+ gov_au is for Australia</font>
<font color="#009900">+ </font>
<font color="#009900">+ incrementp for japanese Maps</font>
============================================================
<font color="#FF6600">--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch        47e014d89d9957ea970e01aced2dc553d3722236</font>
<font color="#009900">+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch        47e014d89d9957ea970e01aced2dc553d3722236</font>
<font color="#0000FF">@@ -0,0 +1,18 @@</font>
<font color="#009900">+Index: src/map_handler.c</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- aa/src/map_handler.c        (Revision 1699)</font>
<font color="#009900">++++ aa/src/map_handler.c        (Revision 1700)</font>
<font color="#009900">+@@ -660,9 +660,12 @@</font>
<font color="#009900">+   if (maploaded)</font>
<font color="#009900">+     gdk_pixbuf_unref (image);</font>
<font color="#009900">+ </font>
<font color="#009900">++#ifdef MAPNIK</font>
<font color="#009900">+   if ( !strcmp (filename,"mapnik") ) {</font>
<font color="#009900">+           limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);</font>
<font color="#009900">+-  } else {</font>
<font color="#009900">++  } else </font>
<font color="#009900">++#endif</font>
<font color="#009900">++  {</font>
<font color="#009900">+           limage = gdk_pixbuf_new_from_file (filename, NULL);</font>
<font color="#009900">+           if (limage == NULL)</font>
<font color="#009900">+             {</font>
============================================================
<font color="#FF6600">--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch        b9c3b9e051b269ab097c36a70c58b6d218e0d55d</font>
<font color="#009900">+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch        b9c3b9e051b269ab097c36a70c58b6d218e0d55d</font>
<font color="#0000FF">@@ -0,0 +1,96 @@</font>
<font color="#009900">+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am</font>
<font color="#009900">+--- gpsdrive-2.10pre4.orig/src/Makefile.am        2007-12-28 18:49:44.000000000 +0100</font>
<font color="#009900">++++ gpsdrive-2.10pre4/src/Makefile.am        2007-12-28 18:50:29.000000000 +0100</font>
<font color="#009900">+@@ -14,14 +14,14 @@</font>
<font color="#009900">+         -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \</font>
<font color="#009900">+         -DLIBDIR=\"${libdir}\" \</font>
<font color="#009900">+         -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \</font>
<font color="#009900">+-        ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\</font>
<font color="#009900">+-        -I/usr/include/ \</font>
<font color="#009900">+-        -I/usr/local/include \</font>
<font color="#009900">+-        -I/opt/boost_1_35/include/boost-1_35 \</font>
<font color="#009900">+-        -I/usr/local/include/freetype2 \</font>
<font color="#009900">+-        -I/usr/include/freetype2 \</font>
<font color="#009900">++        ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}</font>
<font color="#009900">++#        -I/usr/include/ \</font>
<font color="#009900">++#        -I/usr/local/include \</font>
<font color="#009900">++#        -I/opt/boost_1_35/include/boost-1_35 \</font>
<font color="#009900">++#        -I/usr/local/include/freetype2 \</font>
<font color="#009900">++#        -I/usr/include/freetype2 \</font>
<font color="#009900">+         -I. \</font>
<font color="#009900">+-        -L/usr/local/lib</font>
<font color="#009900">++#        -L/usr/local/lib</font>
<font color="#009900">+ </font>
<font color="#009900">+ #        -I/usr/include/dbus-1.0/ </font>
<font color="#009900">+ </font>
<font color="#009900">+diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure</font>
<font color="#009900">+--- gpsdrive-2.10pre4.orig/configure        2007-12-28 18:49:44.000000000 +0100</font>
<font color="#009900">++++ gpsdrive-2.10pre4/configure        2008-01-06 14:49:11.000000000 +0100</font>
<font color="#009900">+@@ -35950,10 +35950,13 @@</font>
<font color="#009900">+ #  Yep, its ebil, but I does not know better...</font>
<font color="#009900">+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`</font>
<font color="#009900">+ # default on debian should be: /usr/share/perl5/</font>
<font color="#009900">+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`</font>
<font color="#009900">++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`</font>
<font color="#009900">+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`</font>
<font color="#009900">+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`</font>
<font color="#009900">++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`</font>
<font color="#009900">+ </font>
<font color="#009900">++# hard code path for OpenEmbedded environment as I don't know a way</font>
<font color="#009900">++# to detect it automatically</font>
<font color="#009900">++PERL_PACKAGE_DIR="/usr/share/perl5"</font>
<font color="#009900">+ </font>
<font color="#009900">+ ac_perl_modules="File::Basename "</font>
<font color="#009900">+ # Make sure we have perl</font>
<font color="#009900">+@@ -37840,11 +37843,11 @@</font>
<font color="#009900">+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore')</font>
<font color="#009900">+ #fi</font>
<font color="#009900">+ </font>
<font color="#009900">+-if test -f /usr/include/mysql/mysql.h; then</font>
<font color="#009900">+- CFLAGS="$CFLAGS -I/usr/include/mysql"</font>
<font color="#009900">+-else</font>
<font color="#009900">+- CFLAGS="$CFLAGS -Imysql"</font>
<font color="#009900">+-fi</font>
<font color="#009900">++#if test -f /usr/include/mysql/mysql.h; then</font>
<font color="#009900">++# CFLAGS="$CFLAGS -I/usr/include/mysql"</font>
<font color="#009900">++#else</font>
<font color="#009900">++# CFLAGS="$CFLAGS -Imysql"</font>
<font color="#009900">++#fi</font>
<font color="#009900">+ </font>
<font color="#009900">+ CFLAGS="$CFLAGS $OPT_CFLAGS"</font>
<font color="#009900">+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"</font>
<font color="#009900">+diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac</font>
<font color="#009900">+--- gpsdrive-2.10pre4.orig/configure.ac        2007-12-28 18:49:44.000000000 +0100</font>
<font color="#009900">++++ gpsdrive-2.10pre4/configure.ac        2008-01-06 14:48:50.000000000 +0100</font>
<font color="#009900">+@@ -662,9 +662,12 @@</font>
<font color="#009900">+ #  Yep, its ebil, but I does not know better...</font>
<font color="#009900">+ #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"`</font>
<font color="#009900">+ # default on debian should be: /usr/share/perl5/</font>
<font color="#009900">+-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`</font>
<font color="#009900">++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"`</font>
<font color="#009900">+ #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"`</font>
<font color="#009900">+-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`</font>
<font color="#009900">++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"`</font>
<font color="#009900">++# hard code path for OpenEmbedded environment as I don't know a way</font>
<font color="#009900">++# to detect it automatically</font>
<font color="#009900">++PERL_PACKAGE_DIR="/usr/share/perl5"</font>
<font color="#009900">+ AC_SUBST(PERL_PACKAGE_DIR)</font>
<font color="#009900">+ </font>
<font color="#009900">+ AC_PROG_PERL_MODULES(File::Basename , ,  AC_MSG_ERROR(Need Perl module File::Basename))</font>
<font color="#009900">+@@ -719,11 +722,11 @@</font>
<font color="#009900">+ #    AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') </font>
<font color="#009900">+ #fi</font>
<font color="#009900">+ </font>
<font color="#009900">+-if test -f /usr/include/mysql/mysql.h; then</font>
<font color="#009900">+- CFLAGS="$CFLAGS -I/usr/include/mysql"</font>
<font color="#009900">+-else</font>
<font color="#009900">+- CFLAGS="$CFLAGS -Imysql"</font>
<font color="#009900">+-fi</font>
<font color="#009900">++#if test -f /usr/include/mysql/mysql.h; then</font>
<font color="#009900">++# CFLAGS="$CFLAGS -I/usr/include/mysql"</font>
<font color="#009900">++#else</font>
<font color="#009900">++# CFLAGS="$CFLAGS -Imysql"</font>
<font color="#009900">++#fi</font>
<font color="#009900">+ </font>
<font color="#009900">+ CFLAGS="$CFLAGS $OPT_CFLAGS"</font>
<font color="#009900">+ CXXFLAGS="$CXXFLAGS $OPT_CFLAGS"</font>
============================================================
<font color="#FF6600">--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop        6ef8f7d5db97dd3541a0bfe44325bd07296baf1b</font>
<font color="#009900">+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop        6ef8f7d5db97dd3541a0bfe44325bd07296baf1b</font>
<font color="#0000FF">@@ -0,0 +1,10 @@</font>
<font color="#009900">+[Desktop Entry]</font>
<font color="#009900">+Encoding=UTF-8</font>
<font color="#009900">+Name=GPSDrive</font>
<font color="#009900">+Comment=GPS map software</font>
<font color="#009900">+Exec=gpsdrive -M pda -1</font>
<font color="#009900">+Icon=gpsicon</font>
<font color="#009900">+Terminal=false</font>
<font color="#009900">+Type=Application</font>
<font color="#009900">+Categories=Graphics;Network;Geography;Application;Other</font>
<font color="#009900">+StartupNotify=true</font>
============================================================
<font color="#FF6600">--- packages/gpsdrive/gpsdrive_2.10pre4.bb        9e4cea32b63aa093d54c9b1039cfa8dd87790322</font>
<font color="#009900">+++ packages/gpsdrive/gpsdrive_2.10pre4.bb        9e4cea32b63aa093d54c9b1039cfa8dd87790322</font>
<font color="#0000FF">@@ -0,0 +1,33 @@</font>
<font color="#009900">+require gpsdrive.inc</font>
<font color="#009900">+</font>
<font color="#009900">+DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"</font>
<font color="#009900">+RDEPENDS_${PN} += "libwww-perl"</font>
<font color="#009900">+</font>
<font color="#009900">+PR = "r2"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \</font>
<font color="#009900">+           file://gpsdrive_2.10pre4.desktop \</font>
<font color="#009900">+           file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \</font>
<font color="#009900">+           file://gpsdrive-ifdef-mapnik.patch;patch=1 \</font>
<font color="#009900">+           file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"</font>
<font color="#009900">+</font>
<font color="#009900">+do_install_append () {</font>
<font color="#009900">+        mkdir -p  ${D}${datadir}/applications</font>
<font color="#009900">+        install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop</font>
<font color="#009900">+        mkdir -p ${D}${datadir}/pixmaps</font>
<font color="#009900">+        cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps</font>
<font color="#009900">+        # remove stuff we don't want to package</font>
<font color="#009900">+        rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one</font>
<font color="#009900">+        rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux</font>
<font color="#009900">+        rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons"</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml"</font>
<font color="#009900">+FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi"</font>
<font color="#009900">+FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils"</font>
<font color="#009900">+FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"</font>
<font color="#009900">+FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"</font>
<font color="#009900">+FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"</font>
<font color="#009900">+FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"</font>
============================================================
<font color="#FF6600">--- packages/images/openmoko-qtopia-image.bb        85858c01bf04fa98f230120b45029c9ffc41a05c</font>
<font color="#009900">+++ packages/images/openmoko-qtopia-image.bb        85858c01bf04fa98f230120b45029c9ffc41a05c</font>
<font color="#0000FF">@@ -0,0 +1,22 @@</font>
<font color="#009900">+#------------------------------------------------------</font>
<font color="#009900">+# OpenMoko Qtopia Image Recipe</font>
<font color="#009900">+#------------------------------------------------------</font>
<font color="#009900">+</font>
<font color="#009900">+require openmoko-minimal-image.bb</font>
<font color="#009900">+</font>
<font color="#009900">+export IMAGE_BASENAME = "${PN}"</font>
<font color="#009900">+</font>
<font color="#009900">+IMAGE_INSTALL += "\</font>
<font color="#009900">+  alsa-state \</font>
<font color="#009900">+  bluez-hcidump \</font>
<font color="#009900">+  bluez-utils \</font>
<font color="#009900">+  task-openmoko-qtopia \</font>
<font color="#009900">+"</font>
<font color="#009900">+</font>
<font color="#009900">+DEPENDS += "\</font>
<font color="#009900">+  task-openmoko-qtopia \</font>
<font color="#009900">+"</font>
<font color="#009900">+</font>
<font color="#009900">+RDEPENDS = "${PACKAGE_INSTALL}"</font>
<font color="#009900">+</font>
<font color="#009900">+LICENSE = MIT</font>
============================================================
<font color="#FF6600">--- packages/images/openmoko-qtopia-x11-image.bb        fd1679f4eb35ac9f3302c6a11f82e975921a169f</font>
<font color="#009900">+++ packages/images/openmoko-qtopia-x11-image.bb        fd1679f4eb35ac9f3302c6a11f82e975921a169f</font>
<font color="#0000FF">@@ -0,0 +1,7 @@</font>
<font color="#009900">+#------------------------------------------------------</font>
<font color="#009900">+# OpenMoko Qtopia/X11 Image Recipe</font>
<font color="#009900">+#------------------------------------------------------</font>
<font color="#009900">+</font>
<font color="#009900">+require openmoko-minimal-image.bb</font>
<font color="#009900">+</font>
<font color="#009900">+IMAGE_INSTALL += "task-openmoko-qtopia-x11"</font>
============================================================
<font color="#FF6600">--- packages/linux/linux-kaiser_2.6.24+git.bb        f35b44d6d3ebfde341c328a3b1e8362f8dec89de</font>
<font color="#009900">+++ packages/linux/linux-kaiser_2.6.24+git.bb        f35b44d6d3ebfde341c328a3b1e8362f8dec89de</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+require linux.inc</font>
<font color="#009900">+</font>
<font color="#009900">+PV = "2.6.24+git${SRCREV}"</font>
<font color="#009900">+</font>
<font color="#009900">+COMPATIBLE_MACHINE = "htckaiser"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \</font>
<font color="#009900">+           http://baliniak.pl/android/kernel.diff;patch=1"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/git"</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure_prepend() {</font>
<font color="#009900">+        cp .config ../defconfig</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/multitap-pad/files/80multitappad        b613cc7c89d800c205b89dd7013c4b3ba309b319</font>
<font color="#009900">+++ packages/multitap-pad/files/80multitappad        b613cc7c89d800c205b89dd7013c4b3ba309b319</font>
<font color="#0000FF">@@ -0,0 +1,20 @@</font>
<font color="#009900">+#!/bin/sh</font>
<font color="#009900">+</font>
<font color="#009900">+CMD=""</font>
<font color="#009900">+</font>
<font color="#009900">+if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then</font>
<font color="#009900">+    if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then</font>
<font color="#009900">+        CMD="multitap-pad -d -o landscape"</font>
<font color="#009900">+    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then</font>
<font color="#009900">+        CMD="multitap-pad -d -o portrait"</font>
<font color="#009900">+    fi</font>
<font color="#009900">+else</font>
<font color="#009900">+    CMD="multitap-pad -d"</font>
<font color="#009900">+fi</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+# Delay to make sure the window manager is active</font>
<font color="#009900">+</font>
<font color="#009900">+if [ "$CMD" ]; then</font>
<font color="#009900">+    (sleep 2 &amp;&amp; $CMD) &amp;</font>
<font color="#009900">+fi</font>
============================================================
<font color="#FF6600">--- packages/multitap-pad/multitap-pad_svn.bb        8f2b626f58690dd52e509cacab5977c5f52270e2</font>
<font color="#009900">+++ packages/multitap-pad/multitap-pad_svn.bb        8f2b626f58690dd52e509cacab5977c5f52270e2</font>
<font color="#0000FF">@@ -0,0 +1,47 @@</font>
<font color="#009900">+DESCRIPTION = "Multi-tap input method for GTK"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+DEPENDS = "libfakekey gtk+ matchbox-panel-2"</font>
<font color="#009900">+RCONFLICTS = matchbox-keyboard-inputmethod</font>
<font color="#009900">+SECTION = "x11"</font>
<font color="#009900">+PV = "0.0+svnr${SRCREV}"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \</font>
<font color="#009900">+        file://80multitappad"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit autotools pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/${PN}"</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN} = "${bindir}/* \</font>
<font color="#009900">+               ${libdir} \</font>
<font color="#009900">+               ${sysconfdir} \</font>
<font color="#009900">+               ${datadir}"</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \</font>
<font color="#009900">+                     ${libdir}/matchbox-panel/.debug"</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \</font>
<font color="#009900">+                     ${libdir}/gtk-2.0/2.10.0/immodules/*.la \</font>
<font color="#009900">+                     ${libdir}/matchbox-panel/*.a \</font>
<font color="#009900">+                     ${libdir}/matchbox-panel/*.la"</font>
<font color="#009900">+</font>
<font color="#009900">+do_install_append () {</font>
<font color="#009900">+        install -d ${D}/${sysconfdir}/X11/Xsession.d/</font>
<font color="#009900">+        install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+pkg_postinst_multitap-pad () {</font>
<font color="#009900">+if [ "x$D" != "x" ]; then</font>
<font color="#009900">+  exit 1</font>
<font color="#009900">+fi</font>
<font color="#009900">+</font>
<font color="#009900">+gtk-query-immodules-2.0 &gt; /etc/gtk-2.0/gtk.immodules</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+pkg_postrm_multitap-pad () {</font>
<font color="#009900">+if [ "x$D" != "x" ]; then</font>
<font color="#009900">+  exit 1</font>
<font color="#009900">+fi</font>
<font color="#009900">+</font>
<font color="#009900">+gtk-query-immodules-2.0 &gt; /etc/gtk-2.0/gtk.immodules</font>
<font color="#009900">+}</font>
============================================================
<font color="#FF6600">--- packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb        4e424e0c74d42282c80ac2738e417b8dc7014e80</font>
<font color="#009900">+++ packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb        4e424e0c74d42282c80ac2738e417b8dc7014e80</font>
<font color="#0000FF">@@ -0,0 +1,7 @@</font>
<font color="#009900">+DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel"</font>
<font color="#009900">+DEPENDS = "libnotify"</font>
<font color="#009900">+RDEPENDS = "openmoko-dialer2"</font>
<font color="#009900">+PV = "0.0.0+svn${SVNREV}"</font>
<font color="#009900">+PR = "r0"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit openmoko-panel-plugin</font>
============================================================
<font color="#FF6600">--- packages/openmoko-tools/pty-forward-native.bb        17c7e0ad0fe30607be9326cec651ccf4ee86b4b8</font>
<font color="#009900">+++ packages/openmoko-tools/pty-forward-native.bb        17c7e0ad0fe30607be9326cec651ccf4ee86b4b8</font>
<font color="#0000FF">@@ -0,0 +1,24 @@</font>
<font color="#009900">+LICENSE="GPL"</font>
<font color="#009900">+SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"</font>
<font color="#009900">+S = "${WORKDIR}/serial_forward"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit native</font>
<font color="#009900">+</font>
<font color="#009900">+do_compile() {</font>
<font color="#009900">+    cd ${S}</font>
<font color="#009900">+    oe_runmake</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_stage() {</font>
<font color="#009900">+    :</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_deploy() {</font>
<font color="#009900">+    install -d ${DEPLOY_DIR_IMAGE}</font>
<font color="#009900">+    install -m 0755 ${S}/pty_forward ${DEPLOY_DIR_IMAGE}/pty-forward</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+addtask deploy before do_package after do_install</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/openmoko-tools/serial-forward.bb        32434a87a886be4c262ea2f13af0375bae297e48</font>
<font color="#009900">+++ packages/openmoko-tools/serial-forward.bb        32434a87a886be4c262ea2f13af0375bae297e48</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+LICENSE="GPL"</font>
<font color="#009900">+SUMMARY="Forward a serial using TCP/IP"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http"</font>
<font color="#009900">+S="${WORKDIR}/serial_forward"</font>
<font color="#009900">+</font>
<font color="#009900">+do_compile() {</font>
<font color="#009900">+    cd ${S}</font>
<font color="#009900">+    oe_runmake</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_install() {</font>
<font color="#009900">+    install -d ${D}/${bindir}</font>
<font color="#009900">+    install -m 0755 ${S}/forward ${D}/${bindir}/${PN}</font>
<font color="#009900">+}</font>
============================================================
<font color="#FF6600">--- packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch        43b8c9925bee93d59e2aefd4c7eec71d0b796197</font>
<font color="#009900">+++ packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch        43b8c9925bee93d59e2aefd4c7eec71d0b796197</font>
<font color="#0000FF">@@ -0,0 +1,13 @@</font>
<font color="#009900">+Index: openmoko-dialer2/src/phone-kit/moko-notify.c</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig        2008-02-14 17:47:23.000000000 +0800</font>
<font color="#009900">++++ openmoko-dialer2/src/phone-kit/moko-notify.c        2008-02-14 17:48:19.000000000 +0800</font>
<font color="#009900">+@@ -38,7 +38,7 @@</font>
<font color="#009900">+ </font>
<font color="#009900">+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"</font>
<font color="#009900">+ #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"</font>
<font color="#009900">+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"</font>
<font color="#009900">++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"</font>
<font color="#009900">+ </font>
<font color="#009900">+ struct _MokoNotifyPrivate</font>
<font color="#009900">+ {</font>
============================================================
<font color="#FF6600">--- packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch        d1c708f7f915fa250e20a84fa9d4512440442a4f</font>
<font color="#009900">+++ packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch        d1c708f7f915fa250e20a84fa9d4512440442a4f</font>
<font color="#0000FF">@@ -0,0 +1,15 @@</font>
<font color="#009900">+Index: openmoko-dialer2/src/phone-kit/moko-notify.c</font>
<font color="#009900">+===================================================================</font>
<font color="#009900">+--- openmoko-dialer2/src/phone-kit/moko-notify.c        (revision 4051)</font>
<font color="#009900">++++ openmoko-dialer2/src/phone-kit/moko-notify.c        (working copy)</font>
<font color="#009900">+@@ -37,8 +37,8 @@</font>
<font color="#009900">+         MOKO_TYPE_NOTIFY, MokoNotifyPrivate))</font>
<font color="#009900">+ </font>
<font color="#009900">+ #define DEFAULT_RINGTONE "/default_ringtone.ogg"</font>
<font color="#009900">+-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl"</font>
<font color="#009900">+-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator"</font>
<font color="#009900">++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl"</font>
<font color="#009900">++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator"</font>
<font color="#009900">+ </font>
<font color="#009900">+ struct _MokoNotifyPrivate</font>
<font color="#009900">+ {</font>
============================================================
<font color="#FF6600">--- packages/perl/libwww-perl-native_5.808.bb        66723b8808de2c5758435a88b9640bc8777d89be</font>
<font color="#009900">+++ packages/perl/libwww-perl-native_5.808.bb        66723b8808de2c5758435a88b9640bc8777d89be</font>
<font color="#0000FF">@@ -0,0 +1,5 @@</font>
<font color="#009900">+SECTION = "libs"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit native</font>
<font color="#009900">+</font>
<font color="#009900">+require libwww-perl_${PV}.bb</font>
============================================================
<font color="#FF6600">--- packages/perl/libwww-perl_5.808.bb        c76a162b7e6844022d4b9826386bfeed71c6328e</font>
<font color="#009900">+++ packages/perl/libwww-perl_5.808.bb        c76a162b7e6844022d4b9826386bfeed71c6328e</font>
<font color="#0000FF">@@ -0,0 +1,12 @@</font>
<font color="#009900">+DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web"</font>
<font color="#009900">+SECTION = "libs"</font>
<font color="#009900">+LICENSE = "Artistic"</font>
<font color="#009900">+DEPENDS = "liburi-perl-native"</font>
<font color="#009900">+RDEPENDS = "liburi-perl"</font>
<font color="#009900">+PR = "r1"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/libwww-perl-${PV}"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit cpan</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/files/fic-gta01/device-conf        33f77c8d4d680c25796f493f054c0e6581439476</font>
<font color="#009900">+++ packages/qtopia-phone/files/fic-gta01/device-conf        33f77c8d4d680c25796f493f054c0e6581439476</font>
<font color="#0000FF">@@ -0,0 +1,46 @@</font>
<font color="#009900">+-arch OE_QT_ARCH</font>
<font color="#009900">+-xplatform OE_QT_XPLATFORM</font>
<font color="#009900">+-verbose</font>
<font color="#009900">+-qtopiamedia</font>
<font color="#009900">+-mediaengines gstreamer</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-linuxtp"</font>
<font color="#009900">+-extra-qtopiacore-config "-depths 16"</font>
<font color="#009900">+-no-infrared</font>
<font color="#009900">+-dbus</font>
<font color="#009900">+-dbuspath OE_QT_DBUSPATH</font>
<font color="#009900">+-iconsize 22</font>
<font color="#009900">+-displaysize 480x640</font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" </font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"</font>
<font color="#009900">+-extra-qtopiacore-config "-fast" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-accessibility" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-cups"</font>
<font color="#009900">+-extra-qtopiacore-config "-no-freetype" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake demos" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake examples"</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-gfx-linuxfb" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libjpeg" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libmng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libpng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-tslib" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-zlib" </font>
<font color="#009900">+-extra-qtopiacore-config "-release" </font>
<font color="#009900">+-extra-qtopiacore-config "OE_QT_ENDIAN"</font>
<font color="#009900">+-extra-qt-config "-nomake examples" </font>
<font color="#009900">+-extra-qt-config "-nomake demos" </font>
<font color="#009900">+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75</font>
<font color="#009900">+-image OE_QT_RPREFIX</font>
<font color="#009900">+-launch-method quicklaunch</font>
<font color="#009900">+-force-quicklaunch</font>
<font color="#009900">+-no-clean </font>
<font color="#009900">+-no-drm</font>
<font color="#009900">+-no-qvfb</font>
<font color="#009900">+-no-vpn</font>
<font color="#009900">+-no-sxe</font>
<font color="#009900">+-no-silent</font>
<font color="#009900">+-prefix OE_QT_RPREFIX</font>
<font color="#009900">+-reduce-exports=yes</font>
<font color="#009900">+-release</font>
<font color="#009900">+-confirm-license</font>
<font color="#009900">+OE_QT_EXTRACONFIG</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/files/fic-gta01/device-conf.old        7cf2ef99b35315048f286f7f0027ed5c6d609862</font>
<font color="#009900">+++ packages/qtopia-phone/files/fic-gta01/device-conf.old        7cf2ef99b35315048f286f7f0027ed5c6d609862</font>
<font color="#0000FF">@@ -0,0 +1,48 @@</font>
<font color="#009900">+-arch OE_QT_ARCH</font>
<font color="#009900">+-xplatform OE_QT_XPLATFORM</font>
<font color="#009900">+-verbose</font>
<font color="#009900">+-qtopiamedia</font>
<font color="#009900">+-mediaengines gstreamer</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-linuxtp"</font>
<font color="#009900">+-extra-qtopiacore-config "-depths OE_QT_DEPTHS"</font>
<font color="#009900">+-no-infrared</font>
<font color="#009900">+-dbus</font>
<font color="#009900">+-dbuspath OE_QT_DBUSPATH</font>
<font color="#009900">+-iconsize OT_QT_ICONSIZE</font>
<font color="#009900">+-displaysize OE_QT_DISPLAYSIZE</font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" </font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"</font>
<font color="#009900">+-extra-qtopiacore-config "-fast" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-accessibility" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-cups"</font>
<font color="#009900">+-extra-qtopiacore-config "-no-freetype" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake demos" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake examples"</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-gfx-linuxfb" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libjpeg" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libmng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libpng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-tslib" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-zlib" </font>
<font color="#009900">+-extra-qtopiacore-config "-release" </font>
<font color="#009900">+#-extra-qtopiacore-config "-LOE_QT_LIBDIR" </font>
<font color="#009900">+#-extra-qtopiacore-config "-IOE_QT_INCDIR" </font>
<font color="#009900">+-extra-qtopiacore-config "OE_QT_ENDIAN"</font>
<font color="#009900">+-extra-qt-config "-nomake examples" </font>
<font color="#009900">+-extra-qt-config "-nomake demos" </font>
<font color="#009900">+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75</font>
<font color="#009900">+-image OE_QT_RPREFEX</font>
<font color="#009900">+-launch-method quicklaunch</font>
<font color="#009900">+-force-quicklaunch</font>
<font color="#009900">+-no-clean </font>
<font color="#009900">+-no-drm</font>
<font color="#009900">+-no-qvfb</font>
<font color="#009900">+-no-vpn</font>
<font color="#009900">+-no-sxe</font>
<font color="#009900">+-no-silent</font>
<font color="#009900">+-prefix OE_QT_RPREFIX</font>
<font color="#009900">+-reduce-exports=yes</font>
<font color="#009900">+-release</font>
<font color="#009900">+-confirm-license</font>
<font color="#009900">+OE_QT_EXTRACONFIG</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/files/fic-gta01/qplatformdefs.h        4548b7c6203d64cb5ba410f46ff363427f46e675</font>
<font color="#009900">+++ packages/qtopia-phone/files/fic-gta01/qplatformdefs.h        4548b7c6203d64cb5ba410f46ff363427f46e675</font>
<font color="#0000FF">@@ -0,0 +1,146 @@</font>
<font color="#009900">+/****************************************************************************</font>
<font color="#009900">+**</font>
<font color="#009900">+** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.</font>
<font color="#009900">+**</font>
<font color="#009900">+** This file is part of the Opensource Edition of the Qtopia Toolkit.</font>
<font color="#009900">+**</font>
<font color="#009900">+** This software is licensed under the terms of the GNU General Public</font>
<font color="#009900">+** License (GPL) version 2.</font>
<font color="#009900">+**</font>
<font color="#009900">+** See http://www.trolltech.com/gpl/ for GPL licensing information.</font>
<font color="#009900">+**</font>
<font color="#009900">+** Contact info@trolltech.com if any conditions of this licensing are</font>
<font color="#009900">+** not clear to you.</font>
<font color="#009900">+**</font>
<font color="#009900">+**</font>
<font color="#009900">+**</font>
<font color="#009900">+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE</font>
<font color="#009900">+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</font>
<font color="#009900">+**</font>
<font color="#009900">+****************************************************************************/</font>
<font color="#009900">+</font>
<font color="#009900">+#ifndef QPLATFORMDEFS_H</font>
<font color="#009900">+#define QPLATFORMDEFS_H</font>
<font color="#009900">+</font>
<font color="#009900">+// Get Qt defines/settings</font>
<font color="#009900">+</font>
<font color="#009900">+#include "qglobal.h"</font>
<font color="#009900">+</font>
<font color="#009900">+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</font>
<font color="#009900">+</font>
<font color="#009900">+// 1) need to reset default environment if _BSD_SOURCE is defined</font>
<font color="#009900">+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0</font>
<font color="#009900">+// 3) it seems older glibc need this to include the X/Open stuff</font>
<font color="#009900">+#ifndef _GNU_SOURCE</font>
<font color="#009900">+#  define _GNU_SOURCE</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#include &lt;unistd.h&gt;</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+// We are hot - unistd.h should have turned on the specific APIs we requested</font>
<font color="#009900">+</font>
<font color="#009900">+#include &lt;features.h&gt;</font>
<font color="#009900">+#include &lt;pthread.h&gt;</font>
<font color="#009900">+#include &lt;dirent.h&gt;</font>
<font color="#009900">+#include &lt;fcntl.h&gt;</font>
<font color="#009900">+#include &lt;grp.h&gt;</font>
<font color="#009900">+#include &lt;pwd.h&gt;</font>
<font color="#009900">+#include &lt;signal.h&gt;</font>
<font color="#009900">+#include &lt;dlfcn.h&gt;</font>
<font color="#009900">+</font>
<font color="#009900">+#include &lt;sys/types.h&gt;</font>
<font color="#009900">+#include &lt;sys/ioctl.h&gt;</font>
<font color="#009900">+#include &lt;sys/ipc.h&gt;</font>
<font color="#009900">+#include &lt;sys/time.h&gt;</font>
<font color="#009900">+#include &lt;sys/shm.h&gt;</font>
<font color="#009900">+#include &lt;sys/socket.h&gt;</font>
<font color="#009900">+#include &lt;sys/stat.h&gt;</font>
<font color="#009900">+#include &lt;sys/wait.h&gt;</font>
<font color="#009900">+#include &lt;netinet/in.h&gt;</font>
<font color="#009900">+#ifndef QT_NO_IPV6IFNAME</font>
<font color="#009900">+#include &lt;net/if.h&gt;</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#ifdef QT_LARGEFILE_SUPPORT</font>
<font color="#009900">+#define QT_STATBUF              struct stat64</font>
<font color="#009900">+#define QT_STATBUF4TSTAT        struct stat64</font>
<font color="#009900">+#define QT_STAT                 ::stat64</font>
<font color="#009900">+#define QT_FSTAT                ::fstat64</font>
<font color="#009900">+#define QT_LSTAT                ::lstat64</font>
<font color="#009900">+#define QT_OPEN                 ::open64</font>
<font color="#009900">+#define QT_TRUNCATE             ::truncate64</font>
<font color="#009900">+#define QT_FTRUNCATE            ::ftruncate64</font>
<font color="#009900">+#define QT_LSEEK                ::lseek64</font>
<font color="#009900">+#else</font>
<font color="#009900">+#define QT_STATBUF              struct stat</font>
<font color="#009900">+#define QT_STATBUF4TSTAT        struct stat</font>
<font color="#009900">+#define QT_STAT                 ::stat</font>
<font color="#009900">+#define QT_FSTAT                ::fstat</font>
<font color="#009900">+#define QT_LSTAT                ::lstat</font>
<font color="#009900">+#define QT_OPEN                 ::open</font>
<font color="#009900">+#define QT_TRUNCATE             ::truncate</font>
<font color="#009900">+#define QT_FTRUNCATE            ::ftruncate</font>
<font color="#009900">+#define QT_LSEEK                ::lseek</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#ifdef QT_LARGEFILE_SUPPORT</font>
<font color="#009900">+#define QT_FOPEN                ::fopen64</font>
<font color="#009900">+#define QT_FSEEK                ::fseeko64</font>
<font color="#009900">+#define QT_FTELL                ::ftello64</font>
<font color="#009900">+#define QT_FGETPOS              ::fgetpos64</font>
<font color="#009900">+#define QT_FSETPOS              ::fsetpos64</font>
<font color="#009900">+#define QT_FPOS_T               fpos64_t</font>
<font color="#009900">+#define QT_OFF_T                off64_t</font>
<font color="#009900">+#else</font>
<font color="#009900">+#define QT_FOPEN                ::fopen</font>
<font color="#009900">+#define QT_FSEEK                ::fseek</font>
<font color="#009900">+#define QT_FTELL                ::ftell</font>
<font color="#009900">+#define QT_FGETPOS              ::fgetpos</font>
<font color="#009900">+#define QT_FSETPOS              ::fsetpos</font>
<font color="#009900">+#define QT_FPOS_T               fpos_t</font>
<font color="#009900">+#define QT_OFF_T                long</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#define QT_STAT_REG                S_IFREG</font>
<font color="#009900">+#define QT_STAT_DIR                S_IFDIR</font>
<font color="#009900">+#define QT_STAT_MASK                S_IFMT</font>
<font color="#009900">+#define QT_STAT_LNK                S_IFLNK</font>
<font color="#009900">+#define QT_SOCKET_CONNECT        ::connect</font>
<font color="#009900">+#define QT_SOCKET_BIND                ::bind</font>
<font color="#009900">+#define QT_SOCKET_BIND                ::bind</font>
<font color="#009900">+#define QT_FILENO                fileno</font>
<font color="#009900">+#define QT_CLOSE                ::close</font>
<font color="#009900">+#define QT_READ                        ::read</font>
<font color="#009900">+#define QT_WRITE                ::write</font>
<font color="#009900">+#define QT_ACCESS                ::access</font>
<font color="#009900">+#define QT_GETCWD                ::getcwd</font>
<font color="#009900">+#define QT_CHDIR                ::chdir</font>
<font color="#009900">+#define QT_MKDIR                ::mkdir</font>
<font color="#009900">+#define QT_RMDIR                ::rmdir</font>
<font color="#009900">+#define QT_OPEN_LARGEFILE       O_LARGEFILE</font>
<font color="#009900">+#define QT_OPEN_RDONLY                O_RDONLY</font>
<font color="#009900">+#define QT_OPEN_WRONLY                O_WRONLY</font>
<font color="#009900">+#define QT_OPEN_RDWR                O_RDWR</font>
<font color="#009900">+#define QT_OPEN_CREAT                O_CREAT</font>
<font color="#009900">+#define QT_OPEN_TRUNC                O_TRUNC</font>
<font color="#009900">+#define QT_OPEN_APPEND                O_APPEND</font>
<font color="#009900">+</font>
<font color="#009900">+#define QT_SIGNAL_RETTYPE        void</font>
<font color="#009900">+#define QT_SIGNAL_ARGS                int</font>
<font color="#009900">+#define QT_SIGNAL_IGNORE        SIG_IGN</font>
<font color="#009900">+</font>
<font color="#009900">+#if defined(__GLIBC__) &amp;&amp; (__GLIBC__ &gt;= 2)</font>
<font color="#009900">+#define QT_SOCKLEN_T                socklen_t</font>
<font color="#009900">+#else</font>
<font color="#009900">+#define QT_SOCKLEN_T                int</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#if defined(_XOPEN_SOURCE) &amp;&amp; (_XOPEN_SOURCE &gt;= 500)</font>
<font color="#009900">+#define QT_SNPRINTF                ::snprintf</font>
<font color="#009900">+#define QT_VSNPRINTF                ::vsnprintf</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#define QT_QLOCALE_USES_FCVT</font>
<font color="#009900">+</font>
<font color="#009900">+#endif // QPLATFORMDEFS_H</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/files/fic-gta02/device-conf        33f77c8d4d680c25796f493f054c0e6581439476</font>
<font color="#009900">+++ packages/qtopia-phone/files/fic-gta02/device-conf        33f77c8d4d680c25796f493f054c0e6581439476</font>
<font color="#0000FF">@@ -0,0 +1,46 @@</font>
<font color="#009900">+-arch OE_QT_ARCH</font>
<font color="#009900">+-xplatform OE_QT_XPLATFORM</font>
<font color="#009900">+-verbose</font>
<font color="#009900">+-qtopiamedia</font>
<font color="#009900">+-mediaengines gstreamer</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-linuxtp"</font>
<font color="#009900">+-extra-qtopiacore-config "-depths 16"</font>
<font color="#009900">+-no-infrared</font>
<font color="#009900">+-dbus</font>
<font color="#009900">+-dbuspath OE_QT_DBUSPATH</font>
<font color="#009900">+-iconsize 22</font>
<font color="#009900">+-displaysize 480x640</font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" </font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"</font>
<font color="#009900">+-extra-qtopiacore-config "-fast" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-accessibility" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-cups"</font>
<font color="#009900">+-extra-qtopiacore-config "-no-freetype" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake demos" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake examples"</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-gfx-linuxfb" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libjpeg" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libmng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libpng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-tslib" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-zlib" </font>
<font color="#009900">+-extra-qtopiacore-config "-release" </font>
<font color="#009900">+-extra-qtopiacore-config "OE_QT_ENDIAN"</font>
<font color="#009900">+-extra-qt-config "-nomake examples" </font>
<font color="#009900">+-extra-qt-config "-nomake demos" </font>
<font color="#009900">+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75</font>
<font color="#009900">+-image OE_QT_RPREFIX</font>
<font color="#009900">+-launch-method quicklaunch</font>
<font color="#009900">+-force-quicklaunch</font>
<font color="#009900">+-no-clean </font>
<font color="#009900">+-no-drm</font>
<font color="#009900">+-no-qvfb</font>
<font color="#009900">+-no-vpn</font>
<font color="#009900">+-no-sxe</font>
<font color="#009900">+-no-silent</font>
<font color="#009900">+-prefix OE_QT_RPREFIX</font>
<font color="#009900">+-reduce-exports=yes</font>
<font color="#009900">+-release</font>
<font color="#009900">+-confirm-license</font>
<font color="#009900">+OE_QT_EXTRACONFIG</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/files/fic-gta02/device-conf.old        7cf2ef99b35315048f286f7f0027ed5c6d609862</font>
<font color="#009900">+++ packages/qtopia-phone/files/fic-gta02/device-conf.old        7cf2ef99b35315048f286f7f0027ed5c6d609862</font>
<font color="#0000FF">@@ -0,0 +1,48 @@</font>
<font color="#009900">+-arch OE_QT_ARCH</font>
<font color="#009900">+-xplatform OE_QT_XPLATFORM</font>
<font color="#009900">+-verbose</font>
<font color="#009900">+-qtopiamedia</font>
<font color="#009900">+-mediaengines gstreamer</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-linuxtp"</font>
<font color="#009900">+-extra-qtopiacore-config "-depths OE_QT_DEPTHS"</font>
<font color="#009900">+-no-infrared</font>
<font color="#009900">+-dbus</font>
<font color="#009900">+-dbuspath OE_QT_DBUSPATH</font>
<font color="#009900">+-iconsize OT_QT_ICONSIZE</font>
<font color="#009900">+-displaysize OE_QT_DISPLAYSIZE</font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" </font>
<font color="#009900">+-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES"</font>
<font color="#009900">+-extra-qtopiacore-config "-fast" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-accessibility" </font>
<font color="#009900">+-extra-qtopiacore-config "-no-cups"</font>
<font color="#009900">+-extra-qtopiacore-config "-no-freetype" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake demos" </font>
<font color="#009900">+-extra-qtopiacore-config "-nomake examples"</font>
<font color="#009900">+-extra-qtopiacore-config "-qt-gfx-linuxfb" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libjpeg" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libmng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-libpng" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-mouse-tslib" </font>
<font color="#009900">+-extra-qtopiacore-config "-qt-zlib" </font>
<font color="#009900">+-extra-qtopiacore-config "-release" </font>
<font color="#009900">+#-extra-qtopiacore-config "-LOE_QT_LIBDIR" </font>
<font color="#009900">+#-extra-qtopiacore-config "-IOE_QT_INCDIR" </font>
<font color="#009900">+-extra-qtopiacore-config "OE_QT_ENDIAN"</font>
<font color="#009900">+-extra-qt-config "-nomake examples" </font>
<font color="#009900">+-extra-qt-config "-nomake demos" </font>
<font color="#009900">+-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75</font>
<font color="#009900">+-image OE_QT_RPREFEX</font>
<font color="#009900">+-launch-method quicklaunch</font>
<font color="#009900">+-force-quicklaunch</font>
<font color="#009900">+-no-clean </font>
<font color="#009900">+-no-drm</font>
<font color="#009900">+-no-qvfb</font>
<font color="#009900">+-no-vpn</font>
<font color="#009900">+-no-sxe</font>
<font color="#009900">+-no-silent</font>
<font color="#009900">+-prefix OE_QT_RPREFIX</font>
<font color="#009900">+-reduce-exports=yes</font>
<font color="#009900">+-release</font>
<font color="#009900">+-confirm-license</font>
<font color="#009900">+OE_QT_EXTRACONFIG</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/files/fic-gta02/qplatformdefs.h        4548b7c6203d64cb5ba410f46ff363427f46e675</font>
<font color="#009900">+++ packages/qtopia-phone/files/fic-gta02/qplatformdefs.h        4548b7c6203d64cb5ba410f46ff363427f46e675</font>
<font color="#0000FF">@@ -0,0 +1,146 @@</font>
<font color="#009900">+/****************************************************************************</font>
<font color="#009900">+**</font>
<font color="#009900">+** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved.</font>
<font color="#009900">+**</font>
<font color="#009900">+** This file is part of the Opensource Edition of the Qtopia Toolkit.</font>
<font color="#009900">+**</font>
<font color="#009900">+** This software is licensed under the terms of the GNU General Public</font>
<font color="#009900">+** License (GPL) version 2.</font>
<font color="#009900">+**</font>
<font color="#009900">+** See http://www.trolltech.com/gpl/ for GPL licensing information.</font>
<font color="#009900">+**</font>
<font color="#009900">+** Contact info@trolltech.com if any conditions of this licensing are</font>
<font color="#009900">+** not clear to you.</font>
<font color="#009900">+**</font>
<font color="#009900">+**</font>
<font color="#009900">+**</font>
<font color="#009900">+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE</font>
<font color="#009900">+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</font>
<font color="#009900">+**</font>
<font color="#009900">+****************************************************************************/</font>
<font color="#009900">+</font>
<font color="#009900">+#ifndef QPLATFORMDEFS_H</font>
<font color="#009900">+#define QPLATFORMDEFS_H</font>
<font color="#009900">+</font>
<font color="#009900">+// Get Qt defines/settings</font>
<font color="#009900">+</font>
<font color="#009900">+#include "qglobal.h"</font>
<font color="#009900">+</font>
<font color="#009900">+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs</font>
<font color="#009900">+</font>
<font color="#009900">+// 1) need to reset default environment if _BSD_SOURCE is defined</font>
<font color="#009900">+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0</font>
<font color="#009900">+// 3) it seems older glibc need this to include the X/Open stuff</font>
<font color="#009900">+#ifndef _GNU_SOURCE</font>
<font color="#009900">+#  define _GNU_SOURCE</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#include &lt;unistd.h&gt;</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+// We are hot - unistd.h should have turned on the specific APIs we requested</font>
<font color="#009900">+</font>
<font color="#009900">+#include &lt;features.h&gt;</font>
<font color="#009900">+#include &lt;pthread.h&gt;</font>
<font color="#009900">+#include &lt;dirent.h&gt;</font>
<font color="#009900">+#include &lt;fcntl.h&gt;</font>
<font color="#009900">+#include &lt;grp.h&gt;</font>
<font color="#009900">+#include &lt;pwd.h&gt;</font>
<font color="#009900">+#include &lt;signal.h&gt;</font>
<font color="#009900">+#include &lt;dlfcn.h&gt;</font>
<font color="#009900">+</font>
<font color="#009900">+#include &lt;sys/types.h&gt;</font>
<font color="#009900">+#include &lt;sys/ioctl.h&gt;</font>
<font color="#009900">+#include &lt;sys/ipc.h&gt;</font>
<font color="#009900">+#include &lt;sys/time.h&gt;</font>
<font color="#009900">+#include &lt;sys/shm.h&gt;</font>
<font color="#009900">+#include &lt;sys/socket.h&gt;</font>
<font color="#009900">+#include &lt;sys/stat.h&gt;</font>
<font color="#009900">+#include &lt;sys/wait.h&gt;</font>
<font color="#009900">+#include &lt;netinet/in.h&gt;</font>
<font color="#009900">+#ifndef QT_NO_IPV6IFNAME</font>
<font color="#009900">+#include &lt;net/if.h&gt;</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#ifdef QT_LARGEFILE_SUPPORT</font>
<font color="#009900">+#define QT_STATBUF              struct stat64</font>
<font color="#009900">+#define QT_STATBUF4TSTAT        struct stat64</font>
<font color="#009900">+#define QT_STAT                 ::stat64</font>
<font color="#009900">+#define QT_FSTAT                ::fstat64</font>
<font color="#009900">+#define QT_LSTAT                ::lstat64</font>
<font color="#009900">+#define QT_OPEN                 ::open64</font>
<font color="#009900">+#define QT_TRUNCATE             ::truncate64</font>
<font color="#009900">+#define QT_FTRUNCATE            ::ftruncate64</font>
<font color="#009900">+#define QT_LSEEK                ::lseek64</font>
<font color="#009900">+#else</font>
<font color="#009900">+#define QT_STATBUF              struct stat</font>
<font color="#009900">+#define QT_STATBUF4TSTAT        struct stat</font>
<font color="#009900">+#define QT_STAT                 ::stat</font>
<font color="#009900">+#define QT_FSTAT                ::fstat</font>
<font color="#009900">+#define QT_LSTAT                ::lstat</font>
<font color="#009900">+#define QT_OPEN                 ::open</font>
<font color="#009900">+#define QT_TRUNCATE             ::truncate</font>
<font color="#009900">+#define QT_FTRUNCATE            ::ftruncate</font>
<font color="#009900">+#define QT_LSEEK                ::lseek</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#ifdef QT_LARGEFILE_SUPPORT</font>
<font color="#009900">+#define QT_FOPEN                ::fopen64</font>
<font color="#009900">+#define QT_FSEEK                ::fseeko64</font>
<font color="#009900">+#define QT_FTELL                ::ftello64</font>
<font color="#009900">+#define QT_FGETPOS              ::fgetpos64</font>
<font color="#009900">+#define QT_FSETPOS              ::fsetpos64</font>
<font color="#009900">+#define QT_FPOS_T               fpos64_t</font>
<font color="#009900">+#define QT_OFF_T                off64_t</font>
<font color="#009900">+#else</font>
<font color="#009900">+#define QT_FOPEN                ::fopen</font>
<font color="#009900">+#define QT_FSEEK                ::fseek</font>
<font color="#009900">+#define QT_FTELL                ::ftell</font>
<font color="#009900">+#define QT_FGETPOS              ::fgetpos</font>
<font color="#009900">+#define QT_FSETPOS              ::fsetpos</font>
<font color="#009900">+#define QT_FPOS_T               fpos_t</font>
<font color="#009900">+#define QT_OFF_T                long</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#define QT_STAT_REG                S_IFREG</font>
<font color="#009900">+#define QT_STAT_DIR                S_IFDIR</font>
<font color="#009900">+#define QT_STAT_MASK                S_IFMT</font>
<font color="#009900">+#define QT_STAT_LNK                S_IFLNK</font>
<font color="#009900">+#define QT_SOCKET_CONNECT        ::connect</font>
<font color="#009900">+#define QT_SOCKET_BIND                ::bind</font>
<font color="#009900">+#define QT_SOCKET_BIND                ::bind</font>
<font color="#009900">+#define QT_FILENO                fileno</font>
<font color="#009900">+#define QT_CLOSE                ::close</font>
<font color="#009900">+#define QT_READ                        ::read</font>
<font color="#009900">+#define QT_WRITE                ::write</font>
<font color="#009900">+#define QT_ACCESS                ::access</font>
<font color="#009900">+#define QT_GETCWD                ::getcwd</font>
<font color="#009900">+#define QT_CHDIR                ::chdir</font>
<font color="#009900">+#define QT_MKDIR                ::mkdir</font>
<font color="#009900">+#define QT_RMDIR                ::rmdir</font>
<font color="#009900">+#define QT_OPEN_LARGEFILE       O_LARGEFILE</font>
<font color="#009900">+#define QT_OPEN_RDONLY                O_RDONLY</font>
<font color="#009900">+#define QT_OPEN_WRONLY                O_WRONLY</font>
<font color="#009900">+#define QT_OPEN_RDWR                O_RDWR</font>
<font color="#009900">+#define QT_OPEN_CREAT                O_CREAT</font>
<font color="#009900">+#define QT_OPEN_TRUNC                O_TRUNC</font>
<font color="#009900">+#define QT_OPEN_APPEND                O_APPEND</font>
<font color="#009900">+</font>
<font color="#009900">+#define QT_SIGNAL_RETTYPE        void</font>
<font color="#009900">+#define QT_SIGNAL_ARGS                int</font>
<font color="#009900">+#define QT_SIGNAL_IGNORE        SIG_IGN</font>
<font color="#009900">+</font>
<font color="#009900">+#if defined(__GLIBC__) &amp;&amp; (__GLIBC__ &gt;= 2)</font>
<font color="#009900">+#define QT_SOCKLEN_T                socklen_t</font>
<font color="#009900">+#else</font>
<font color="#009900">+#define QT_SOCKLEN_T                int</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#if defined(_XOPEN_SOURCE) &amp;&amp; (_XOPEN_SOURCE &gt;= 500)</font>
<font color="#009900">+#define QT_SNPRINTF                ::snprintf</font>
<font color="#009900">+#define QT_VSNPRINTF                ::vsnprintf</font>
<font color="#009900">+#endif</font>
<font color="#009900">+</font>
<font color="#009900">+#define QT_QLOCALE_USES_FCVT</font>
<font color="#009900">+</font>
<font color="#009900">+#endif // QPLATFORMDEFS_H</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia        54bf1406f00aebb9f05186ae64e99cd38f45ef0b</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia        54bf1406f00aebb9f05186ae64e99cd38f45ef0b</font>
<font color="#0000FF">@@ -0,0 +1,36 @@</font>
<font color="#009900">+#!/bin/sh</font>
<font color="#009900">+</font>
<font color="#009900">+# xmodmap to allow the soft-menu to work</font>
<font color="#009900">+xmodmap -e "keycode 180 = 0x11000601"</font>
<font color="#009900">+xmodmap -e "keycode 181 = 0x11000602"</font>
<font color="#009900">+xmodmap -e "keycode 182 = 0x11000603"</font>
<font color="#009900">+xmodmap -e "keycode 183 = 0x11000604"</font>
<font color="#009900">+xmodmap -e "keycode 184 = 0x11000605"</font>
<font color="#009900">+xmodmap -e "keycode 185 = 0x11000606"</font>
<font color="#009900">+xmodmap -e "keycode 186 = 0x11000607"</font>
<font color="#009900">+xmodmap -e "keycode 187 = 0x11000608"</font>
<font color="#009900">+xmodmap -e "keycode 188 = 0x11000609"</font>
<font color="#009900">+xmodmap -e "keycode 189 = 0x1100060A"</font>
<font color="#009900">+xmodmap -e "keycode 190 = 0x1100060B"</font>
<font color="#009900">+xmodmap -e "keycode 191 = 0x1100060B"</font>
<font color="#009900">+xmodmap -e "keycode 192 = 0x1100060A"</font>
<font color="#009900">+xmodmap -e "keycode 193 = 0x1100060C"</font>
<font color="#009900">+xmodmap -e "keycode 194 = 0x1100060D"</font>
<font color="#009900">+xmodmap -e "keycode 195 = 0x1100060E"</font>
<font color="#009900">+xmodmap -e "keycode 196 = 0x1100060F"</font>
<font color="#009900">+xmodmap -e "keycode 197 = 0x11000610"</font>
<font color="#009900">+xmodmap -e "keycode 198 = 0x1008ff26"</font>
<font color="#009900">+</font>
<font color="#009900">+# path setup</font>
<font color="#009900">+export QPEDIR=/opt/Qtopia</font>
<font color="#009900">+export PATH=$QPEDIR/bin:$PATH</font>
<font color="#009900">+export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH</font>
<font color="#009900">+</font>
<font color="#009900">+#tell Qtopia how to inform illume on incoming phone calls</font>
<font color="#009900">+#export ILLUME_PHONE_CALL=</font>
<font color="#009900">+export QTOPIA_PHONE_VENDOR=ficgta01</font>
<font color="#009900">+export QTOPIA_PHONE_MUX=ficgta01</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+# Now start Qtopia</font>
<font color="#009900">+qpe &amp;</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone-x11/qtopia.sh        14600d791e31540ce23ce74084b05c424a136b7f</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone-x11/qtopia.sh        14600d791e31540ce23ce74084b05c424a136b7f</font>
<font color="#0000FF">@@ -0,0 +1,4 @@</font>
<font color="#009900">+#!/bin/sh</font>
<font color="#009900">+export QPEDIR=/opt/Qtopia</font>
<font color="#009900">+export PATH=$PATH:$QPEDIR/bin</font>
<font color="#009900">+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb        8d6511f3785b690662798bf6a7814f77ef203bca</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb        8d6511f3785b690662798bf6a7814f77ef203bca</font>
<font color="#0000FF">@@ -0,0 +1,123 @@</font>
<font color="#009900">+# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone</font>
<font color="#009900">+# distribution.</font>
<font color="#009900">+#</font>
<font color="#009900">+# Please DO NOT merge this file into OE, it is not suitable for that yet as</font>
<font color="#009900">+# it compiles both native and target binaries. This requires stuff to be</font>
<font color="#009900">+# installed on the host which is against the aim of OE.</font>
<font color="#009900">+</font>
<font color="#009900">+DESCRIPTION = "Qtopia OpenSource"</font>
<font color="#009900">+SECTION = "qtopia-phone"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+PRIORITY = "optional"</font>
<font color="#009900">+HOMEPAGE = "http://www.trolltech.com"</font>
<font color="#009900">+DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst"</font>
<font color="#009900">+RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"</font>
<font color="#009900">+PROVIDES = "qtopia-phone"</font>
<font color="#009900">+PR = "r8"</font>
<font color="#009900">+SRCREV = "${AUTOREV}"</font>
<font color="#009900">+SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \</font>
<font color="#009900">+           file://Xsession.d/89qtopia \</font>
<font color="#009900">+           file://qtopia.sh"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/git"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit pkgconfig</font>
<font color="#009900">+</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+require qtopia-phone_arch.inc</font>
<font color="#009900">+</font>
<font color="#009900">+QT_ARCH = "${@qtopia_arch(d)}"</font>
<font color="#009900">+QT_ENDIAN = "${@qtopia_endian(d)}"</font>
<font color="#009900">+PLATFORM = "${BUILD_OS}-g++"</font>
<font color="#009900">+BUILDDIR = "${WORKDIR}/build"</font>
<font color="#009900">+OE_QT_PREFIX = "/opt/Qtopia"</font>
<font color="#009900">+</font>
<font color="#009900">+export OE_QMAKE_CC="${CC}"</font>
<font color="#009900">+export OE_QMAKE_CFLAGS="${CFLAGS}"</font>
<font color="#009900">+export OE_QMAKE_CXX="${CXX}"</font>
<font color="#009900">+export OE_QMAKE_LDFLAGS="${LDFLAGS}"</font>
<font color="#009900">+export OE_QMAKE_AR="${AR}"</font>
<font color="#009900">+export OE_QMAKE_STRIP="echo"</font>
<font color="#009900">+export OE_QMAKE_RPATH="-Wl,-rpath-link,"</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure() {</font>
<font color="#009900">+</font>
<font color="#009900">+# This qmake some how does not honor env var, let us fix it by sed force</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_CC\)%"${CC}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_CFLAGS\)%"${CFLAGS}"%g       ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_CXX\)%"${CXX}"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_CXXFLAGS\)%"${CXXFLAGS}"%g   ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_LINK\)%"${CXX}"%g            ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_LDFLAGS\)%"${LDFLAGS}"%g     ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_AR\)%"${AR}"%g               ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+sed -i s%$\(OE_QMAKE_STRIP\)%"echo"%g             ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+unset CC</font>
<font color="#009900">+unset CXX</font>
<font color="#009900">+unset CFLAGS</font>
<font color="#009900">+unset CXXFLAGS</font>
<font color="#009900">+unset LDFLAGS</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+mkdir -p ${BUILDDIR}</font>
<font color="#009900">+cd ${BUILDDIR}</font>
<font color="#009900">+echo yes | ${S}/configure -xplatform linux-oe-g++ -arch ${QT_ARCH} ${QT_ENDIAN} -prefix ${OE_QT_PREFIX} -device ${TARGET-DEVICE} -verbose \</font>
<font color="#009900">+                          -no-drm -no-sxe -displaysize 480x640 -dbus -debug -extra-qtopiacore-config "-qt-libjpeg -qt-zlib -qt-libpng -no-iconv -no-sm -fontconfig -xrender -xrandr" \</font>
<font color="#009900">+                           -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0</font>
<font color="#009900">+</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_compile() {</font>
<font color="#009900">+    cd ${BUILDDIR}</font>
<font color="#009900">+    oe_runmake</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_stage() {</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+do_install() {</font>
<font color="#009900">+   cd ${BUILDDIR}</font>
<font color="#009900">+   oe_runmake install INSTALL_ROOT=${D}${OE_QT_PREFIX} IMAGE=${D}${OE_QT_PREFIX}</font>
<font color="#009900">+</font>
<font color="#009900">+   # Install freedesktop.org .desktop files for enlightenment</font>
<font color="#009900">+   install -d ${D}${datadir}/applications</font>
<font color="#009900">+   for app in "${S}/apps-fdo/"*; do</font>
<font color="#009900">+     for file in "$app"/*.desktop; do</font>
<font color="#009900">+        install -m 0644 $file ${D}${datadir}/applications/</font>
<font color="#009900">+     done</font>
<font color="#009900">+   done </font>
<font color="#009900">+</font>
<font color="#009900">+   # Install good icons for the desktop files</font>
<font color="#009900">+</font>
<font color="#009900">+   # Make sure qpe gets launched by X</font>
<font color="#009900">+   install -d ${D}/${sysconfdir}/X11/Xsession.d</font>
<font color="#009900">+   install -m 0755 ${WORKDIR}/Xsession.d/89qtopia ${D}${sysconfdir}/X11/Xsession.d/</font>
<font color="#009900">+</font>
<font color="#009900">+   # Install some scripts</font>
<font color="#009900">+   install -d ${D}${bindir}</font>
<font color="#009900">+   install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir}</font>
<font color="#009900">+</font>
<font color="#009900">+   install -d ${D}${sysconfdir}/profile.d/</font>
<font color="#009900">+   install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help  \</font>
<font color="#009900">+                ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \</font>
<font color="#009900">+                ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \</font>
<font color="#009900">+                ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \</font>
<font color="#009900">+                ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \</font>
<font color="#009900">+                ${OE_QT_PREFIX}/services"</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN}-dbg += "${OE_QT_PREFIX}/lib/.debug/ ${OE_QT_PREFIX}/bin/.debug/ \</font>
<font color="#009900">+                    ${OE_QT_PREFIX}/plugins/*/.debug/ ${OE_QT_PREFIX}/qt_plugins/*/.debug/ "</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN}-dev += "${OE_QT_PREFIX}/lib/*.so"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone.inc        3a88780f98fdd8af1ad280d0c3e688bf14e81001</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone.inc        3a88780f98fdd8af1ad280d0c3e688bf14e81001</font>
<font color="#0000FF">@@ -0,0 +1,114 @@</font>
<font color="#009900">+# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone</font>
<font color="#009900">+# distribution.</font>
<font color="#009900">+#</font>
<font color="#009900">+# Please DO NOT merge this file into OE, it is not suitable for that yet as</font>
<font color="#009900">+# it compiles both native and target binaries. This requires stuff to be</font>
<font color="#009900">+# installed on the host which is against the aim of OE.</font>
<font color="#009900">+</font>
<font color="#009900">+DESCRIPTION = "Qtopia OpenSource"</font>
<font color="#009900">+SECTION = "qtopia-phone"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+PRIORITY = "optional"</font>
<font color="#009900">+HOMEPAGE = "http://www.trolltech.com"</font>
<font color="#009900">+DEPENDS = "glib-2.0 dbus tslib gstreamer"</font>
<font color="#009900">+PROVIDES = "qtopia-phone"</font>
<font color="#009900">+PR = "r1"</font>
<font color="#009900">+SRC_URI = "ftp://ftp.trolltech.com/qtopia/source/qtopia-opensource-src-${PV}.tar.gz \</font>
<font color="#009900">+           file://device-conf \</font>
<font color="#009900">+           file://qplatformdefs.h"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/qtopia-opensource-${PV}"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit pkgconfig update-rc.d</font>
<font color="#009900">+</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}"</font>
<font color="#009900">+TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+INITSCRIPT_NAME = "qpe"</font>
<font color="#009900">+INITSCRIPT_PARAMS = "defaults 98"</font>
<font color="#009900">+</font>
<font color="#009900">+export QTOPIA_DEPOT_PATH = "${S}"</font>
<font color="#009900">+</font>
<font color="#009900">+require qtopia-phone_arch.inc</font>
<font color="#009900">+</font>
<font color="#009900">+QT_ARCH = "${@qtopia_arch(d)}"</font>
<font color="#009900">+QT_ENDIAN = "${@qtopia_endian(d)}"</font>
<font color="#009900">+PLATFORM = "${BUILD_OS}-g++"</font>
<font color="#009900">+XPLATFORM = "linux-oe-g++"</font>
<font color="#009900">+BUILDDIR = "${WORKDIR}/build"</font>
<font color="#009900">+</font>
<font color="#009900">+OE_QT_DBUSPATH = "${STAGING_DIR_HOST}"</font>
<font color="#009900">+OE_QT_ARCH = "${QT_ARCH}"</font>
<font color="#009900">+OE_QT_XPLATFORM = "${XPLATFORM}"</font>
<font color="#009900">+OE_QT_LIBDIR = "${STAGING_LIBDIR}"</font>
<font color="#009900">+OE_QT_INCDIR = "${STAGING_INCDIR}"</font>
<font color="#009900">+OE_QT_RPREFIX = "/opt/Qtopia"</font>
<font color="#009900">+OE_QT_ENDIAN = "${QT_ENDIAN}"</font>
<font color="#009900">+OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0"</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure() {</font>
<font color="#009900">+</font>
<font color="#009900">+unset CC</font>
<font color="#009900">+unset CXX</font>
<font color="#009900">+unset CFLAGS</font>
<font color="#009900">+unset CXXFLAGS</font>
<font color="#009900">+unset LDFLAGS</font>
<font color="#009900">+</font>
<font color="#009900">+mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}</font>
<font color="#009900">+install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \</font>
<font color="#009900">+    ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}</font>
<font color="#009900">+install -m 644 ${WORKDIR}/qplatformdefs.h \</font>
<font color="#009900">+    ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}</font>
<font color="#009900">+sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf</font>
<font color="#009900">+sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf</font>
<font color="#009900">+</font>
<font color="#009900">+# sed the dynamic config into the file</font>
<font color="#009900">+sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf</font>
<font color="#009900">+</font>
<font color="#009900">+rm -f ${S}/devices/${TARGET-DEVICE}/configure</font>
<font color="#009900">+cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure</font>
<font color="#009900">+rm -f ${S}/devices/${TARGET-DEVICE}/environment</font>
<font color="#009900">+echo "" &gt; ${S}/devices/${TARGET-DEVICE}/environment</font>
<font color="#009900">+</font>
<font color="#009900">+mkdir -p ${BUILDDIR}</font>
<font color="#009900">+cd ${BUILDDIR}</font>
<font color="#009900">+echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM}</font>
<font color="#009900">+</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_compile() {</font>
<font color="#009900">+    cd ${BUILDDIR}</font>
<font color="#009900">+    oe_runmake</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_stage() {</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+</font>
<font color="#009900">+do_install() {</font>
<font color="#009900">+   cd ${BUILDDIR}</font>
<font color="#009900">+   oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX}</font>
<font color="#009900">+   install -d ${D}${sysconfdir}/init.d</font>
<font color="#009900">+   install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe</font>
<font color="#009900">+</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help  \</font>
<font color="#009900">+                ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \</font>
<font color="#009900">+                ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \</font>
<font color="#009900">+                ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \</font>
<font color="#009900">+                ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \</font>
<font color="#009900">+                ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts"</font>
<font color="#009900">+</font>
<font color="#009900">+FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone_4.3.0.bb        6a8d100cd18fb90e6f4dfc83f85e4588a049db4c</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone_4.3.0.bb        6a8d100cd18fb90e6f4dfc83f85e4588a049db4c</font>
<font color="#0000FF">@@ -0,0 +1 @@</font>
<font color="#009900">+require qtopia-phone.inc</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone_4.3.1.bb        6a8d100cd18fb90e6f4dfc83f85e4588a049db4c</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone_4.3.1.bb        6a8d100cd18fb90e6f4dfc83f85e4588a049db4c</font>
<font color="#0000FF">@@ -0,0 +1 @@</font>
<font color="#009900">+require qtopia-phone.inc</font>
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone_arch.inc        15641411049adbe933692115529c6bac3f43cfef</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone_arch.inc        15641411049adbe933692115529c6bac3f43cfef</font>
<font color="#0000FF">@@ -0,0 +1,23 @@</font>
<font color="#009900">+inherit siteinfo</font>
<font color="#009900">+</font>
<font color="#009900">+def qtopia_arch(d):</font>
<font color="#009900">+    import bb, re</font>
<font color="#009900">+    arch = bb.data.getVar('TARGET_ARCH', d, 1)</font>
<font color="#009900">+    if re.match("^i.86$", arch):</font>
<font color="#009900">+        arch = "i386"</font>
<font color="#009900">+    elif re.match("^arm.*", arch):</font>
<font color="#009900">+        arch = "arm"</font>
<font color="#009900">+    elif arch == "x86_64":</font>
<font color="#009900">+        arch = "x86"</font>
<font color="#009900">+    elif arch == "mipsel":</font>
<font color="#009900">+        arch = "mips"</font>
<font color="#009900">+    return arch</font>
<font color="#009900">+</font>
<font color="#009900">+def qtopia_endian(d):</font>
<font color="#009900">+    import bb</font>
<font color="#009900">+    if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le":</font>
<font color="#009900">+        return "-little-endian"</font>
<font color="#009900">+    elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be":</font>
<font color="#009900">+        return "-big-endian"</font>
<font color="#009900">+    else:</font>
<font color="#009900">+        assert False</font>
============================================================
<font color="#FF6600">--- packages/tasks/task-openmoko-qtopia-x11.bb        38da0e6335542addd488373f6e8cee974a877a58</font>
<font color="#009900">+++ packages/tasks/task-openmoko-qtopia-x11.bb        38da0e6335542addd488373f6e8cee974a877a58</font>
<font color="#0000FF">@@ -0,0 +1,35 @@</font>
<font color="#009900">+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"</font>
<font color="#009900">+SECTION = "openmoko/base"</font>
<font color="#009900">+ALLOW_EMPTY = "1"</font>
<font color="#009900">+PACKAGE_ARCH = "${MACHINE_ARCH}"</font>
<font color="#009900">+LICENSE = "MIT"</font>
<font color="#009900">+PR = "r46"</font>
<font color="#009900">+</font>
<font color="#009900">+inherit task</font>
<font color="#009900">+</font>
<font color="#009900">+XSERVER ?= "xserver-kdrive-fbdev"</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES = "task-openmoko-qtopia-x11"</font>
<font color="#009900">+</font>
<font color="#009900">+#</font>
<font color="#009900">+# task-openmoko-qtopia-x11</font>
<font color="#009900">+#</font>
<font color="#009900">+DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface"</font>
<font color="#009900">+RDEPENDS_task-openmoko-qtopia-x11 = "\</font>
<font color="#009900">+  alsa-state \</font>
<font color="#009900">+  bluez-hcidump \</font>
<font color="#009900">+  readline \</font>
<font color="#009900">+  qtopia-phone-x11 \</font>
<font color="#009900">+  e-wm \</font>
<font color="#009900">+  illume \</font>
<font color="#009900">+  ${XSERVER} \</font>
<font color="#009900">+  xserver-kdrive-common \</font>
<font color="#009900">+  xserver-nodm-init \</font>
<font color="#009900">+  xauth \</font>
<font color="#009900">+  xhost \</font>
<font color="#009900">+  xset \</font>
<font color="#009900">+  xrandr \</font>
<font color="#009900">+  neod \</font>
<font color="#009900">+  libnotify \</font>
<font color="#009900">+"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/tasks/task-openmoko-qtopia.bb        4367872d7b461db04275d0f119b597e45eb0811b</font>
<font color="#009900">+++ packages/tasks/task-openmoko-qtopia.bb        4367872d7b461db04275d0f119b597e45eb0811b</font>
<font color="#0000FF">@@ -0,0 +1,22 @@</font>
<font color="#009900">+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"</font>
<font color="#009900">+SECTION = "openmoko/base"</font>
<font color="#009900">+ALLOW_EMPTY = "1"</font>
<font color="#009900">+PACKAGE_ARCH = "all"</font>
<font color="#009900">+LICENSE = "MIT"</font>
<font color="#009900">+PR = "r45"</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES = "task-openmoko-qtopia"</font>
<font color="#009900">+</font>
<font color="#009900">+#</font>
<font color="#009900">+# task-openmoko-qtopia</font>
<font color="#009900">+#</font>
<font color="#009900">+DESCRIPTION_task-openmoko-qtopia = "OpenMoko: The Qtopia based native User Interface"</font>
<font color="#009900">+RDEPENDS_task-openmoko-qtopia = "\</font>
<font color="#009900">+  alsa-state \</font>
<font color="#009900">+  bluez-hcidump \</font>
<font color="#009900">+  readline \</font>
<font color="#009900">+  gstreamer \</font>
<font color="#009900">+  bootchart \</font>
<font color="#009900">+  qtopia-phone \</font>
<font color="#009900">+"</font>
<font color="#009900">+</font>
============================================================
<font color="#FF6600">--- packages/wpa-supplicant/wpa-supplicant_0.5.10.bb        96f91121be0d1a9fb9a7bbe2872fa7da5b580c83</font>
<font color="#009900">+++ packages/wpa-supplicant/wpa-supplicant_0.5.10.bb        96f91121be0d1a9fb9a7bbe2872fa7da5b580c83</font>
<font color="#0000FF">@@ -0,0 +1,61 @@</font>
<font color="#009900">+DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)."</font>
<font color="#009900">+SECTION = "network"</font>
<font color="#009900">+LICENSE = "GPL"</font>
<font color="#009900">+HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"</font>
<font color="#009900">+DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds</font>
<font color="#009900">+MY_ARCH := "${PACKAGE_ARCH}"</font>
<font color="#009900">+PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \</font>
<font color="#009900">+        file://defconfig-gnutls \</font>
<font color="#009900">+        file://ifupdown.sh \</font>
<font color="#009900">+        file://functions.sh"</font>
<font color="#009900">+</font>
<font color="#009900">+S = "${WORKDIR}/wpa_supplicant-${PV}"</font>
<font color="#009900">+</font>
<font color="#009900">+PACKAGES_prepend = "wpa-supplicant-passphrase "</font>
<font color="#009900">+FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase"</font>
<font color="#009900">+</font>
<font color="#009900">+RREPLACES = "wpa-supplicant-cli"</font>
<font color="#009900">+</font>
<font color="#009900">+RRECOMMENDS_${PN} = "wpa-supplicant-passphrase"</font>
<font color="#009900">+</font>
<font color="#009900">+export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}"</font>
<font color="#009900">+</font>
<font color="#009900">+do_configure () {</font>
<font color="#009900">+        install -m 0755 ${WORKDIR}/defconfig-gnutls  .config</font>
<font color="#009900">+</font>
<font color="#009900">+        if [ "x$HAS_PCI" == "x1" ] ; then</font>
<font color="#009900">+                echo "CONFIG_DRIVER_MADWIFI=y" &gt;&gt; .config</font>
<font color="#009900">+                echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" &gt;&gt; .config</font>
<font color="#009900">+        fi</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_compile () {</font>
<font color="#009900">+        make</font>
<font color="#009900">+}</font>
<font color="#009900">+</font>
<font color="#009900">+do_install () {</font>
<font color="#009900">+        install -d ${D}${sbindir}</font>
<font color="#009900">+        install -m 755 wpa_supplicant ${D}${sbindir}</font>
<font color="#009900">+        install -m 755 wpa_passphrase ${D}${sbindir}</font>
<font color="#009900">+        install -m 755 wpa_cli        ${D}${sbindir}</font>
<font color="#009900">+</font>
<font color="#009900">+        install -d ${D}${localstatedir}/run/wpa_supplicant</font>
<font color="#009900">+</font>
<font color="#009900">+        install -d ${D}${docdir}/wpa_supplicant</font>
<font color="#009900">+        install -m 644 README ${D}${docdir}/wpa_supplicant</font>
<font color="#009900">+</font>
<font color="#009900">+        install -d ${D}${sysconfdir}/network/if-pre-up.d/</font>
<font color="#009900">+        install -d ${D}${sysconfdir}/network/if-post-down.d/</font>
<font color="#009900">+        install -d ${D}${sysconfdir}/network/if-down.d/</font>
<font color="#009900">+</font>
<font color="#009900">+        install -d ${D}${sysconfdir}/wpa_supplicant</font>
<font color="#009900">+        install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/</font>
<font color="#009900">+        install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant</font>
<font color="#009900">+        </font>
<font color="#009900">+        ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant</font>
<font color="#009900">+        ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant</font>
<font color="#009900">+}</font>
============================================================
<font color="#FF6600">--- classes/kernel.bbclass        0e7bc22f0cbc8ab0efe1c7ffb69e9171f99a8b21</font>
<font color="#009900">+++ classes/kernel.bbclass        8d92c5a7b6420490dd6b3115e8146b3fc0a0f854</font>
<font color="#0000FF">@@ -470,7 +470,10 @@ do_deploy() {</font>
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
         package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
<font color="#009900">+</font>
<font color="#009900">+        if [ -d "${D}lib" ]; then</font>
         tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
<font color="#009900">+        fi</font>
 
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
                 if test -e arch/${ARCH}/boot/compressed/vmlinux ; then
============================================================
<font color="#FF6600">--- classes/sourcepkg.bbclass        4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3</font>
<font color="#009900">+++ classes/sourcepkg.bbclass        e4c6fac480eaea68ccd24d95a5878b9f5e41b464</font>
<font color="#0000FF">@@ -18,14 +18,20 @@ def get_src_tree(d):</font>
                 bb.error("S not defined, unable to find source tree.")
                 return
 
<font color="#FF6600">-        s_tree_raw = s.split('/')[1]</font>
<font color="#009900">+        try:</font>
<font color="#009900">+                s_tree_raw = s.split('/')[1]</font>
<font color="#009900">+        except IndexError:</font>
<font color="#009900">+                return</font>
<font color="#009900">+</font>
         s_tree = bb.data.expand(s_tree_raw, d)
 
         src_tree_path = os.path.join(workdir, s_tree)
         try:
                 os.listdir(src_tree_path)
         except OSError:
<font color="#FF6600">-                bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path)</font>
<font color="#009900">+                bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s)</font>
<font color="#009900">+                return</font>
<font color="#009900">+</font>
         bb.debug("Assuming source tree is '%s'" % src_tree_path)
 
         return s_tree
<font color="#0000FF">@@ -39,11 +45,14 @@ sourcepkg_do_create_orig_tgz(){</font>
         done
 
         src_tree=${@get_src_tree(d)}
<font color="#FF6600">-        </font>
<font color="#FF6600">-        echo $src_tree</font>
<font color="#009900">+        if test x${src_tree} = x; then</font>
<font color="#009900">+                oenote "Skipping empty source tree"</font>
<font color="#009900">+                return</font>
<font color="#009900">+        fi</font>
<font color="#009900">+</font>
         oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz"
         tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree
<font color="#FF6600">-        cp -pPR $src_tree $src_tree.orig</font>
<font color="#009900">+        cp -av $src_tree $src_tree.orig</font>
 }
 
 sourcepkg_do_archive_bb() {
<font color="#0000FF">@@ -74,7 +83,14 @@ python sourcepkg_do_dumpdata() {</font>
         bb.note("Dumping metadata into '%s'" % dumpfile)
         f = open(dumpfile, "w")
         # emit variables and shell functions
<font color="#FF6600">-        bb.data.emit_env(f, d, True)</font>
<font color="#009900">+</font>
<font color="#009900">+        # FIXME: if we emit all, bitbake will get error while</font>
<font color="#009900">+        # evaluating AUTOREV since we have AUTOREV =</font>
<font color="#009900">+        # "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev</font>
<font color="#009900">+        # without a valid SRC_URI will cause problem.</font>
<font color="#009900">+</font>
<font color="#009900">+        bb.data.emit_env(f, d, True)</font>
<font color="#009900">+</font>
         # emit the metadata which isnt valid shell
         for e in d.keys():
                 if bb.data.getVarFlag(e, 'python', d):
<font color="#0000FF">@@ -89,8 +105,11 @@ sourcepkg_do_create_diff_gz(){</font>
                 echo $i &gt;&gt; temp/exclude-from-file
         done
 
<font color="#FF6600">-</font>
         src_tree=${@get_src_tree(d)}
<font color="#009900">+        if test x${src_tree} = x; then</font>
<font color="#009900">+                oenote "Skipping empty source tree"</font>
<font color="#009900">+                return</font>
<font color="#009900">+        fi</font>
 
         for i in `find . -maxdepth 1 -type f`; do
                 mkdir -p $src_tree/${DISTRO}/files
<font color="#0000FF">@@ -102,10 +121,10 @@ sourcepkg_do_create_diff_gz(){</font>
         rm -rf $src_tree.orig
 }
 
<font color="#FF6600">-EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz</font>
<font color="#009900">+#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz</font>
<font color="#009900">+EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz</font>
 
 addtask create_orig_tgz after do_unpack before do_patch
<font color="#009900">+addtask archive_bb after do_patch before do_configure</font>
<font color="#009900">+#addtask dumpdata after do_archive_bb before do_configure</font>
<font color="#009900">+addtask create_diff_gz after do_archive_bb before do_configure</font>
<font color="#FF6600">-addtask archive_bb after do_patch before do_dumpdata</font>
<font color="#FF6600">-addtask dumpdata after do_archive_bb before do_create_diff_gz</font>
<font color="#FF6600">-addtask create_diff_gz after do_dump_data before do_configure</font>
<font color="#FF6600">-</font>
============================================================
<font color="#FF6600">--- conf/distro/include/sane-srcrevs.inc        521cedb389bc68d1f7ab5ea2240153394d425295</font>
<font color="#009900">+++ conf/distro/include/sane-srcrevs.inc        7314e35801b572c3e3928395538ae79453852b2f</font>
<font color="#0000FF">@@ -37,7 +37,7 @@ SRCREV_pn-gpe-contacts ?= "9312"</font>
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
<font color="#FF6600">-SRCREV_pn-gsm0710muxd ?= "193"</font>
<font color="#009900">+SRCREV_pn-gsm0710muxd ?= "263"</font>
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
<font color="#0000FF">@@ -152,6 +152,7 @@ SRCREV_pn-psplash ?= "249"</font>
 SRCREV_pn-oprofileui ?= "160"
 SRCREV_pn-packagekit ?= "432046796fa420f57ab6c71081f7ba14e9a92574"
 SRCREV_pn-psplash ?= "249"
<font color="#009900">+SRCREV_pn-pty-forward-native ?= "4214"</font>
 SRCREV_pn-py-odeviced ?= "190"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "88"
<font color="#0000FF">@@ -162,7 +163,10 @@ SRCREV_pn-settings-daemon ?= "2006"</font>
 SRCREV_pn-python-pyrtc = "152"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
 SRCREV_pn-settings-daemon ?= "2006"
<font color="#009900">+SRCREV_pn-serial-forward ?= "4214"</font>
 SRCREV_pn-sjf2410-linux-native ?= "4268"
<font color="#009900">+SRCREV_pn-settings-daemon ?= "1755"</font>
<font color="#009900">+SRCREV_pn-sjf2410-linux-native ?= "933"</font>
 SRCREV_pn-sphyrna ?= "45"
 SRCREV_pn-tmut ?= "60"
 SRCREV_pn-u-boot-openmoko ?= "4297"
============================================================
<font color="#FF6600">--- conf/machine/at32stk1000.conf        3d5142529536576aea6056c6d761540974caa5ac</font>
<font color="#009900">+++ conf/machine/at32stk1000.conf        163fd78fdfe07eb3befe4b759102820ed434730b</font>
<font color="#0000FF">@@ -22,8 +22,9 @@ KERNEL_IMAGETYPE = "uImage"</font>
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
 KERNEL_IMAGETYPE = "uImage"
<font color="#FF6600">-PREFERRED_VERSION_u-boot = "1.1.4"</font>
<font color="#009900">+PREFERRED_VERSION_u-boot = "1.3.2"</font>
 
<font color="#009900">+UBOOT_MACHINE = "atstk1002_config"</font>
 UBOOT_ENTRYPOINT = "0x90000000"
 UBOOT_LOADADDRESS = "0x10000000"
 
============================================================
<font color="#FF6600">--- conf/machine/om-gta02.conf        bb34d745d24d709bd9a6fe113c95e816ba6c788a</font>
<font color="#009900">+++ conf/machine/om-gta02.conf        8a81b5b7224a98d62de1611265a26386dc77b5f2</font>
<font color="#0000FF">@@ -34,6 +34,7 @@ ROOT_FLASH_SIZE = "256"</font>
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
<font color="#009900">+IMAGE_FSTYPES ?= "jffs2"</font>
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \
<font color="#0000FF">@@ -45,7 +46,3 @@ include conf/machine/include/tune-arm920</font>
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
<font color="#FF6600">-</font>
<font color="#FF6600">-# build YAFFS2</font>
<font color="#FF6600">-IMAGE_FSTYPES ?= "jffs2 yaffs2"</font>
<font color="#FF6600">-</font>
============================================================
<font color="#FF6600">--- packages/alsa/alsa-state.bb        fa1e4194e6ae098938b0dfb04b2a91debdf76cd9</font>
<font color="#009900">+++ packages/alsa/alsa-state.bb        f5ed106d3dce9fc8b495243ae43e56a3127b312e</font>
<font color="#0000FF">@@ -9,7 +9,7 @@ PV = "0.1.0"</font>
 RRECOMMENDS_alsa-state = "alsa-states"
 RRECOMMENDS_${PN}_openmoko = "openmoko-alsa-scenarios"
 PV = "0.1.0"
<font color="#FF6600">-PR = "r12"</font>
<font color="#009900">+PR = "r15"</font>
 
 SRC_URI = " \
   file://asoundrc \
============================================================
<font color="#FF6600">--- packages/images/unslung-image.bb        e4cf81045fb8a8e211e464905d1b307c49987663</font>
<font color="#009900">+++ packages/images/unslung-image.bb        738ce981801bef8a0c76499a9524887eeb1547ff</font>
<font color="#0000FF">@@ -100,4 +100,12 @@ nslu2_pack_image () {</font>
                 -m ${STAGING_FIRMWARE_DIR}/NPE-B \
                 -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
                 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
<font color="#009900">+        slugimage -F -p \</font>
<font color="#009900">+                -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \</font>
<font color="#009900">+                -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \</font>
<font color="#009900">+                -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \</font>
<font color="#009900">+                -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \</font>
<font color="#009900">+                -m ${STAGING_FIRMWARE_DIR}/NPE-B \</font>
<font color="#009900">+                -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \</font>
<font color="#009900">+                -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin</font>
 }
============================================================
<font color="#FF6600">--- packages/meta/slugos-packages.bb        a8de050f9b9bde46ec2fe91cdf9d93c69da445cb</font>
<font color="#009900">+++ packages/meta/slugos-packages.bb        46c8ac8a7503c5e222ee23a677a92db2e2ea9dcb</font>
<font color="#0000FF">@@ -5,7 +5,7 @@ LICENSE = "MIT"</font>
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
<font color="#FF6600">-PR = "r50"</font>
<font color="#009900">+PR = "r51"</font>
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
<font color="#0000FF">@@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\</font>
         openobex-apps \
         openntpd \
         openobex \
<font color="#009900">+        openocd \</font>
         openssh \
         openvpn \
         patch \
<font color="#0000FF">@@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\</font>
         sudo \
         sysfsutils \
         tar \
<font color="#009900">+        task-mokogateway-everything \</font>
         tcpdump \
         thttpd \
         tiff \
<font color="#0000FF">@@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\</font>
         pwc \
         qc-usb-messenger \
         syslog-ng \
<font color="#FF6600">-        openocd task-mokogateway-everything \</font>
         task-native-sdk \
         unionfs-modules unionfs-utils \
         wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
============================================================
<font color="#FF6600">--- packages/openocd/openocd_svn.bb        ff4b08ed923a74c3efa4730980288907a11baeb7</font>
<font color="#009900">+++ packages/openocd/openocd_svn.bb        5863de22800841c9bcd0fe5b4014ef3d911f91a2</font>
<font color="#0000FF">@@ -2,7 +2,7 @@ PV = "0.0+r${SRCREV}"</font>
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+r${SRCREV}"
<font color="#FF6600">-PR = "r1"</font>
<font color="#009900">+PR = "r2"</font>
 
 inherit autotools
 
<font color="#0000FF">@@ -10,4 +10,5 @@ S = "${WORKDIR}/trunk"</font>
            file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
<font color="#009900">+DEPENDS = "libftdi"</font>
 EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"  
============================================================
<font color="#FF6600">--- packages/rsync/rsync.inc        7c3e306cf41e043732b6fedbc8c41ebc491fedaf</font>
<font color="#009900">+++ packages/rsync/rsync.inc        1d1f2cbe00f4779bdc3dc7f9689611d817e90259</font>
<font color="#0000FF">@@ -7,6 +7,8 @@ inherit autotools</font>
 
 inherit autotools
 
<font color="#009900">+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz"</font>
<font color="#009900">+</font>
 EXTRA_OEMAKE='STRIP=""'
 
 do_install_append() {
============================================================
<font color="#FF6600">--- packages/rsync/rsync_2.6.9.bb        46d56c1ae65397da35a2b8871cfecde62e0a382e</font>
<font color="#009900">+++ packages/rsync/rsync_2.6.9.bb        1b1f42efd8d5dc944a9638cd0678259c995c08dd</font>
<font color="#0000FF">@@ -2,5 +2,4 @@ PR = "r2"</font>
 
 PR = "r2"
 
<font color="#009900">+SRC_URI += "file://rsyncd.conf"</font>
<font color="#FF6600">-SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \</font>
<font color="#FF6600">-           file://rsyncd.conf"</font>
============================================================
<font color="#FF6600">--- packages/rsync/rsync_3.0.0.bb        265d3e5b7ec96ad6b092880621ccd67844dd9dc7</font>
<font color="#009900">+++ packages/rsync/rsync_3.0.0.bb        dd9114bcedbdbe8b612946916a35fe4a662cd34c</font>
<font color="#0000FF">@@ -2,9 +2,10 @@ PR = "r0"</font>
 
 PR = "r0"
 
<font color="#FF6600">-SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \</font>
<font color="#FF6600">-           file://m4.patch;patch=1 \</font>
<font color="#FF6600">-           file://rsyncd.conf"</font>
<font color="#009900">+SRC_URI += "\</font>
<font color="#009900">+  file://m4.patch;patch=1 \</font>
<font color="#009900">+  file://rsyncd.conf \</font>
<font color="#009900">+"</font>
 
 do_compile_prepend() {
         sed -i "s/conf_stop make_stop//" Makefile
</tt></pre>