Merge bk://openembedded@openembedded.bkbits.net/packages

into chris.(none):/home/cwiiis/oe/packages

2004/09/20 20:28:32+01:00 (none)!cwiiis
* Update gpe-contacts (0.29)
* Update gpe-filemanager (0.20)
* Add gsoko (0.4.2-gpe5)
* Add the above packages to meta-gpe and remove gal
* Make openzaurus-3.5.1 prefer updated gpe-contacts and gpe-filemanager

2004/09/20 14:43:25+01:00 (none)!cwiiis
* Fix libgpewidget headers
* Add gpe-filemanager 0.20
* Add gpe-contacts 0.29

BKrev: 414f2fd9sQBB8ymZ4mjb4FCKVNWE1Q

diff --git a/conf/openzaurus-3.5.1.conf b/conf/openzaurus-3.5.1.conf
index 394a809..c26bf2b 100644 (file)
--- a/conf/openzaurus-3.5.1.conf
+++ b/conf/openzaurus-3.5.1.conf
@@ -241,7 +241,7 @@ PREFERRED_VERSION_gpe-soundserver = "0.4-1"
 PREFERRED_VERSION_gpe-todo = "0.48"
 PREFERRED_VERSION_gpe-calendar = "0.56"
 PREFERRED_VERSION_gpe-sketchbox = "0.2.8"
-PREFERRED_VERSION_gpe-contacts = "0.28"
+PREFERRED_VERSION_gpe-contacts = "0.29"
 PREFERRED_VERSION_gpe-today = "0.08"
 PREFERRED_VERSION_matchbox-panel-manager = "0.1"
 PREFERRED_VERSION_dbus = "0.21"
@@ -264,7 +264,7 @@ PREFERRED_VERSION_gpe-package = "0.0.12"
 PREFERRED_VERSION_gpe-terminal = "1.1"
 PREFERRED_VERSION_gpe-watch = "0.10"
 PREFERRED_VERSION_gpe-what = "0.31"
-PREFERRED_VERSION_gpe-filemanager = "0.17"
+PREFERRED_VERSION_gpe-filemanager = "0.20"
 PREFERRED_VERSION_gpe-go = "0.05"
 PREFERRED_VERSION_gpe-irc = "0.07"
 PREFERRED_VERSION_gpe-lights = "0.12"

diff --git a/gpe-contacts/gpe-contacts_0.29.oe b/gpe-contacts/gpe-contacts_0.29.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gpe-filemanager/gpe-filemanager_0.20.oe b/gpe-filemanager/gpe-filemanager_0.20.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch b/gsoko/gsoko-0.4.2-gpe5/fix_makefiles.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gsoko/gsoko_0.4.2-gpe5.oe b/gsoko/gsoko_0.4.2-gpe5.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/libgpewidget/libgpewidget_0.90.oe b/libgpewidget/libgpewidget_0.90.oe
index e69de29..3cd1a1b 100644 (file)
--- a/libgpewidget/libgpewidget_0.90.oe
+++ b/libgpewidget/libgpewidget_0.90.oe
@@ -0,0 +1,24 @@
+PR = "r1"
+DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ cairo libxrender"
+
+inherit pkgconfig gpe
+
+headers = "init.h render.h errorbox.h smallbox.h pixmaps.h gpetimesel.h gtkdatecombo.h dirbrowser.h stylus.h picturebutton.h popup_menu.h spacing.h translabel.h question.h windows.h gpe-iconlist.h gtksimplemenu.h gpewindowlist.h tray.h popup.h gpeiconlistview.h gpehelp.h gpeiconlistitem.h gpeclockface.h infoprint.h"
+
+do_stage () {
+       oe_libinstall -so libgpewidget ${STAGING_LIBDIR}
+
+       mkdir -p ${STAGING_INCDIR}/gpe
+       for h in ${headers}; do
+               install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
+       done
+}
+
+do_install_append () {
+       oe_runmake PREFIX='${prefix}' DESTDIR='${D}' install-devel
+}
+

diff --git a/meta/meta-gpe.oe b/meta/meta-gpe.oe
index 88bda7c..d4eb064 100644 (file)
--- a/meta/meta-gpe.oe
+++ b/meta/meta-gpe.oe
@@ -81,7 +81,8 @@ gpe-task-games = "\
     gpe-go \
     gpe-lights \
     gpe-othello \
-    gpe-tetris"
+    gpe-tetris \
+    gsoko"
 
 RDEPENDS_gpe-task-games := "${gpe-task-games}"
 DEPENDS += " ${gpe-task-games}"
@@ -97,7 +98,6 @@ DEPENDS += " ${gpe-task-gtkapps}"
 
 gpe-task-gnomeapps = "\
     gail \
-    gal \
     galculator \
     gnumeric \
     gpdf \