- Fix glib 2.8 building

- Add pcmanfm to task-oh
- Add .desktop and icon for pcmanfm
- Add missing icons required for pcmanfm to run


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@280 311d38ba-8fff-0310-9ca6-ca027cbcb966

9 files changed, 32 insertions, 3 deletions

diff --git a/openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb b/openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb
index d377a0aeae..76a467250e 100644
--- a/openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb
+++ b/openembedded/packages/glib-2.0/glib-2.0_2.8.1.bb
@@ -10,12 +10,12 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-PR = "r0"
+PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
 
-EXTRA_OECONF = "--disable-debug"
+EXTRA_OECONF = "--disable-debug --with-libiconv=gnu"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h"
diff --git a/openembedded/packages/meta/task-oh.bb b/openembedded/packages/meta/task-oh.bb
index a957507936..c15445ee92 100644
--- a/openembedded/packages/meta/task-oh.bb
+++ b/openembedded/packages/meta/task-oh.bb
@@ -1,7 +1,7 @@
 PACKAGES = "task-oh-base-depends task-oh-base"
 DESCRIPTION = "Tasks for OpenedHand Poky"
 MAINTAINER = "Richard Purdie <richard@openedhand.com>"
-PR = "r21"
+PR = "r22"
 
 ALLOW_EMPTY = "1"
 
@@ -35,6 +35,7 @@ RDEPENDS_task-oh-base := "\
     web \
     libcurl \
     js \
+    pcmanfm \
     leafpad \
     puzzles \
     kf \
diff --git a/openembedded/packages/pcmanfm/files/emblem-symbolic-link.png b/openembedded/packages/pcmanfm/files/emblem-symbolic-link.png
new file mode 100644
index 0000000000..b8e559456e
--- /dev/null
+++ b/openembedded/packages/pcmanfm/files/emblem-symbolic-link.png
diff --git a/openembedded/packages/pcmanfm/files/gnome-fs-directory.png b/openembedded/packages/pcmanfm/files/gnome-fs-directory.png
new file mode 100644
index 0000000000..05921a6689
--- /dev/null
+++ b/openembedded/packages/pcmanfm/files/gnome-fs-directory.png
diff --git a/openembedded/packages/pcmanfm/files/gnome-fs-regular.png b/openembedded/packages/pcmanfm/files/gnome-fs-regular.png
new file mode 100644
index 0000000000..ce77a8e62d
--- /dev/null
+++ b/openembedded/packages/pcmanfm/files/gnome-fs-regular.png
diff --git a/openembedded/packages/pcmanfm/files/gnome-mime-text-plain.png b/openembedded/packages/pcmanfm/files/gnome-mime-text-plain.png
new file mode 100644
index 0000000000..bfe4bad56c
--- /dev/null
+++ b/openembedded/packages/pcmanfm/files/gnome-mime-text-plain.png
diff --git a/openembedded/packages/pcmanfm/files/pcmanfm.desktop b/openembedded/packages/pcmanfm/files/pcmanfm.desktop
new file mode 100644
index 0000000000..052d38c855
--- /dev/null
+++ b/openembedded/packages/pcmanfm/files/pcmanfm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=File Manager
+Exec=/usr/bin/pcmanfm
+Icon=pcmanfm.png
+Terminal=false
+Type=Application
+Categories=Utility;
+SingleInstance=true
+StartupNotify=true
+
diff --git a/openembedded/packages/pcmanfm/files/pcmanfm.png b/openembedded/packages/pcmanfm/files/pcmanfm.png
new file mode 100644
index 0000000000..3d35360848
--- /dev/null
+++ b/openembedded/packages/pcmanfm/files/pcmanfm.png
diff --git a/openembedded/packages/pcmanfm/pcmanfm_0.1.9.8.bb b/openembedded/packages/pcmanfm/pcmanfm_0.1.9.8.bb
index 7a1092bfeb..f35d0d4454 100644
--- a/openembedded/packages/pcmanfm/pcmanfm_0.1.9.8.bb
+++ b/openembedded/packages/pcmanfm/pcmanfm_0.1.9.8.bb
@@ -6,7 +6,24 @@ MAINTAINER = "Chris Lord <chris@openedhand.com>"
 DEPENDS = "gtk+"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
+           file://pcmanfm.desktop \
+           file://pcmanfm.png \
+           file://gnome-fs-directory.png \
+           file://gnome-fs-regular.png \
+           file://gnome-mime-text-plain.png \
+           file://emblem-symbolic-link.png \
            file://no-fam-gtk2.6.patch;patch=1;pnum=1"
 
 inherit autotools pkgconfig
 
+do_install_append () {
+        install -d ${D}/${datadir}
+        install -d ${D}/${datadir}/applications
+        install -d ${D}/${datadir}/pixmaps/
+
+        install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps
+        install -m 0644 ${WORKDIR}/pcmanfm.desktop ${D}/${datadir}/applications
+}
+
+FILES_${PN} += "${datadir}/applications/pcmanfm.desktop ${datadir}/pixmaps/*.png"
+