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

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

2004/09/16 14:05:29+01:00 (none)!cwiiis
Change a lot of gpe-related default settings.

2004/09/16 09:31:39+01:00 (none)!cwiiis
Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/09/16 09:31:28+01:00 (none)!cwiiis
Fix dillo2 building.

BKrev: 41498fa75yPDm4sTXLO7rcKzyq0xaA

10 files changed, 50 insertions, 6 deletions

diff --git a/dillo/dillo2_0.6.6.oe b/dillo/dillo2_0.6.6.oe
index da8f00fe8e..a5ba37fb22 100644
--- a/dillo/dillo2_0.6.6.oe
+++ b/dillo/dillo2_0.6.6.oe
@@ -2,8 +2,8 @@ DESCRIPTION = "Lightweight gtk+2 browser."
 DEPENDS = "gtk+"
 RDEPENDS = "gdk-pixbuf-loader-xpm"
 SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.gz \
-         file://gtk2.patch;patch=1 \
-	 file://fix_about_syntax.patch;patch=1 \
+         file://gtk2.patch;patch=1;pnum=1 \
+	 file://fix_about_syntax.patch;patch=1;pnum=1 \
 	 file://dillo.desktop \
 	 file://dillo.png \
 	 file://dillorc"
@@ -11,6 +11,8 @@ SRC_URI="http://www.dillo.org/download/dillo-${PV}.tar.gz \
 MAINTAINER = "Chris Lord <cwiiis@handhelds.org>"
 PRIORITY = "optional"
 
+S = ${WORKDIR}/dillo-${PV}/
+
 inherit autotools pkgconfig
 
 do_install() {
diff --git a/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch b/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-clock/gpe-clock-0.14/default-time-24hrs.patch
diff --git a/gpe-clock/gpe-clock_0.14.oe b/gpe-clock/gpe-clock_0.14.oe
index e69de29bb2..666e6e82bd 100644
--- a/gpe-clock/gpe-clock_0.14.oe
+++ b/gpe-clock/gpe-clock_0.14.oe
@@ -0,0 +1,12 @@
+inherit gpe
+
+DESCRIPTION = "GPE panel clock"
+DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd"
+RDEPENDS = "gpe-announce atd"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r1"
+
+SRC_URI = "${GPE_MIRROR}/${PN}-${PV}.tar.gz \
+	   file://default-time-24hrs.patch;patch=1"
diff --git a/gpe-login/gpe-login-0.73/smaller-default-icon-size.patch b/gpe-login/gpe-login-0.73/smaller-default-icon-size.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-login/gpe-login-0.73/smaller-default-icon-size.patch
diff --git a/gpe-login/gpe-login_0.73.oe b/gpe-login/gpe-login_0.73.oe
index e69de29bb2..4fed8ed22a 100644
--- a/gpe-login/gpe-login_0.73.oe
+++ b/gpe-login/gpe-login_0.73.oe
@@ -0,0 +1,12 @@
+inherit gpe
+
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd"
+RPROVIDES = "gpe-session-starter"
+PR = "r1"
+
+SRC_URI += "file://smaller-default-icon-size.patch;patch=1"
diff --git a/gpe-session-scripts/gpe-session-scripts-0.61/change-default-applets.patch b/gpe-session-scripts/gpe-session-scripts-0.61/change-default-applets.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-session-scripts/gpe-session-scripts-0.61/change-default-applets.patch
diff --git a/gpe-session-scripts/gpe-session-scripts_0.61.oe b/gpe-session-scripts/gpe-session-scripts_0.61.oe
index 922a6e714f..7016c8f858 100644
--- a/gpe-session-scripts/gpe-session-scripts_0.61.oe
+++ b/gpe-session-scripts/gpe-session-scripts_0.61.oe
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 inherit gpe
 
@@ -11,7 +11,8 @@ RDEPENDS = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-questi
 DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr"
 
 SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-session-scripts-${PV}.tar.gz \
-	file://zaurus.sh"
+	file://zaurus.sh \
+	file://change-default-applets.patch;patch=1"
 
 do_install_append() {
 	install ${WORKDIR}/zaurus.sh ${D}/etc/X11/Xinit.d/11zaurus
diff --git a/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.oe b/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.oe
index e69de29bb2..5656678127 100644
--- a/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.oe
+++ b/matchbox-panel-hacks/matchbox-panel-hacks_0.3-1.oe
@@ -0,0 +1,16 @@
+DESCRIPTION = "Simple dockapps created with monolaunch and shell script"
+DEPENDS = "matchbox xmodmap"
+SRC_URI = "file://xrandr-panelapp.sh \
+	   file://xrandr-panelapp.desktop \
+	   file://xrandr.png"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+do_install() {
+        install -d ${D}/${bindir}
+        install -d ${D}/${datadir}/applications
+        install -d ${D}/${datadir}/pixmaps
+	install -m 0755 ${WORKDIR}/xrandr-panelapp.sh ${D}/${bindir}/
+	install -m 0644 ${WORKDIR}/xrandr-panelapp.desktop ${D}/${datadir}/applications/
+	install -m 0644 ${WORKDIR}/xrandr.png ${D}/${datadir}/pixmaps/
+}
diff --git a/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch b/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/matchbox-panel/matchbox-panel-0.8.1/make-batteryapp-less-strict.patch
diff --git a/matchbox-panel/matchbox-panel_0.8.1.oe b/matchbox-panel/matchbox-panel_0.8.1.oe
index da78b5ae86..3fe4a58415 100644
--- a/matchbox-panel/matchbox-panel_0.8.1.oe
+++ b/matchbox-panel/matchbox-panel_0.8.1.oe
@@ -1,11 +1,12 @@
-PR = "r3"
+PR = "r4"
 DESCRIPTION = "Matchbox panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
 
 SRC_URI = "ftp://ftp.handhelds.org/matchbox/sources/matchbox-panel/0.8/matchbox-panel-${PV}.tar.bz2 \
 	file://automake-lossage.patch;patch=1 \
-	file://more-automake-lossage.patch;patch=1"
+	file://more-automake-lossage.patch;patch=1 \
+	file://make-batteryapp-less-strict.patch;patch=1"
 S = "${WORKDIR}/matchbox-panel-${PV}"
 
 inherit autotools pkgconfig