From 68db6eb60ed994a18abc65704cf8c8c7bcc18f9f Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 30 Dec 2004 21:40:07 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2004/12/30 21:33:36+00:00 nexus.co.uk!pb add xauth to meta-gpe so that X forwarding over ssh works 2004/12/30 21:25:27+00:00 nexus.co.uk!pb apply patch from Bob Davies to correct serial port device naming in gpe-conf 2004/12/30 21:16:44+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2004/12/30 21:16:21+00:00 nexus.co.uk!pb add xdemineur to gpe-games task package 2004/12/30 21:55:32+01:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2004/12/30 20:53:08+00:00 nexus.co.uk!pb add patch for "wifi monitor always appears on far left" bug 2004/12/30 21:52:59+01:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2004/12/30 21:52:40+01:00 dyndns.org!reenoo gpe-filemanager: add missing RRECOMMENDS on gnome-vfs-plugin-file. Thanks to Jelle Kalf for spotting this. 2004/12/30 20:47:26+00:00 nexus.co.uk!pb update gpe-appmgr to 2.6 2004/12/30 20:42:17+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2004/12/30 20:41:53+00:00 nexus.co.uk!pb apply libxfont patch to fix crash when no core fonts are installed BKrev: 41d475b7RK7vCbYGeNALrUvhepK0QQ --- packages/gpe-appmgr/gpe-appmgr_2.6.bb | 0 packages/gpe-conf/gpe-conf-0.1.22/serial_tts.patch | 0 packages/gpe-conf/gpe-conf_0.1.22.bb | 26 +++++ packages/gpe-filemanager/gpe-filemanager_0.20.bb | 10 ++ .../matchbox-panel-0.8.3/wifi-location.patch | 0 packages/matchbox-panel/matchbox-panel_0.8.3.bb | 19 ++++ packages/meta/meta-gpe.bb | 105 +++++++++++++++++++++ packages/xfont/files/scalable.patch | 0 packages/xfont/xfont_1.4.2.bb | 20 ++++ packages/xfont/xfont_cvs.bb | 20 ++++ 10 files changed, 200 insertions(+) create mode 100644 packages/gpe-appmgr/gpe-appmgr_2.6.bb create mode 100644 packages/gpe-conf/gpe-conf-0.1.22/serial_tts.patch create mode 100644 packages/matchbox-panel/matchbox-panel-0.8.3/wifi-location.patch create mode 100644 packages/xfont/files/scalable.patch diff --git a/packages/gpe-appmgr/gpe-appmgr_2.6.bb b/packages/gpe-appmgr/gpe-appmgr_2.6.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-conf/gpe-conf-0.1.22/serial_tts.patch b/packages/gpe-conf/gpe-conf-0.1.22/serial_tts.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-conf/gpe-conf_0.1.22.bb b/packages/gpe-conf/gpe-conf_0.1.22.bb index e69de29bb2..57c74f866f 100644 --- a/packages/gpe-conf/gpe-conf_0.1.22.bb +++ b/packages/gpe-conf/gpe-conf_0.1.22.bb @@ -0,0 +1,26 @@ +PR = "r4" + +inherit gpe + +SRC_URI += "file://gpe-conf-0.1.22-20041124.patch;patch=1;pnum=0 \ + file://desktop-categories.patch;patch=1 \ + file://fix-wificonfig.patch;patch=1;pnum=0 \ + file://serial_tts.patch;patch=1" + +DEPENDS = "gtk+ libgpewidget libxsettings libxsettings-client pcmcia-cs xst xset ipaq-sleep ntp gpe-login gpe-icons" +RDEPENDS_${PN} = "xst xset ipaq-sleep ntpdate gpe-login gpe-icons" +SECTION = "gpe" +PRIORITY = "optional" +FILES_${PN} = "${sysconfdir} ${bindir} ${datadir}/pixmaps \ + ${datadir}/applications ${datadir}/gpe/pixmaps \ + ${datadir}/gpe-conf" + +do_compile () { + oe_runmake PREFIX=${prefix} + oe_runmake all-desktop PREFIX=${prefix} +} + +do_install () { + oe_runmake PREFIX=${prefix} DESTDIR=${D} install-program +} + diff --git a/packages/gpe-filemanager/gpe-filemanager_0.20.bb b/packages/gpe-filemanager/gpe-filemanager_0.20.bb index e69de29bb2..3dbd40cf51 100644 --- a/packages/gpe-filemanager/gpe-filemanager_0.20.bb +++ b/packages/gpe-filemanager/gpe-filemanager_0.20.bb @@ -0,0 +1,10 @@ +inherit gpe + +DESCRIPTION = "GPE file manager" +DEPENDS = "libgpewidget gnome-vfs dbus" +SECTION = "gpe" +RDEPENDS = "gpe-icons" +RRECOMMENDS = "gnome-vfs-plugin-file" +PR = "r1" + +FILES_${PN} += " ${datadir}/gpe" diff --git a/packages/matchbox-panel/matchbox-panel-0.8.3/wifi-location.patch b/packages/matchbox-panel/matchbox-panel-0.8.3/wifi-location.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/matchbox-panel/matchbox-panel_0.8.3.bb b/packages/matchbox-panel/matchbox-panel_0.8.3.bb index e69de29bb2..1566cce487 100644 --- a/packages/matchbox-panel/matchbox-panel_0.8.3.bb +++ b/packages/matchbox-panel/matchbox-panel_0.8.3.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Matchbox Window Manager Panel" +LICENSE = "GPL" +DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel" +SECTION = "x11/wm" +PR = "r1" + +SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \ + file://make-batteryapp-less-strict.patch;patch=1 \ + file://wifi-location.patch;patch=1" +S = "${WORKDIR}/matchbox-panel-${PV}" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF = "--enable-startup-notification --enable-dnotify --enable-small-icons" + +FILES_${PN} = "${bindir} \ + ${datadir}/applications \ + ${datadir}/pixmaps" + diff --git a/packages/meta/meta-gpe.bb b/packages/meta/meta-gpe.bb index e69de29bb2..60334d62dc 100644 --- a/packages/meta/meta-gpe.bb +++ b/packages/meta/meta-gpe.bb @@ -0,0 +1,105 @@ +PACKAGES = gpe-base-depends gpe-task-base gpe-task-settings gpe-task-pim gpe-task-apps gpe-task-games +DESCRIPTION = "Meta-package for GPE Palmtop Environment" +MAINTAINER = "Phil Blundell " +PR = "r26" + +ALLOW_EMPTY = 1 + +gpe-base-depends = "\ + diet-x11 \ + virtual/xserver" + +RDEPENDS_gpe-base-depends := "${gpe-base-depends}" +DEPENDS += " ${gpe-base-depends}" + +gpe-task-base = "\ + bluez-utils-dbus \ + matchbox \ + xcursor-transparent-theme \ + rxvt-unicode \ + gtk2-theme-angelistic \ + xst \ + xprop \ + xhost \ + xrdb \ + gpe-soundserver \ + ttf-bitstream-vera \ + gpe-dm \ + gpe-login \ + gpe-session-scripts \ + gpe-icons \ + gpe-confd \ + gpe-autostarter \ + gpe-bootsplash \ + libgtkstylus \ + gpe-appmgr \ + detect-stylus \ + xauth" + +RDEPENDS_gpe-task-base := "gdk-pixbuf-loader-png \ + gdk-pixbuf-loader-xpm \ + gdk-pixbuf-loader-jpeg \ + pango-module-basic-x \ + pango-module-basic-fc \ + ${gpe-task-base}" +DEPENDS += " ${gpe-task-base}" + +gpe-task-pim = "\ + gpe-timesheet \ + gpe-todo \ + gpe-calendar \ + gpe-sketchbook \ + gpe-contacts \ + gpe-today \ + figment" +RDEPENDS_gpe-task-pim := "${gpe-task-pim}" +DEPENDS += " ${gpe-task-pim}" + +gpe-task-settings = "\ + matchbox-panel-manager \ + gpe-bluetooth \ + gpe-beam \ + gpe-su \ + gpe-conf \ + gpe-clock \ + gpe-mininet \ + gpe-mixer \ + gpe-package \ + gpe-shield \ + gpe-taskmanager \ + keylaunch \ + minilite \ + xmonobut" + +RDEPENDS_gpe-task-settings := "${gpe-task-settings}" +DEPENDS += " ${gpe-task-settings}" + +gpe-task-apps = "\ + gpe-edit \ + gpe-gallery \ + gpe-calculator \ + gpe-clock \ + gpe-plucker \ + gpe-terminal \ + gpe-watch \ + gpe-what \ + matchbox-panel-hacks \ + gpe-aerial \ + mbmerlin \ + miniclipboard \ + rosetta" + +RDEPENDS_gpe-task-apps := "${gpe-task-apps}" +DEPENDS += " ${gpe-task-apps}" + +gpe-task-games = "\ + gpe-tetris \ + gpe-othello \ + xdemineur \ + gweled" + +RDEPENDS_gpe-task-games := "${gpe-task-games}" +DEPENDS += "${gpe-task-games}" + +DEPENDS += "matchbox-themes-extra gtk-industrial-engine" + diff --git a/packages/xfont/files/scalable.patch b/packages/xfont/files/scalable.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/xfont/xfont_1.4.2.bb b/packages/xfont/xfont_1.4.2.bb index e69de29bb2..a709e86092 100644 --- a/packages/xfont/xfont_1.4.2.bb +++ b/packages/xfont/xfont_1.4.2.bb @@ -0,0 +1,20 @@ +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xtrans zlib" +DESCRIPTION = "X font library (used by the X server)." +PR = "r1" + +SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ + file://scalable.patch;patch=1" +S = "${WORKDIR}/libXfont-${PV}" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/packages/xfont/xfont_cvs.bb b/packages/xfont/xfont_cvs.bb index e69de29bb2..0ee323a2b3 100644 --- a/packages/xfont/xfont_cvs.bb +++ b/packages/xfont/xfont_cvs.bb @@ -0,0 +1,20 @@ +PV = "0.0cvs${CVSDATE}" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert " +DEPENDS = "xproto xtrans zlib" +DESCRIPTION = "X font library (used by the X server)." + +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont \ + file://scalable.patch;patch=1" +S = "${WORKDIR}/Xfont" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} -- cgit v1.2.3