summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-09-25 13:40:10 +0000
committerChris Lord <chris@openedhand.com>2006-09-25 13:40:10 +0000
commitbc6fccce535e98ea31cec739b046451821a30a64 (patch)
treefc7ddcbde8684c6baf0ce0b595864dd39d9d019c
parent8d02222ceb0c17c1085c6032bc1a32a5a4a2ff8e (diff)
downloadopenembedded-core-bc6fccce535e98ea31cec739b046451821a30a64.tar.gz
openembedded-core-bc6fccce535e98ea31cec739b046451821a30a64.tar.bz2
openembedded-core-bc6fccce535e98ea31cec739b046451821a30a64.zip
Fix bug #151 (pcmanfm warnings/launcher)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@754 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/pcmanfm/files/desktop.patch11
-rw-r--r--meta/packages/pcmanfm/files/no-warnings.patch47
-rw-r--r--meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb28
3 files changed, 86 insertions, 0 deletions
diff --git a/meta/packages/pcmanfm/files/desktop.patch b/meta/packages/pcmanfm/files/desktop.patch
new file mode 100644
index 0000000000..764f5b7845
--- /dev/null
+++ b/meta/packages/pcmanfm/files/desktop.patch
@@ -0,0 +1,11 @@
+--- pcmanfm-0.3.2-beta/pcmanfm.desktop.in.old 2006-09-25 11:43:07.000000000 +0100
++++ pcmanfm-0.3.2-beta/pcmanfm.desktop.in 2006-09-25 11:44:59.000000000 +0100
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Categories=Application;System;Utility;Core;GTK;
+ Encoding=UTF-8
+-Name=PCMan File Manager
++Name=File Manager
+ Name[zh_TW]=PCMan 檔案管理程式
+ Name[pl]=Przeglądarka plików z zakładkami
+ Exec=pcmanfm %f
diff --git a/meta/packages/pcmanfm/files/no-warnings.patch b/meta/packages/pcmanfm/files/no-warnings.patch
new file mode 100644
index 0000000000..2e0d92bd7b
--- /dev/null
+++ b/meta/packages/pcmanfm/files/no-warnings.patch
@@ -0,0 +1,47 @@
+--- pcmanfm-0.3.2-beta/src/main.c.old 2006-09-25 11:51:51.000000000 +0100
++++ pcmanfm-0.3.2-beta/src/main.c 2006-09-25 11:51:55.000000000 +0100
+@@ -173,7 +173,7 @@
+ gtk_widget_show ( GTK_WIDGET( main_window ) );
+ return main_window;
+ }
+-
++#if 0
+ static void check_icon_theme()
+ {
+ GtkSettings * settings;
+@@ -212,7 +212,7 @@
+ }
+ g_free( theme );
+ }
+-
++#endif
+ int
+ main ( int argc, char *argv[] )
+ {
+@@ -274,7 +274,7 @@
+ vfs_file_info_set_thumbnail_size( appSettings.bigIconSize,
+ appSettings.smallIconSize );
+
+- check_icon_theme();
++/* check_icon_theme();*/
+
+ if( appSettings.showDesktop )
+ fm_desktop_init();
+--- pcmanfm-0.3.2-beta/src/main-window.c.old 2006-09-25 11:47:45.000000000 +0100
++++ pcmanfm-0.3.2-beta/src/main-window.c 2006-09-25 11:50:32.000000000 +0100
+@@ -496,6 +496,7 @@
+ gtk_window_add_accel_group ( GTK_WINDOW ( main_window ), main_window->accel_group );
+ gtk_widget_grab_focus ( GTK_WIDGET( main_window->address_bar ) );
+
++#if 0
+ /* Create warning bar for super user */
+ if ( geteuid() == 0 ) /* Run as super user! */
+ {
+@@ -510,6 +511,7 @@
+ gtk_box_pack_start ( GTK_BOX ( main_window->main_vbox ),
+ main_window->status_bar, FALSE, FALSE, 2 );
+ }
++#endif
+
+ /* Create client area */
+ main_window->notebook = GTK_NOTEBOOK( gtk_notebook_new () );
diff --git a/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb b/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb
new file mode 100644
index 0000000000..0802fd600f
--- /dev/null
+++ b/meta/packages/pcmanfm/pcmanfm_0.3.2-beta.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+DESCRIPTION = "procfs tools"
+SECTION = "x11"
+PRIORITY = "optional"
+MAINTAINER = "Chris Lord <chris@openedhand.com>"
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
+ file://gnome-fs-directory.png \
+ file://gnome-fs-regular.png \
+ file://gnome-mime-text-plain.png \
+ file://emblem-symbolic-link.png \
+ file://desktop.patch;patch=1 \
+ file://no-warnings.patch;patch=1"
+
+EXTRA_OECONF = "--enable-inotify --disable-hal"
+
+inherit autotools pkgconfig
+
+do_install_append () {
+ install -d ${D}/${datadir}
+ install -d ${D}/${datadir}/pixmaps/
+
+ install -m 0644 ${WORKDIR}/*.png ${D}/${datadir}/pixmaps
+}
+
+FILES_${PN} += "${datadir}/pixmaps/*.png"
+