summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2011-10-10 07:25:50 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 12:18:19 (GMT)
commitf617af4ea33371ff2ef3bd6535da961350e641fb (patch)
tree870e41c8a14d25b5a11c767ced07b44bdb1a7606 /meta/recipes-sato
parente227eb8abee607073b52829500172a4111e2e98c (diff)
downloadpoky-f617af4ea33371ff2ef3bd6535da961350e641fb.tar.gz
pcmanfm: Upgrade to 0.9.9
Update owl-window-menu.patch. (From OE-Core rev: 83ea07f8fb635a01dfe976ba0e518df282eef30d) Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-rw-r--r--meta/recipes-sato/pcmanfm/files/owl-window-menu.patch53
-rw-r--r--meta/recipes-sato/pcmanfm/pcmanfm_0.9.9.bb (renamed from meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb)6
2 files changed, 29 insertions, 30 deletions
diff --git a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
index 0826a16..88b154e 100644
--- a/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
+++ b/meta/recipes-sato/pcmanfm/files/owl-window-menu.patch
@@ -5,10 +5,10 @@ Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
5 5
6Upstream-Status: Inappropriate [enable feature] 6Upstream-Status: Inappropriate [enable feature]
7 7
8Index: pcmanfm-0.9.7/configure.ac 8Index: pcmanfm-0.9.9/configure.ac
9=================================================================== 9===================================================================
10--- pcmanfm-0.9.7.orig/configure.ac 2010-07-27 10:28:12.000000000 +0800 10--- pcmanfm-0.9.9.orig/configure.ac 2011-08-10 05:28:31.000000000 +0800
11+++ pcmanfm-0.9.7/configure.ac 2010-07-27 18:03:42.000000000 +0800 11+++ pcmanfm-0.9.9/configure.ac 2011-10-10 15:47:33.000000000 +0800
12@@ -70,6 +70,8 @@ 12@@ -70,6 +70,8 @@
13 13
14 gtk_modules="gtk+-2.0 >= 2.16.0" 14 gtk_modules="gtk+-2.0 >= 2.16.0"
@@ -18,21 +18,21 @@ Index: pcmanfm-0.9.7/configure.ac
18 AC_SUBST(GTK_CFLAGS) 18 AC_SUBST(GTK_CFLAGS)
19 AC_SUBST(GTK_LIBS) 19 AC_SUBST(GTK_LIBS)
20 20
21Index: pcmanfm-0.9.7/src/main-win.c 21Index: pcmanfm-0.9.9/src/main-win.c
22=================================================================== 22===================================================================
23--- pcmanfm-0.9.7.orig/src/main-win.c 2010-07-27 10:56:08.000000000 +0800 23--- pcmanfm-0.9.9.orig/src/main-win.c 2011-08-10 05:28:32.000000000 +0800
24+++ pcmanfm-0.9.7/src/main-win.c 2010-07-27 17:28:59.000000000 +0800 24+++ pcmanfm-0.9.9/src/main-win.c 2011-10-10 15:50:48.000000000 +0800
25@@ -36,6 +36,8 @@ 25@@ -37,6 +37,8 @@
26 #include "main-win.h"
27 #include "pref.h" 26 #include "pref.h"
27 #include "tab-page.h"
28 28
29+#include "libowl/owlwindowmenu.h" 29+#include "libowl/owlwindowmenu.h"
30+ 30+
31 static void fm_main_win_finalize (GObject *object); 31 static void fm_main_win_finalize (GObject *object);
32 G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW); 32 G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW);
33 33
34@@ -466,9 +468,27 @@ 34@@ -400,9 +402,27 @@
35 fm_main_win_chdir(win, path); 35 }
36 } 36 }
37 37
38+/* Transfer gtk_ui_manager menubar to gtk menubar */ 38+/* Transfer gtk_ui_manager menubar to gtk menubar */
@@ -53,30 +53,29 @@ Index: pcmanfm-0.9.7/src/main-win.c
53+ return main_menu; 53+ return main_menu;
54+} 54+}
55+ 55+
56 static void fm_main_win_init(FmMainWin *self) 56 static void fm_main_win_init(FmMainWin *win)
57 { 57 {
58- GtkWidget *vbox, *menubar, *toolitem, *scroll; 58- GtkWidget *vbox, *menubar, *toolitem, *btn;
59+ GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *scroll; 59+ GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *btn;
60 GtkUIManager* ui; 60 GtkUIManager* ui;
61 GtkActionGroup* act_grp; 61 GtkActionGroup* act_grp;
62 GtkAction* act; 62 GtkAction* act;
63@@ -537,7 +557,6 @@ 63@@ -456,7 +476,6 @@
64 64 win->popup = gtk_ui_manager_get_widget(ui, "/popup");
65 self->popup = gtk_ui_manager_get_widget(ui, "/popup"); 65 gtk_menu_attach_to_widget(GTK_WIDGET(win->popup), win, NULL);
66 66
67- gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 ); 67- gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 );
68 gtk_box_pack_start( (GtkBox*)vbox, self->toolbar, FALSE, TRUE, 0 ); 68 gtk_box_pack_start( (GtkBox*)vbox, win->toolbar, FALSE, TRUE, 0 );
69 69
70 /* load bookmarks menu */ 70 /* load bookmarks menu */
71@@ -586,6 +605,11 @@ 71@@ -517,6 +536,10 @@
72 gtk_container_add( (GtkContainer*)self, vbox );
73 gtk_widget_show_all(vbox);
74 72
75+ owl_menubar = ui_menubar_to_menu(menubar); 73 gtk_container_add( (GtkContainer*)win, vbox );
76+ gtk_widget_show_all (owl_menubar); 74 gtk_widget_show_all(vbox);
77+ owl_set_window_menu (GTK_WINDOW(self),
78+ GTK_MENU(owl_menubar));
79+ 75+
80 /* create new tab */ 76+ owl_menubar = ui_menubar_to_menu(menubar);
81 fm_main_win_add_tab(self, fm_path_get_home()); 77+ gtk_widget_show_all(owl_menubar);
82 gtk_widget_grab_focus(self->folder_view); 78+ owl_set_window_menu(GTK_WINDOW(win), GTK_MENU(owl_menubar));
79 }
80
81
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.9.bb
index f48bb67..af283f6 100644
--- a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb
+++ b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.9.bb
@@ -11,7 +11,7 @@ SECTION = "x11"
11DEPENDS = "gtk+ startup-notification libfm" 11DEPENDS = "gtk+ startup-notification libfm"
12DEPENDS_append_poky = " libowl" 12DEPENDS_append_poky = " libowl"
13 13
14PR = "r1" 14PR = "r0"
15 15
16COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*)-(linux|freebsd.*)' 16COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*)-(linux|freebsd.*)'
17 17
@@ -24,8 +24,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
24 24
25SRC_URI_append_poky = " file://owl-window-menu.patch" 25SRC_URI_append_poky = " file://owl-window-menu.patch"
26 26
27SRC_URI[md5sum] = "4a7fdc0526ed14e3293d784c0ce27dea" 27SRC_URI[md5sum] = "f31ed6defb600f7046a456220d8efa3a"
28SRC_URI[sha256sum] = "a9335baf127d133da1b2873b3065545bd278fadd4b33e4b91e3d10b165961b68" 28SRC_URI[sha256sum] = "bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c"
29 29
30inherit autotools pkgconfig 30inherit autotools pkgconfig
31 31