summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-11-29 22:19:48 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-11-29 22:19:48 +0000
commit6d476eeca38a34152667a626cd52652133c1d394 (patch)
treefa3f8b0afa528eba8385cffa6cac6b7d37f4813a
parentb3d93ad4b0d9ee14222812127ea4ef39a7f45176 (diff)
Merge bk://oe-devel@oe-devel.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/11/29 20:57:29+00:00 nexus.co.uk!pb bump PR on some more glibc.oes 2004/11/29 20:55:34+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/29 15:57:10-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:packages into handhelds.org:/home/kergoth/code/packages 2004/11/29 20:54:56+00:00 nexus.co.uk!pb remove /etc/rpc from libc6 2004/11/29 20:32:45+00:00 nexus.co.uk!pb tweak displayed groups in gpe-appmgr 2004/11/29 20:24:50+00:00 nexus.co.uk!pb patch minimo.desktop to set Categories=Internet (not PIM) 2004/11/29 20:11:05+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/29 20:10:46+00:00 nexus.co.uk!pb patch Categories in gpe-conf.desktop 2004/11/29 11:59:09-08:00 treke.net!ggilbert Merge ssh://oe-devel@oe-devel.bkbits.net/packages into olddog.home.treke.net:/home/ggilbert/oe/packages 2004/11/29 20:07:25+00:00 nexus.co.uk!pb freshen xserver-kdrive-poodle.patch 2004/11/29 11:58:56-08:00 treke.net!ggilbert opie-mediaplayer2_1.1.7.oe: opie-mediaplayer2_1.1.7.oe: Adding a DEPEND ont he default skin opie-mediaplayer2_cvs.oe: opie-mediaplayer2_cvs.oe: Need to DEPEND on the default skin 2004/11/29 12:58:50-06:00 ti.com!kergoth Bugfix: rather than making the wlan-ng and wireless-tools pre-up scripts exit if IFACE is not wlan*, instead exit on METHOD = loopback. 2004/11/29 12:44:53-06:00 ti.com!kergoth Merge siasl.dyndns.org:code/packages into odin.sc.ti.com:/home/kergoth/code/packages 2004/11/29 12:44:25-06:00 ti.com!kergoth Apply patch to fix a bug in the wireless-tools and wlan-ng pre-up scripts, courtesy Murray Jensen. 2004/11/29 12:49:34-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:packages into handhelds.org:/home/kergoth/code/packages 2004/11/29 17:02:53+00:00 nexus.co.uk!pb add some more packages to meta-gpe, courtesy Florian Boor 2004/11/29 16:54:16+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/29 16:54:01+00:00 nexus.co.uk!pb set CVSDATE_minimo for familiar 0.8.0 2004/11/29 16:52:40+00:00 nexus.co.uk!pb add samba definitions to i386 and i686 site files, courtesy Florian Boor 2004/11/29 15:08:50+01:00 local!hrw fix CVSDATE in 20030402 Tremor snapshot 2004/11/29 13:31:25+00:00 nexus.co.uk!pb add teleport, courtesy Koen Kooi 2004/11/29 13:30:39+00:00 nexus.co.uk!pb new handhelds.org kernels are hh37.4, not hh37.3 2004/11/29 13:30:22+00:00 nexus.co.uk!pb use /proc/cpu/alignment, not /proc/sys/debug/alignment 2004/11/29 13:30:01+00:00 nexus.co.uk!pb delete some redundant SRC_URIs. 2004/11/29 12:35:59+00:00 nexus.co.uk!pb remove redundant url from gpe-nmf SRC_URI 2004/11/29 12:35:16+00:00 nexus.co.uk!pb update handhelds-pxa and handhelds-sa kernels to hh37.3 2004/11/29 12:34:43+00:00 nexus.co.uk!pb add gpe-task-games to meta-gpe PACKAGES 2004/11/29 00:26:00+00:00 nexus.co.uk!pb add /etc/init.d/alignment.sh for arm 2004/11/28 22:43:15+00:00 nexus.co.uk!pb simpad: disable USE_VT, re-enable bigscreen GPE_MACHINE_CLASS 2004/11/28 22:41:59+00:00 nexus.co.uk!pb disable USE_VT for h3600 and h3900 2004/11/28 22:09:42+00:00 nexus.co.uk!pb patch pcmcia-cs to load h3600_generic_sleeve after other modules 2004/11/28 21:52:23+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/packages into stealth.nexus.co.uk:/home/pb/oe/oe-packages 2004/11/28 21:52:04+00:00 nexus.co.uk!pb don't autoload h3600_generic_sleeve. We will load it by hand. 2004/11/28 22:50:21+01:00 hrw.one.pl!hrw zddice: fixed file permissions 2004/11/28 22:39:25+01:00 hrw.one.pl!hrw opie-security: install only needed icons - rest will be in opie-securityplugin-* 2004/11/28 22:30:24+01:00 hrw.one.pl!hrw fixed files permissions in opie-pics 2004/11/28 21:38:39+01:00 hrw.one.pl!hrw added tickypip levels to meta-opie 2004/11/28 21:35:46+01:00 hrw.one.pl!hrw created new package with tickypip levels as they have different license 2004/11/28 20:05:59+00:00 nexus.co.uk!pb add new glibc snapshot, preferred for i686 only 2004/11/28 18:51:29+00:00 nexus.co.uk!pb set GPE_EXTRA_INSTALL in terms of GPE_EXTRA_INSTALL_foo. GPE_EXTRA_DEPENDS_foo is not good enough. 2004/11/28 18:11:30+00:00 nexus.co.uk!pb add figment to gpe-task-pim 2004/11/28 17:54:24+00:00 nexus.co.uk!pb add gtk-industrial-engine to meta-gpe DEPENDS 2004/11/28 17:53:13+00:00 nexus.co.uk!pb update some gpe versions in familiar-0.8.0.conf 2004/11/28 17:51:17+00:00 nexus.co.uk!pb avoid use of orinoco-modules 0.15 on arm until strange BAP write problems are fixed 2004/11/28 17:46:38+00:00 nexus.co.uk!pb add Ximian's gtk-industrial-theme engine 2004/11/28 17:45:18+00:00 nexus.co.uk!pb glib-2.0-native: also install mkinstalldirs into staging 2004/11/28 17:44:48+00:00 nexus.co.uk!pb add glib-gettextize and intltoolize support to autotools.oeclass 2004/11/28 17:31:43+00:00 nexus.co.uk!pb stage more bits for glib-gettextize 2004/11/28 17:14:32+00:00 nexus.co.uk!pb install glib-gettextize into STAGING_BINDIR 2004/11/28 17:12:39+00:00 nexus.co.uk!pb bump PR on hostap and orinoco-modules to force rebuild against latest kernels 2004/11/28 17:11:20+00:00 nexus.co.uk!pb apply WE16 patch to openzaurus-sa also 2004/11/28 15:12:16+00:00 nexus.co.uk!pb set PV appropriately for at76c503a-modules 2004/11/28 12:23:58+00:00 nexus.co.uk!pb patch openzaurus-pxa up to WE16 2004/11/27 21:15:23-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:packages into handhelds.org:/home/kergoth/code/packages 2004/11/27 16:28:57-05:00 handhelds.org!kergoth Add gcc-cross and gcc-cross-initial to the versioned distro .conf files, and remove the lowered default preference on gcc 3.4.3. BKrev: 41aba0843fjH5tnDLiEdn5AJJaSaYg
-rw-r--r--at76c503a/at76c503a-modules_cvs.oe1
-rw-r--r--classes/autotools.oeclass17
-rw-r--r--conf/distro/familiar-0.8.0.conf7
-rw-r--r--conf/distro/openzaurus-3.5.1.conf2
-rw-r--r--conf/distro/openzaurus-3.5.2.conf2
-rw-r--r--conf/machine/h3600.conf1
-rw-r--r--conf/machine/h3900.conf1
-rw-r--r--conf/machine/simpad.conf3
-rw-r--r--gcc/gcc_3.4.3.oe1
-rw-r--r--glib-2.0/glib-2.0-native_2.4.6.oe6
-rw-r--r--glibc/glibc-package.oeclass1
-rw-r--r--glibc/glibc_2.2.5.oe2
-rw-r--r--glibc/glibc_2.3.2+cvs20040726.oe2
-rw-r--r--glibc/glibc_2.3.2.oe2
-rw-r--r--glibc/glibc_2.3.3+cvs20041128.oe0
-rw-r--r--glibc/glibc_2.3.3.oe2
-rw-r--r--gpe-appmgr/files/groups.patch0
-rw-r--r--gpe-appmgr/gpe-appmgr_2.4.oe10
-rw-r--r--gpe-conf/files/desktop-categories.patch0
-rw-r--r--gpe-conf/gpe-conf_0.1.22.oe5
-rw-r--r--gpe-nmf/gpe-nmf_0.17.oe8
-rw-r--r--gpe-ownerinfo/gpe-ownerinfo_0.23.oe2
-rw-r--r--gpe-ownerinfo/gpe-ownerinfo_0.24.oe12
-rw-r--r--gtk-engines/gtk-industrial-engine/no-gtk1.patch0
-rw-r--r--gtk-engines/gtk-industrial-engine_0.2.36.2.oe0
-rw-r--r--hostap/hostap-modules_0.2.5.oe2
-rw-r--r--initscripts/initscripts-1.0/arm/alignment.sh0
-rw-r--r--initscripts/initscripts_1.0.oe9
-rw-r--r--linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqpxa0
-rw-r--r--linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.1.oe3
-rw-r--r--linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh37.4.oe0
-rw-r--r--linux/handhelds-sa-2.4.19-rmk6-pxa1-hh37.4/defconfig-ipaqsa0
-rw-r--r--linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.1.oe3
-rw-r--r--linux/handhelds-sa_2.4.19-rmk6-pxa1-hh37.4.oe0
-rw-r--r--linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe3
-rw-r--r--linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe3
-rw-r--r--meta/gpe-image.oe2
-rw-r--r--meta/meta-gpe.oe15
-rw-r--r--meta/meta-opie.oe3
-rw-r--r--mozilla/files/minimo.desktop0
-rw-r--r--mozilla/minimo_cvs.oe4
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_1.1.7.oe2
-rw-r--r--opie-mediaplayer2/opie-mediaplayer2_cvs.oe2
-rw-r--r--opie-pics/opie-pics_1.1.7.oe11
-rw-r--r--opie-pics/opie-pics_cvs.oe9
-rw-r--r--opie-security/opie-security_1.1.7.oe8
-rw-r--r--opie-security/opie-security_cvs.oe8
-rw-r--r--orinoco/orinoco-modules_0.13e.oe1
-rw-r--r--orinoco/orinoco-modules_0.15rc1.oe3
-rw-r--r--orinoco/orinoco-modules_0.15rc2.oe5
-rw-r--r--pcmcia-cs/files/arm/pcmcia4
-rw-r--r--pcmcia-cs/pcmcia-cs-3.2.8/pcic-extra.patch0
-rw-r--r--pcmcia-cs/pcmcia-cs_3.2.8.oe3
-rw-r--r--site/i386-linux3
-rw-r--r--site/i686-linux3
-rw-r--r--teleport/teleport_0.33.oe0
-rw-r--r--tickypip/tickypip-levels/NetWalk_levels.README0
-rw-r--r--tickypip/tickypip-levels_1.0.oe0
-rw-r--r--tickypip/tickypip_0.1.2.oe33
-rw-r--r--tremor/tremor_20030402.oe28
-rw-r--r--wireless-tools/wireless-tools/wireless-tools.if-pre-up8
-rw-r--r--wlan-ng/files/pre-up9
-rw-r--r--wlan-ng/wlan-ng-modules_0.2.1pre22.oe2
-rw-r--r--xserver/xserver-kdrive/xserver-kdrive-poodle.patch19
-rw-r--r--zddice/zddice_1.0.0.oe3
65 files changed, 230 insertions, 68 deletions
diff --git a/at76c503a/at76c503a-modules_cvs.oe b/at76c503a/at76c503a-modules_cvs.oe
index d13cd34381..1c9dfba06f 100644
--- a/at76c503a/at76c503a-modules_cvs.oe
+++ b/at76c503a/at76c503a-modules_cvs.oe
@@ -4,6 +4,7 @@ SRC_URI = "cvs://anonymous@cvs.berlios.de/cvsroot/at76c503a;module=at76c503a \
file://ipaq.patch;patch=1;pnum=0"
S = "${WORKDIR}/at76c503a"
PR = "r1"
+PV = "0.0cvs${CVSDATE}"
inherit module
diff --git a/classes/autotools.oeclass b/classes/autotools.oeclass
index 98d9b6e43e..86a7f208eb 100644
--- a/classes/autotools.oeclass
+++ b/classes/autotools.oeclass
@@ -94,6 +94,23 @@ autotools_do_configure() {
if ! echo ${EXTRA_AUTORECONF} | grep -q "aclocal"; then
rm -f aclocal.m4
fi
+ if [ -e configure.in ]; then
+ CONFIGURE_AC=configure.in
+ else
+ CONFIGURE_AC=configure.ac
+ fi
+ if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE_AC >/dev/null; then
+ if grep "sed.*POTFILES" configure.ac >/dev/null; then
+ : do nothing -- we still have an old unmodified configure.ac
+ else
+ oenote Executing glib-gettextize --force --copy
+ echo "no" | glib-gettextize --force --copy
+ fi
+ fi
+ if grep "^AC_PROG_INTLTOOL" $CONFIGURE_AC >/dev/null; then
+ oenote Executing intltoolize --copy --force --automake
+ intltoolize --copy --force --automake
+ fi
oenote Executing autoreconf --verbose --install --force ${EXTRA_AUTORECONF} $acpaths
mkdir -p m4
autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths || oefatal "autoreconf execution failed."
diff --git a/conf/distro/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index 82254a3fac..ee960217d7 100644
--- a/conf/distro/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
@@ -7,6 +7,7 @@ FEED_URIS += " \
opie##http://familiar.handhelds.org/releases/v0.8/opie/"
CVSDATE = 20041120
+CVSDATE_minimo = 20040920
PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
PREFERRED_PROVIDERS += "virtual/xserver:xserver-kdrive"
@@ -17,6 +18,8 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
+PREFERRED_VERSION_gcc-cross = "3.4.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
PREFERRED_VERSION_libtool-native = "1.5.6"
PREFERRED_VERSION_libtool-cross= "1.5.6"
PREFERRED_VERSION_qte-for-opie = "2.3.7"
@@ -224,7 +227,7 @@ PREFERRED_VERSION_matchbox-wm = "0.8.4"
PREFERRED_VERSION_matchbox-panel = "0.8.3"
PREFERRED_VERSION_matchbox-applet-inputmanager = "0.5"
PREFERRED_VERSION_gtk+ = "2.4.13"
-PREFERRED_VERSION_libgpewidget = "0.95"
+PREFERRED_VERSION_libgpewidget = "0.96"
PREFERRED_VERSION_libgpepimc = "0.3"
PREFERRED_VERSION_libgpevtype = "0.5"
PREFERRED_VERSION_libschedule = "0.13"
@@ -253,7 +256,7 @@ PREFERRED_VERSION_gpe-su = "0.18"
PREFERRED_VERSION_gpe-conf = "0.1.22"
PREFERRED_VERSION_gpe-clock = "0.14"
PREFERRED_VERSION_gpe-mininet = "0.4"
-PREFERRED_VERSION_gpe-mixer = "0.38"
+PREFERRED_VERSION_gpe-mixer = "0.40"
PREFERRED_VERSION_gpe-shield = "0.6"
PREFERRED_VERSION_gpe-wlancfg = "0.2.6"
PREFERRED_VERSION_gpe-taskmanager = "0.17"
diff --git a/conf/distro/openzaurus-3.5.1.conf b/conf/distro/openzaurus-3.5.1.conf
index f62398d343..48671d9114 100644
--- a/conf/distro/openzaurus-3.5.1.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
@@ -22,6 +22,8 @@ TARGET_FPU = "soft"
#INHIBIT_PACKAGE_STRIP = "1"
PREFERRED_VERSION_binutils-cross = "2.15.91.0.1"
+PREFERRED_VERSION_gcc-cross = "3.4.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
PREFERRED_VERSION_libtool-native = "1.5.6"
PREFERRED_VERSION_libtool-cross= "1.5.6"
PREFERRED_VERSION_qte-for-opie = "2.3.7"
diff --git a/conf/distro/openzaurus-3.5.2.conf b/conf/distro/openzaurus-3.5.2.conf
index 87db7ed5ff..27c435ef27 100644
--- a/conf/distro/openzaurus-3.5.2.conf
+++ b/conf/distro/openzaurus-3.5.2.conf
@@ -26,6 +26,8 @@ TARGET_FPU = "soft"
#ENABLE_SYSREQ = "yes"
PREFERRED_VERSION_binutils-cross = "2.15.91.0.2"
+PREFERRED_VERSION_gcc-cross = "3.4.2"
+PREFERRED_VERSION_gcc-cross-initial = "3.4.2"
PREFERRED_VERSION_libtool-native = "1.5.6"
PREFERRED_VERSION_libtool-cross= "1.5.6"
PREFERRED_VERSION_qte-for-opie = "2.3.7"
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
index 83769104d6..186759b998 100644
--- a/conf/machine/h3600.conf
+++ b/conf/machine/h3600.conf
@@ -31,6 +31,7 @@ usb-char \
usb-eth"
USE_DEVFS = "1"
+USE_VT = "0"
IMAGE_LINGUAS = ""
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index 482e29b5b3..75151b0f83 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -23,6 +23,7 @@ H3900_MODULES_append_kernel26 = " h3900_lcd asic2_ts"
SERIAL_CONSOLE = "115200 tts/0 vt100"
USE_DEVFS_kernel24 = "1"
+USE_VT = "0"
include conf/machine/ipaq-common.conf
include conf/machine/handheld-common.conf
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
index 1ac0946ca3..96f39b3a8c 100644
--- a/conf/machine/simpad.conf
+++ b/conf/machine/simpad.conf
@@ -21,7 +21,8 @@ EXTRA_IMAGEDEPENDS = ""
SERIAL_CONSOLE = "ttySA0 115200 vt100"
USE_DEVFS = "1"
-#GPE_MACHINE_CLASS = "bigscreen"
+GPE_MACHINE_CLASS = "bigscreen"
+USE_VT = "0"
include conf/machine/handheld-common.conf
include conf/machine/tune-strongarm.conf
diff --git a/gcc/gcc_3.4.3.oe b/gcc/gcc_3.4.3.oe
index 04df9fd305..0b23cb5c2d 100644
--- a/gcc/gcc_3.4.3.oe
+++ b/gcc/gcc_3.4.3.oe
@@ -4,7 +4,6 @@ HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
LICENSE = "GPL"
MAINTAINER = "Gerald Britton <gbritton@doomcom.org>"
-DEFAULT_PREFERENCE = "-1"
inherit autotools gettext
diff --git a/glib-2.0/glib-2.0-native_2.4.6.oe b/glib-2.0/glib-2.0-native_2.4.6.oe
index 8d4e85773c..85252fc1e6 100644
--- a/glib-2.0/glib-2.0-native_2.4.6.oe
+++ b/glib-2.0/glib-2.0-native_2.4.6.oe
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "r4"
DESCRIPTION = "GLib is a general-purpose utility library, \
which provides many useful data types, macros, \
type conversions, string utilities, file utilities, a main \
@@ -26,6 +26,7 @@ do_configure_prepend () {
do_stage () {
install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
install -m 0755 gobject/glib-genmarshal ${STAGING_BINDIR}/
+ install -m 0755 glib-gettextize ${STAGING_BINDIR}/
oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
@@ -36,6 +37,9 @@ do_stage () {
install -d ${STAGING_DATADIR}/aclocal
install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+ install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+ install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+ install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
}
do_install () {
diff --git a/glibc/glibc-package.oeclass b/glibc/glibc-package.oeclass
index 6787be74b6..36ca1a4029 100644
--- a/glibc/glibc-package.oeclass
+++ b/glibc/glibc-package.oeclass
@@ -7,6 +7,7 @@ do_install() {
install -m 0644 ${WORKDIR}/etc/ld.so.conf ${D}/${sysconfdir}/
install -d ${D}${libdir}/locale
make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
+ rm -f ${D}/etc/rpc
}
TMP_LOCALE="/tmp/locale/${libdir}/locale"
diff --git a/glibc/glibc_2.2.5.oe b/glibc/glibc_2.2.5.oe
index ba0fbfe24c..91ba169d98 100644
--- a/glibc/glibc_2.2.5.oe
+++ b/glibc/glibc_2.2.5.oe
@@ -1,5 +1,5 @@
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r2"
+PR = "r3"
DESCRIPTION = "GNU C Library"
HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
LICENSE = "LGPL"
diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe
index 4fe381305e..8f6102062e 100644
--- a/glibc/glibc_2.3.2+cvs20040726.oe
+++ b/glibc/glibc_2.3.2+cvs20040726.oe
@@ -6,7 +6,7 @@ PRIORITY = "required"
MAINTAINER = "Phil Blundell <pb@handhelds.org>"
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/glibc-cvs"
-PR = "r12"
+PR = "r13"
GLIBC_ADDONS ?= "linuxthreads"
GLIBC_EXTRA_OECONF ?= ""
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 9adfed6794..d768a72784 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "required"
-PR = "r5"
+PR = "r6"
GLIBC_ADDONS ?= "linuxthreads"
GLIBC_EXTRA_OECONF ?= ""
diff --git a/glibc/glibc_2.3.3+cvs20041128.oe b/glibc/glibc_2.3.3+cvs20041128.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/glibc/glibc_2.3.3+cvs20041128.oe
diff --git a/glibc/glibc_2.3.3.oe b/glibc/glibc_2.3.3.oe
index f81db8952f..3a986fefbb 100644
--- a/glibc/glibc_2.3.3.oe
+++ b/glibc/glibc_2.3.3.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
DESCRIPTION = "GNU C Library"
HOMEPAGE = "http://www.gnu.org/software/libc/libc.html"
LICENSE = "LGPL"
diff --git a/gpe-appmgr/files/groups.patch b/gpe-appmgr/files/groups.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-appmgr/files/groups.patch
diff --git a/gpe-appmgr/gpe-appmgr_2.4.oe b/gpe-appmgr/gpe-appmgr_2.4.oe
index e69de29bb2..d12730041c 100644
--- a/gpe-appmgr/gpe-appmgr_2.4.oe
+++ b/gpe-appmgr/gpe-appmgr_2.4.oe
@@ -0,0 +1,10 @@
+SECTION = "gpe"
+DESCRIPTION = "GPE application launcher"
+DEPENDS = "libgpewidget libgpelaunch"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+LICENSE = "GPL"
+
+inherit gpe
+
+SRC_URI += "file://groups.patch;patch=1"
+
diff --git a/gpe-conf/files/desktop-categories.patch b/gpe-conf/files/desktop-categories.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gpe-conf/files/desktop-categories.patch
diff --git a/gpe-conf/gpe-conf_0.1.22.oe b/gpe-conf/gpe-conf_0.1.22.oe
index c60ad00ba1..830ed0c606 100644
--- a/gpe-conf/gpe-conf_0.1.22.oe
+++ b/gpe-conf/gpe-conf_0.1.22.oe
@@ -1,8 +1,9 @@
-PR = "r1"
+PR = "r2"
inherit gpe
-SRC_URI += "file://gpe-conf-0.1.22-20041124.patch;patch=1;pnum=0"
+SRC_URI += "file://gpe-conf-0.1.22-20041124.patch;patch=1;pnum=0 \
+ file://desktop-categories.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"
diff --git a/gpe-nmf/gpe-nmf_0.17.oe b/gpe-nmf/gpe-nmf_0.17.oe
index e69de29bb2..f9b19a45c5 100644
--- a/gpe-nmf/gpe-nmf_0.17.oe
+++ b/gpe-nmf/gpe-nmf_0.17.oe
@@ -0,0 +1,8 @@
+inherit gpe pkgconfig
+
+DESCRIPTION = "GPE audio player"
+DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
+SECTION = "gpe"
+PRIORITY = "optional"
+
+SRC_URI += "file://fix_makefiles.patch;patch=1"
diff --git a/gpe-ownerinfo/gpe-ownerinfo_0.23.oe b/gpe-ownerinfo/gpe-ownerinfo_0.23.oe
index cc7c3909b4..30e9d06ae1 100644
--- a/gpe-ownerinfo/gpe-ownerinfo_0.23.oe
+++ b/gpe-ownerinfo/gpe-ownerinfo_0.23.oe
@@ -6,8 +6,6 @@ PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
DEPENDS = "gtk+ libgpewidget"
-SRC_URI = "http://gpe.handhelds.org/pub/projects/gpe/source/gpe-ownerinfo-${PV}.tar.gz"
-
do_stage () {
oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
diff --git a/gpe-ownerinfo/gpe-ownerinfo_0.24.oe b/gpe-ownerinfo/gpe-ownerinfo_0.24.oe
index e69de29bb2..30e9d06ae1 100644
--- a/gpe-ownerinfo/gpe-ownerinfo_0.24.oe
+++ b/gpe-ownerinfo/gpe-ownerinfo_0.24.oe
@@ -0,0 +1,12 @@
+inherit gpe
+
+DESCRIPTION = "GPE owner information dialog"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "gtk+ libgpewidget"
+
+do_stage () {
+ oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR}
+ install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/
+}
diff --git a/gtk-engines/gtk-industrial-engine/no-gtk1.patch b/gtk-engines/gtk-industrial-engine/no-gtk1.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk-engines/gtk-industrial-engine/no-gtk1.patch
diff --git a/gtk-engines/gtk-industrial-engine_0.2.36.2.oe b/gtk-engines/gtk-industrial-engine_0.2.36.2.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk-engines/gtk-indu