[PATCH 0/2] Upgrade libfm/pcmanfm

[PATCH 0/2] Upgrade libfm/pcmanfm

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

All,
These 2 patches upgrade libfm and pcmanfm. Pls. help to review and pull.

Thanks,
Edwin

The following changes since commit 0d8c8cf462e5df446669355b554b3d5fdc532a11:

  mutter: update to 2.29.1 and fix SRC_URI (2011-10-07 11:35:50 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib gzhai/master2
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2

Zhai Edwin (2):
  libfm: Upgrade to 0.1.16
  pcmanfm: Upgrade to 0.9.9

 .../pcmanfm/files/owl-window-menu.patch            |   53 ++++++++++----------
 .../pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} |    6 +-
 .../libfm/libfm-0.1.14/use_deprecate_func.patch    |   13 -----
 .../libfm/libfm-0.1.16/configure_fix.patch         |   19 +++++++
 .../libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb}     |    8 ++--
 5 files changed, 52 insertions(+), 47 deletions(-)
 rename meta/recipes-sato/pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} (87%)
 delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
 create mode 100644 meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
 rename meta/recipes-support/libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb} (73%)

[PATCH 1/2] libfm: Upgrade to 0.1.16

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

Remove obsolete use_deprecate_func.patch, and add configure_fix.patch to update
configure.ac

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../libfm/libfm-0.1.14/use_deprecate_func.patch    |   13 -------------
 .../libfm/libfm-0.1.16/configure_fix.patch         |   19 +++++++++++++++++++
 .../libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb}     |    8 ++++----
 3 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
 create mode 100644 meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
 rename meta/recipes-support/libfm/{libfm_0.1.14.bb => libfm_0.1.16.bb} (73%)

diff --git a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch b/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
deleted file mode 100644
index 79fc9ce..0000000
--- a/meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-diff -ruN libfm-0.1.14-orig//src/Makefile.am libfm-0.1.14/src/Makefile.am
---- libfm-0.1.14-orig//src/Makefile.am	2011-04-26 10:01:44.297664993 +0800
-+++ libfm-0.1.14/src/Makefile.am	2011-04-26 10:02:10.637665004 +0800
-@@ -285,7 +285,6 @@
- 	$(GIO_CFLAGS) \
- 	-DGIO_MODULE_DIR=\"$(giomodulesdir)\"	\
- 	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
--	-DG_DISABLE_DEPRECATED \
- 	$(NULL)
- 
- libgiofm_la_LDFLAGS = 	\
diff --git a/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
new file mode 100644
index 0000000..351e6e7
--- /dev/null
+++ b/meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
@@ -0,0 +1,19 @@
+Update configure.ac after docs removed in 0.1.16
+
+Upstream-Status: Pending
+
+Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
+Index: libfm-0.1.16/configure.ac
+===================================================================
+--- libfm-0.1.16.orig/configure.ac	2011-10-10 15:13:21.000000000 +0800
++++ libfm-0.1.16/configure.ac	2011-10-10 15:13:30.000000000 +0800
+@@ -153,9 +153,6 @@
+     data/Makefile
+     data/ui/Makefile
+     po/Makefile.in
+-    docs/Makefile
+-    docs/reference/Makefile
+-    docs/reference/libfm/Makefile
+     libfm.pc
+     libfm-gtk.pc
+ ])
diff --git a/meta/recipes-support/libfm/libfm_0.1.14.bb b/meta/recipes-support/libfm/libfm_0.1.16.bb
similarity index 73%
rename from meta/recipes-support/libfm/libfm_0.1.14.bb
rename to meta/recipes-support/libfm/libfm_0.1.16.bb
index 38f1d73..293937f 100644
--- a/meta/recipes-support/libfm/libfm_0.1.14.bb
+++ b/meta/recipes-support/libfm/libfm_0.1.16.bb
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
 SECTION = "x11/libs"
 DEPENDS = "gtk+ menu-cache intltool-native"
 
-PR = "r3"
+PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.gz \
-           file://use_deprecate_func.patch"
+           file://configure_fix.patch"
 
-SRC_URI[md5sum] = "d55e51dced6bb9ef46665243b079761f"
-SRC_URI[sha256sum] = "e97bf3f9ed4f33b9f0be73e67d360b89337cccf816361faacd8422722269806b"
+SRC_URI[md5sum] = "c09bce415ff6dc2dd835e28aeddeabe3"
+SRC_URI[sha256sum] = "ed49365319b941757c155b3790a2adf73f5072227c578d9bcba7329c6f9fcd3b"
 
 inherit autotools pkgconfig
-- 
1.7.1

[PATCH 2/2] pcmanfm: Upgrade to 0.9.9

[edwin.zhai]

From: Zhai Edwin <edwin.zhai@intel.com>

Update owl-window-menu.patch.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 .../pcmanfm/files/owl-window-menu.patch            |   53 ++++++++++----------
 .../pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} |    6 +-
 2 files changed, 29 insertions(+), 30 deletions(-)
 rename meta/recipes-sato/pcmanfm/{pcmanfm_0.9.8.bb => pcmanfm_0.9.9.bb} (87%)

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>
 
 Upstream-Status: Inappropriate [enable feature]
 
-Index: pcmanfm-0.9.7/configure.ac
+Index: pcmanfm-0.9.9/configure.ac
 ===================================================================
---- pcmanfm-0.9.7.orig/configure.ac	2010-07-27 10:28:12.000000000 +0800
-+++ pcmanfm-0.9.7/configure.ac	2010-07-27 18:03:42.000000000 +0800
+--- pcmanfm-0.9.9.orig/configure.ac	2011-08-10 05:28:31.000000000 +0800
++++ pcmanfm-0.9.9/configure.ac	2011-10-10 15:47:33.000000000 +0800
 @@ -70,6 +70,8 @@
  
  gtk_modules="gtk+-2.0 >= 2.16.0"
@@ -18,21 +18,21 @@ Index: pcmanfm-0.9.7/configure.ac
  AC_SUBST(GTK_CFLAGS)
  AC_SUBST(GTK_LIBS)
  
-Index: pcmanfm-0.9.7/src/main-win.c
+Index: pcmanfm-0.9.9/src/main-win.c
 ===================================================================
---- pcmanfm-0.9.7.orig/src/main-win.c	2010-07-27 10:56:08.000000000 +0800
-+++ pcmanfm-0.9.7/src/main-win.c	2010-07-27 17:28:59.000000000 +0800
-@@ -36,6 +36,8 @@
- #include "main-win.h"
+--- pcmanfm-0.9.9.orig/src/main-win.c	2011-08-10 05:28:32.000000000 +0800
++++ pcmanfm-0.9.9/src/main-win.c	2011-10-10 15:50:48.000000000 +0800
+@@ -37,6 +37,8 @@
  #include "pref.h"
+ #include "tab-page.h"
  
 +#include "libowl/owlwindowmenu.h"
 +
  static void fm_main_win_finalize              (GObject *object);
  G_DEFINE_TYPE(FmMainWin, fm_main_win, GTK_TYPE_WINDOW);
  
-@@ -466,9 +468,27 @@
-         fm_main_win_chdir(win, path);
+@@ -400,9 +402,27 @@
+     }
  }
  
 +/* Transfer gtk_ui_manager menubar to gtk menubar */
@@ -53,30 +53,29 @@ Index: pcmanfm-0.9.7/src/main-win.c
 +    return main_menu;
 +}
 +
- static void fm_main_win_init(FmMainWin *self)
+ static void fm_main_win_init(FmMainWin *win)
  {
--    GtkWidget *vbox, *menubar, *toolitem, *scroll;
-+    GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *scroll;
+-    GtkWidget *vbox, *menubar, *toolitem, *btn;
++    GtkWidget *vbox, *menubar, *owl_menubar, *toolitem, *btn;
      GtkUIManager* ui;
      GtkActionGroup* act_grp;
      GtkAction* act;
-@@ -537,7 +557,6 @@
- 
-     self->popup = gtk_ui_manager_get_widget(ui, "/popup");
+@@ -456,7 +476,6 @@
+     win->popup = gtk_ui_manager_get_widget(ui, "/popup");
+     gtk_menu_attach_to_widget(GTK_WIDGET(win->popup), win, NULL);
  
 -    gtk_box_pack_start( (GtkBox*)vbox, menubar, FALSE, TRUE, 0 );
-     gtk_box_pack_start( (GtkBox*)vbox, self->toolbar, FALSE, TRUE, 0 );
+     gtk_box_pack_start( (GtkBox*)vbox, win->toolbar, FALSE, TRUE, 0 );
  
      /* load bookmarks menu */
-@@ -586,6 +605,11 @@
-     gtk_container_add( (GtkContainer*)self, vbox );
-     gtk_widget_show_all(vbox);
+@@ -517,6 +536,10 @@
  
-+    owl_menubar = ui_menubar_to_menu(menubar);
-+    gtk_widget_show_all (owl_menubar);
-+    owl_set_window_menu (GTK_WINDOW(self),
-+			 GTK_MENU(owl_menubar));
+     gtk_container_add( (GtkContainer*)win, vbox );
+     gtk_widget_show_all(vbox);
 +
-     /* create new tab */
-     fm_main_win_add_tab(self, fm_path_get_home());
-     gtk_widget_grab_focus(self->folder_view);
++    owl_menubar = ui_menubar_to_menu(menubar);
++    gtk_widget_show_all(owl_menubar);
++    owl_set_window_menu(GTK_WINDOW(win), GTK_MENU(owl_menubar));
+ }
+ 
+ 
diff --git a/meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb b/meta/recipes-sato/pcmanfm/pcmanfm_0.9.9.bb
similarity index 87%
rename from meta/recipes-sato/pcmanfm/pcmanfm_0.9.8.bb
rename to 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"
 DEPENDS = "gtk+ startup-notification libfm"
 DEPENDS_append_poky = " libowl"
 
-PR = "r1"
+PR = "r0"
 
 COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|mips.*|powerpc.*)-(linux|freebsd.*)'
 
@@ -24,8 +24,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/pcmanfm-${PV}.tar.gz \
 
 SRC_URI_append_poky = " file://owl-window-menu.patch"
 
-SRC_URI[md5sum] = "4a7fdc0526ed14e3293d784c0ce27dea"
-SRC_URI[sha256sum] = "a9335baf127d133da1b2873b3065545bd278fadd4b33e4b91e3d10b165961b68"
+SRC_URI[md5sum] = "f31ed6defb600f7046a456220d8efa3a"
+SRC_URI[sha256sum] = "bc48af4ade638b47e4207cc274f6e38c2bd3786a811d20da47c3df9907c6fb6c"
 
 inherit autotools pkgconfig
 
-- 
1.7.1

Re: [PATCH 0/2] Upgrade libfm/pcmanfm

[Saul Wold]

On 10/11/2011 07:20 PM, edwin.zhai@intel.com wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> All,
> These 2 patches upgrade libfm and pcmanfm. Pls. help to review and pull.
>
> Thanks,
> Edwin
>
> The following changes since commit 0d8c8cf462e5df446669355b554b3d5fdc532a11:
>
>    mutter: update to 2.29.1 and fix SRC_URI (2011-10-07 11:35:50 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib gzhai/master2
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/master2
>
> Zhai Edwin (2):
>    libfm: Upgrade to 0.1.16
>    pcmanfm: Upgrade to 0.9.9
>
>   .../pcmanfm/files/owl-window-menu.patch            |   53 ++++++++++----------
>   .../pcmanfm/{pcmanfm_0.9.8.bb =>  pcmanfm_0.9.9.bb} |    6 +-
>   .../libfm/libfm-0.1.14/use_deprecate_func.patch    |   13 -----
>   .../libfm/libfm-0.1.16/configure_fix.patch         |   19 +++++++
>   .../libfm/{libfm_0.1.14.bb =>  libfm_0.1.16.bb}     |    8 ++--
>   5 files changed, 52 insertions(+), 47 deletions(-)
>   rename meta/recipes-sato/pcmanfm/{pcmanfm_0.9.8.bb =>  pcmanfm_0.9.9.bb} (87%)
>   delete mode 100644 meta/recipes-support/libfm/libfm-0.1.14/use_deprecate_func.patch
>   create mode 100644 meta/recipes-support/libfm/libfm-0.1.16/configure_fix.patch
>   rename meta/recipes-support/libfm/{libfm_0.1.14.bb =>  libfm_0.1.16.bb} (73%)
>

Merged into OE-Core

Thanks
	Sau!

>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>