summaryrefslogtreecommitdiff
path: root/meta/packages/pcmanfm/files/owl-window-menu.patch
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-07-07 18:21:49 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-13 15:21:44 +0100
commitbb2c55765b53db6e971419db7230514e9f7482cc (patch)
treec2048475bd5063027c7d8cd3401e0b6dc2ead9d0 /meta/packages/pcmanfm/files/owl-window-menu.patch
parent73914a8190ec2fe49e60f710a03ce3af253aca4b (diff)
downloadopenembedded-core-bb2c55765b53db6e971419db7230514e9f7482cc.tar.gz
openembedded-core-bb2c55765b53db6e971419db7230514e9f7482cc.tar.bz2
openembedded-core-bb2c55765b53db6e971419db7230514e9f7482cc.tar.xz
openembedded-core-bb2c55765b53db6e971419db7230514e9f7482cc.zip
pcmanfm: Update to 0.5
latest pcmanfm(0.9.7) separate the core functionality to create an independent library named libfm, which is not in poky repo. To keep it simple, just update to stable release 0.5. Also updated some of the patches. Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/packages/pcmanfm/files/owl-window-menu.patch')
-rw-r--r--meta/packages/pcmanfm/files/owl-window-menu.patch58
1 files changed, 29 insertions, 29 deletions
diff --git a/meta/packages/pcmanfm/files/owl-window-menu.patch b/meta/packages/pcmanfm/files/owl-window-menu.patch
index 7db68f4b1..d11140cf4 100644
--- a/meta/packages/pcmanfm/files/owl-window-menu.patch
+++ b/meta/packages/pcmanfm/files/owl-window-menu.patch
@@ -1,26 +1,26 @@
-Index: pcmanfm-0.3.2-beta/configure.in
+Index: pcmanfm-0.5/configure.in
===================================================================
---- pcmanfm-0.3.2-beta.orig/configure.in 2007-04-26 09:09:33.000000000 +0100
-+++ pcmanfm-0.3.2-beta/configure.in 2007-04-26 09:12:41.000000000 +0100
-@@ -15,6 +15,12 @@
- libstartup-notification-1.0"
-
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+--- pcmanfm-0.5.orig/configure.in
++++ pcmanfm-0.5/configure.in
+@@ -25,6 +25,12 @@
+ gtk_modules="gtk+-2.0 >= 2.6.0 \
+ gthread-2.0"
+ PKG_CHECK_MODULES(GTK, [$gtk_modules])
+
+OWL_CFLAGS=""
+OWL_LIBS="-lowl"
-+PACKAGE_CFLAGS="$PACKAGE_CFLAGS $OWL_CFLAGS"
-+PACKAGE_LIBS="$PACKAGE_LIBS $OWL_LIBS"
++GTK_CFLAGS="$GTK_CFLAGS $OWL_CFLAGS"
++GTK_LIBS="$GTK_LIBS $OWL_LIBS"
+
- AC_SUBST(PACKAGE_CFLAGS)
- AC_SUBST(PACKAGE_LIBS)
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
-Index: pcmanfm-0.3.2-beta/src/main-window.c
+Index: pcmanfm-0.5/src/main-window.c
===================================================================
---- pcmanfm-0.3.2-beta.orig/src/main-window.c 2007-04-26 09:09:15.000000000 +0100
-+++ pcmanfm-0.3.2-beta/src/main-window.c 2007-04-26 09:10:51.000000000 +0100
-@@ -414,9 +414,7 @@
- main_window->splitter_pos = appSettings.splitterPos;
+--- pcmanfm-0.5.orig/src/main-window.c
++++ pcmanfm-0.5/src/main-window.c
+@@ -534,9 +534,7 @@
+ main_window->splitter_pos = app_settings.splitter_pos;
/* Create menu bar */
- main_window->menu_bar = gtk_menu_bar_new ();
@@ -29,23 +29,23 @@ Index: pcmanfm-0.3.2-beta/src/main-window.c
+ main_window->menu_bar = gtk_menu_new ();
main_window->accel_group = gtk_accel_group_new ();
- fm_side_pane_menu[ 0 ].ret = ( GtkWidget** ) & main_window->open_side_pane_menu;
-Index: pcmanfm-0.3.2-beta/src/main.c
+ fm_side_pane_menu[ 0 ].ret = ( GtkWidget** ) (GtkWidget*) & main_window->open_side_pane_menu;
+Index: pcmanfm-0.5/src/main.c
===================================================================
---- pcmanfm-0.3.2-beta.orig/src/main.c 2007-04-26 09:09:15.000000000 +0100
-+++ pcmanfm-0.3.2-beta/src/main.c 2007-04-26 09:21:40.000000000 +0100
-@@ -32,6 +32,8 @@
- #include "glade-support.h"
- #include "settings.h"
+--- pcmanfm-0.5.orig/src/main.c
++++ pcmanfm-0.5/src/main.c
+@@ -48,6 +48,8 @@
+
+ #include "desktop.h"
+#include "libowl/owlwindowmenu.h"
+
- static char* init_path = NULL;
-
- static int sock;
-@@ -171,6 +173,10 @@
- gtk_window_set_default_size( GTK_WINDOW( main_window ),
- appSettings.width, appSettings.height );
+ typedef enum{
+ CMD_OPEN = 1,
+ CMD_OPEN_TAB,
+@@ -320,6 +322,10 @@
+ gtk_window_maximize( GTK_WINDOW( main_window ) );
+ }
gtk_widget_show ( GTK_WIDGET( main_window ) );
+ gtk_widget_show_all (main_window->menu_bar);
+ owl_set_window_menu (GTK_WINDOW(main_window),