OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e35772d79306d1d9de19c12b23681618532d.

3 files changed, 102 insertions, 0 deletions

diff --git a/org.handhelds.familiar/packages/gpe-appmgr/files/cairo-fixes.patch b/org.handhelds.familiar/packages/gpe-appmgr/files/cairo-fixes.patch
new file mode 100644
index 0000000..e59311d
--- /dev/null
+++ b/org.handhelds.familiar/packages/gpe-appmgr/files/cairo-fixes.patch
@@ -0,0 +1,48 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- gpe-appmgr-2.8/row_view.c~cairo-fixes.patch
++++ gpe-appmgr-2.8/row_view.c
+@@ -158,34 +158,33 @@
+   gv = gdk_window_get_visual (programs_fixed->window);
+   gcm = gdk_drawable_get_colormap (programs_fixed->window);
+ 
+-  cr = cairo_create ();
+   surface = cairo_xlib_surface_create (GDK_WINDOW_XDISPLAY (pixmap), GDK_WINDOW_XWINDOW (pixmap), 
+ 				       gdk_x11_visual_get_xvisual (gv), 0, 
+ 				       gdk_x11_colormap_get_xcolormap (gcm));
+ 
+-  cairo_set_target_surface (cr, surface);
++  cr = cairo_create (surface);
+ 
+-  cairo_set_rgb_color (cr, 1.0, 1.0, 1.0);
++  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+   cairo_rectangle (cr, 0, 0, LABEL_WIDTH, height);
+   cairo_fill (cr);
+ 
+-  cairo_set_rgb_color (cr, 0xa5 / 255.0, 0xae / 255.0, 0xbf / 255.0);
++  cairo_set_source_rgb (cr, 0xa5 / 255.0, 0xae / 255.0, 0xbf / 255.0);
+   cairo_move_to (cr, LABEL_WIDTH, 0);
+   cairo_line_to (cr, 0, 0);
+   cairo_line_to (cr, 0, height);
+   cairo_line_to (cr, LABEL_WIDTH, height);
+   cairo_stroke (cr);
+ 
+-  cairo_select_font (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
++  cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
+ 		     CAIRO_FONT_WEIGHT_NORMAL);
+-  cairo_scale_font (cr, 14.0);
++  cairo_set_font_size (cr, 14.0);
+ 
+   cairo_text_extents (cr, text, &extents);
+ 
+   cairo_move_to (cr, 18, (height + extents.width) / 2);
+ 
+   cairo_rotate (cr, -M_PI/2);
+-  cairo_set_rgb_color (cr, 0, 0, 1.0);
++  cairo_set_source_rgb (cr, 0, 0, 1.0);
+   cairo_show_text (cr, text);
+ 
+   cairo_destroy (cr);
diff --git a/org.handhelds.familiar/packages/gpe-appmgr/files/no-render-h.patch b/org.handhelds.familiar/packages/gpe-appmgr/files/no-render-h.patch
new file mode 100644
index 0000000..7bd08bb
--- /dev/null
+++ b/org.handhelds.familiar/packages/gpe-appmgr/files/no-render-h.patch
@@ -0,0 +1,44 @@
+diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c gpe-appmgr-2.8/main.c
+--- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/main.c	2005-03-04 07:00:40 +00:00
++++ gpe-appmgr-2.8/main.c	2005-04-28 12:21:53 +01:00
+@@ -50,7 +50,6 @@
+ /* GPE */
+ #include <gpe/init.h>
+ #include <gpe/pixmaps.h>
+-#include <gpe/render.h>
+ #include <gpe/spacing.h>
+ #include <gpe/gpeiconlistview.h>
+ #include <gpe/gpeiconlistitem.h>
+diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c gpe-appmgr-2.8/row_view.c
+--- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/row_view.c	2005-01-05 21:14:47 +00:00
++++ gpe-appmgr-2.8/row_view.c	2005-04-28 12:22:07 +01:00
+@@ -43,7 +43,6 @@
+ /* GPE */
+ #include <gpe/init.h>
+ #include <gpe/pixmaps.h>
+-#include <gpe/render.h>
+ #include <gpe/spacing.h>
+ #include <gpe/gpeiconlistview.h>
+ #include <gpe/launch.h>
+diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c gpe-appmgr-2.8/single_view.c
+--- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/single_view.c	2004-11-19 00:22:09 +00:00
++++ gpe-appmgr-2.8/single_view.c	2005-04-28 12:22:15 +01:00
+@@ -39,7 +39,6 @@
+ /* GPE */
+ #include <gpe/init.h>
+ #include <gpe/pixmaps.h>
+-#include <gpe/render.h>
+ #include <gpe/spacing.h>
+ #include <gpe/gpeiconlistview.h>
+ #include <gpe/tray.h>
+diff -urNd ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/tab_view.c gpe-appmgr-2.8/tab_view.c
+--- ../gpe-appmgr-2.8-r0/gpe-appmgr-2.8/tab_view.c	2005-03-04 07:14:43 +00:00
++++ gpe-appmgr-2.8/tab_view.c	2005-04-28 12:22:22 +01:00
+@@ -46,7 +46,6 @@
+ /* GPE */
+ #include <gpe/init.h>
+ #include <gpe/pixmaps.h>
+-#include <gpe/render.h>
+ #include <gpe/spacing.h>
+ #include <gpe/gpeiconlistitem.h>
+ #include <gpe/gpeiconlistview.h>
diff --git a/org.handhelds.familiar/packages/gpe-appmgr/gpe-appmgr_2.8.bb b/org.handhelds.familiar/packages/gpe-appmgr/gpe-appmgr_2.8.bb
new file mode 100644
index 0000000..e403382
--- /dev/null
+++ b/org.handhelds.familiar/packages/gpe-appmgr/gpe-appmgr_2.8.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "GPE application launcher"
+DEPENDS = "libgpewidget libgpelaunch cairo libxsettings-client"
+SECTION = "gpe"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+PR = "r1"
+
+inherit gpe
+
+SRC_URI += " file://no-render-h.patch;patch=1 file://cairo-fixes.patch;patch=1"