[STABLE][PATCH] places: add patch to fix API change introduced by SRCREV bump

[STABLE][PATCH] places: add patch to fix API change introduced by SRCREV bump

[Koen Kooi]

From: Koen Kooi <koen@openembedded.org>


Signed-off-by: Koen Kooi <koen@openembedded.org>
---
 recipes/e17/places/fix-api.diff |   53 +++++++++++++++++++++++++++++++++++++++
 recipes/e17/places_svn.bb       |    4 ++-
 2 files changed, 56 insertions(+), 1 deletions(-)
 create mode 100644 recipes/e17/places/fix-api.diff

diff --git a/recipes/e17/places/fix-api.diff b/recipes/e17/places/fix-api.diff
new file mode 100644
index 0000000..ef09d25
--- /dev/null
+++ b/recipes/e17/places/fix-api.diff
@@ -0,0 +1,53 @@
+Index: trunk/E-MODULES-EXTRA/places/src/e_mod_places.c
+===================================================================
+--- trunk/E-MODULES-EXTRA/places/src/e_mod_places.c (revision 39774)
++++ trunk/E-MODULES-EXTRA/places/src/e_mod_places.c (revision 39830)
+@@ -371,5 +371,5 @@
+                e_menu_item_label_set(mi, alias ? alias :
+                                         ecore_file_file_get(uri->path));
+-               e_util_menu_item_icon_theme_set(mi, "folder");
++               e_util_menu_item_theme_icon_set(mi, "folder");
+                e_menu_item_callback_set(mi, _places_run_fm, strdup(uri->path)); //TODO free somewhere
+             }
+@@ -398,5 +398,5 @@
+       mi = e_menu_item_new(em);
+       e_menu_item_label_set(mi, D_("Home"));
+-      e_util_menu_item_icon_theme_set(mi, "user-home");
++      e_util_menu_item_theme_icon_set(mi, "user-home");
+       e_menu_item_callback_set(mi, _places_run_fm, (char*)e_user_homedir_get());
+    }
+@@ -407,5 +407,5 @@
+       mi = e_menu_item_new(em);
+       e_menu_item_label_set(mi, D_("Desktop"));
+-      e_util_menu_item_icon_theme_set(mi, "user-desktop");
++      e_util_menu_item_theme_icon_set(mi, "user-desktop");
+       snprintf(buf, sizeof(buf), "%s/Desktop", (char*)e_user_homedir_get());
+       e_menu_item_callback_set(mi, _places_run_fm, strdup(buf)); //TODO free somewhere
+@@ -417,5 +417,5 @@
+       mi = e_menu_item_new(em);
+       e_menu_item_label_set(mi, D_("Trash"));
+-      e_util_menu_item_icon_theme_set(mi, "folder");
++      e_util_menu_item_theme_icon_set(mi, "folder");
+       e_menu_item_callback_set(mi, _places_run_fm, "trash:///");
+    }
+@@ -426,5 +426,5 @@
+       mi = e_menu_item_new(em);
+       e_menu_item_label_set(mi, D_("Filesystem"));
+-      e_util_menu_item_icon_theme_set(mi, "drive-harddisk");
++      e_util_menu_item_theme_icon_set(mi, "drive-harddisk");
+       e_menu_item_callback_set(mi, _places_run_fm, "/");
+    }
+@@ -435,5 +435,5 @@
+       mi = e_menu_item_new(em);
+       e_menu_item_label_set(mi, D_("Temp"));
+-      e_util_menu_item_icon_theme_set(mi, "user-temp");
++      e_util_menu_item_theme_icon_set(mi, "user-temp");
+       e_menu_item_callback_set(mi, _places_run_fm, "/tmp");
+    }
+@@ -498,5 +498,5 @@
+    mi = e_menu_item_new(em);
+    e_menu_item_label_set(mi, D_("Places"));
+-   e_util_menu_item_icon_theme_set(mi, "system-file-manager");
++   e_util_menu_item_theme_icon_set(mi, "system-file-manager");
+ 
+    m = e_menu_new();
diff --git a/recipes/e17/places_svn.bb b/recipes/e17/places_svn.bb
index dc0961f..4aeaed2 100644
--- a/recipes/e17/places_svn.bb
+++ b/recipes/e17/places_svn.bb
@@ -1,10 +1,12 @@
 LICENSE = "GPLv3 LGPLv3"
 PV = "0.1.0+svnr${SRCREV}"
 
-PR = "r2"
+PR = "r3"
 
 require e-module.inc
 
+SRC_URI += "file://fix-api.diff;patch=1;maxrev=39830;pnum=3"
+
 # Calls /usr/bin/eject for media
 RRECOMMENDS_${PN} += "eject"
 
-- 
1.5.6.5

Re: [STABLE][PATCH] places: add patch to fix API change introduced by SRCREV bump

[Koen Kooi]

Any comments on this one? Without the patch the applet won't launch:

http://scap.linuxtogo.org/files/d5103ea0b270cdafb84aeffb1ead7750.png

regards,

Koen

On 02-04-09 08:44, Koen Kooi wrote:
> From: Koen Kooi<koen@openembedded.org>
>
>
> Signed-off-by: Koen Kooi<koen@openembedded.org>
> ---
>   recipes/e17/places/fix-api.diff |   53 +++++++++++++++++++++++++++++++++++++++
>   recipes/e17/places_svn.bb       |    4 ++-
>   2 files changed, 56 insertions(+), 1 deletions(-)
>   create mode 100644 recipes/e17/places/fix-api.diff
>
> diff --git a/recipes/e17/places/fix-api.diff b/recipes/e17/places/fix-api.diff
> new file mode 100644
> index 0000000..ef09d25
> --- /dev/null
> +++ b/recipes/e17/places/fix-api.diff
> @@ -0,0 +1,53 @@
> +Index: trunk/E-MODULES-EXTRA/places/src/e_mod_places.c
> +===================================================================
> +--- trunk/E-MODULES-EXTRA/places/src/e_mod_places.c (revision 39774)
> ++++ trunk/E-MODULES-EXTRA/places/src/e_mod_places.c (revision 39830)
> +@@ -371,5 +371,5 @@
> +                e_menu_item_label_set(mi, alias ? alias :
> +                                         ecore_file_file_get(uri->path));
> +-               e_util_menu_item_icon_theme_set(mi, "folder");
> ++               e_util_menu_item_theme_icon_set(mi, "folder");
> +                e_menu_item_callback_set(mi, _places_run_fm, strdup(uri->path)); //TODO free somewhere
> +             }
> +@@ -398,5 +398,5 @@
> +       mi = e_menu_item_new(em);
> +       e_menu_item_label_set(mi, D_("Home"));
> +-      e_util_menu_item_icon_theme_set(mi, "user-home");
> ++      e_util_menu_item_theme_icon_set(mi, "user-home");
> +       e_menu_item_callback_set(mi, _places_run_fm, (char*)e_user_homedir_get());
> +    }
> +@@ -407,5 +407,5 @@
> +       mi = e_menu_item_new(em);
> +       e_menu_item_label_set(mi, D_("Desktop"));
> +-      e_util_menu_item_icon_theme_set(mi, "user-desktop");
> ++      e_util_menu_item_theme_icon_set(mi, "user-desktop");
> +       snprintf(buf, sizeof(buf), "%s/Desktop", (char*)e_user_homedir_get());
> +       e_menu_item_callback_set(mi, _places_run_fm, strdup(buf)); //TODO free somewhere
> +@@ -417,5 +417,5 @@
> +       mi = e_menu_item_new(em);
> +       e_menu_item_label_set(mi, D_("Trash"));
> +-      e_util_menu_item_icon_theme_set(mi, "folder");
> ++      e_util_menu_item_theme_icon_set(mi, "folder");
> +       e_menu_item_callback_set(mi, _places_run_fm, "trash:///");
> +    }
> +@@ -426,5 +426,5 @@
> +       mi = e_menu_item_new(em);
> +       e_menu_item_label_set(mi, D_("Filesystem"));
> +-      e_util_menu_item_icon_theme_set(mi, "drive-harddisk");
> ++      e_util_menu_item_theme_icon_set(mi, "drive-harddisk");
> +       e_menu_item_callback_set(mi, _places_run_fm, "/");
> +    }
> +@@ -435,5 +435,5 @@
> +       mi = e_menu_item_new(em);
> +       e_menu_item_label_set(mi, D_("Temp"));
> +-      e_util_menu_item_icon_theme_set(mi, "user-temp");
> ++      e_util_menu_item_theme_icon_set(mi, "user-temp");
> +       e_menu_item_callback_set(mi, _places_run_fm, "/tmp");
> +    }
> +@@ -498,5 +498,5 @@
> +    mi = e_menu_item_new(em);
> +    e_menu_item_label_set(mi, D_("Places"));
> +-   e_util_menu_item_icon_theme_set(mi, "system-file-manager");
> ++   e_util_menu_item_theme_icon_set(mi, "system-file-manager");
> +
> +    m = e_menu_new();
> diff --git a/recipes/e17/places_svn.bb b/recipes/e17/places_svn.bb
> index dc0961f..4aeaed2 100644
> --- a/recipes/e17/places_svn.bb
> +++ b/recipes/e17/places_svn.bb
> @@ -1,10 +1,12 @@
>   LICENSE = "GPLv3 LGPLv3"
>   PV = "0.1.0+svnr${SRCREV}"
>
> -PR = "r2"
> +PR = "r3"
>
>   require e-module.inc
>
> +SRC_URI += "file://fix-api.diff;patch=1;maxrev=39830;pnum=3"
> +
>   # Calls /usr/bin/eject for media
>   RRECOMMENDS_${PN} += "eject"
>

Re: [STABLE][PATCH] places: add patch to fix API change introduced by SRCREV bump

[Marcin Juszkiewicz]

Dnia czwartek, 2 kwietnia 2009 o 08:44:11 Koen Kooi napisał(a):
> From: Koen Kooi <koen@openembedded.org>
>
>
> Signed-off-by: Koen Kooi <koen@openembedded.org>

Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>

Regards, 
-- 
JID:      hrw@jabber.org
Website:  http://marcin.juszkiewicz.com.pl/
LinkedIn: http://www.linkedin.com/in/marcinjuszkiewicz