<!-- Generator: GNU source-highlight 2.4
by Lorenzo Bettini
http://www.lorenzobettini.it
http://www.gnu.org/software/src-highlite -->
<pre><tt>#
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [f53488757066125902e24fa90b0df47bcc586715]
# to [28b0424ee6e5357b1d33a4e5cdd7c7b73b116d0e]
#
============================================================
<font color="#FF6600">--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb        f53488757066125902e24fa90b0df47bcc586715</font>
<font color="#009900">+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb        28b0424ee6e5357b1d33a4e5cdd7c7b73b116d0e</font>
<font color="#0000FF">@@ -12,7 +12,7 @@ DEPENDS = "glib-2.0 dbus freetype alsa-l</font>
HOMEPAGE = "http://www.trolltech.com"
DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 \
fontconfig xft libxext libxrender libxrandr libxcursor libxtst \
<font color="#FF6600">- gst-plugins-base"</font>
<font color="#009900">+ gst-plugins-base imagemagick-native"</font>
RDEPENDS_${PN} = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica \
tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia \
tzdata-europe tzdata-pacific gst-meta-audio"
<font color="#0000FF">@@ -110,8 +110,9 @@ do_install() {</font>
install -d ${D}${datadir}/pixmaps
ICONS=`cat ${S}/apps-fdo/*/*.desktop | grep Icon | cut -f 2 -d "="`
for icon in $ICONS; do
<font color="#FF6600">- if [ -f "${S}/pics/$icon.png" ] ; then</font>
<font color="#FF6600">- install -D ${S}/pics/$icon.png ${D}${datadir}/pixmaps/$icon.png</font>
<font color="#009900">+ if [ -f "${S}/pics/$icon.svg" ] ; then</font>
<font color="#009900">+ convert -geometry 200x200 ${S}/pics/$icon.svg -gravity center -extent 600x200 ${S}/pics/$icon.png</font>
<font color="#009900">+         install -D ${S}/pics/$icon.png ${D}${datadir}/pixmaps/$icon.png</font>
fi
done
<font color="#0000FF">@@ -226,6 +227,7 @@ ${PN}-drmbrowser \</font>
${PN}-archives \
${PN}-camera \
${PN}-drmbrowser \
<font color="#009900">+${PN}-simapp \</font>
\
${PN}-libamr \
${PN}-libdissipate2 \
<font color="#0000FF">@@ -267,7 +269,7 @@ PACKAGES_DYNAMIC = "${PN}-multiplexer-* </font>
"
PACKAGES_DYNAMIC = "${PN}-multiplexer-* ${PN}-phonevendor-* ${PN}-audiohw-* \
<font color="#FF6600">- ${PN}-media-*"</font>
<font color="#009900">+ ${PN}-media-* ${PN}-composer-* ${PN}-viewer-*"</font>
DEBIAN_NOAUTONAME_${PN}-libamr = "1"
DEBIAN_NOAUTONAME_${PN}-libdissipate2 = "1"
<font color="#0000FF">@@ -416,7 +418,7 @@ ${datadir}/applications/qtopia-photoedit</font>
${OE_QT_PREFIX}/etc/qds/PhotoEdit \
${OE_QT_PREFIX}/help/html/photoedit*.html \
${datadir}/applications/qtopia-photoedit.desktop \
<font color="#FF6600">-${datadir}/pixmaps/ImageViewer.png"</font>
<font color="#009900">+${datadir}/pixmaps/photoedit/ImageViewer.png"</font>
FILES_${PN}-qtmail = "\
${OE_QT_PREFIX}/plugins/application/libqtmail.so \
<font color="#0000FF">@@ -681,6 +683,11 @@ ${datadir}/pixmaps/drm/Drm.png"</font>
${datadir}/applications/qtopia-drmbrowser.desktop \
${datadir}/pixmaps/drm/Drm.png"
<font color="#009900">+FILES_${PN}-simapp = "\</font>
<font color="#009900">+${OE_QT_PREFIX}/pics/simapp \</font>
<font color="#009900">+${OE_QT_PREFIX}/help/html/simapp*.html \</font>
<font color="#009900">+${datadir}/applications/qtopia-simapp.desktop \</font>
<font color="#009900">+${datadir}/pixmaps/simapp/simapp.png"</font>
# libs
</tt></pre>