summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/angstrom-2008.1.conf2
-rw-r--r--conf/distro/include/angstrom-2008-preferred-versions.inc15
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2
-rw-r--r--packages/e17/e-wm/applications.menu13
-rw-r--r--packages/e17/e-wm_cvs.bb6
-rw-r--r--packages/gcc/gcc-4.3.0.inc2
-rw-r--r--packages/gcc/gcc-cross_4.3.0.bb8
-rw-r--r--packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch30
-rw-r--r--packages/glib-2.0/glib-2.0_2.16.1.bb2
-rw-r--r--packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb2
-rw-r--r--packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch40
-rw-r--r--packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb2
-rw-r--r--packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb1
13 files changed, 84 insertions, 41 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 17029ec21e..04929914ad 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -96,7 +96,7 @@ ANGSTROM_GCC_VERSION_armv7a = "4.2.1+csl-arm-2007q3-53"
ANGSTROM_GCC_VERSION_avr32 ?= "4.2.2"
#Everybody else can just use this:
-ANGSTROM_GCC_VERSION ?= "4.2.2"
+ANGSTROM_GCC_VERSION ?= "4.2.4"
PREFERRED_VERSION_gcc ?= "${ANGSTROM_GCC_VERSION}"
PREFERRED_VERSION_gcc-cross ?= "${ANGSTROM_GCC_VERSION}"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 8517c5bc8e..fe7ca91ef2 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,12 +1,21 @@
+PREFERRED_VERSION_automake-native = "1.10"
PREFERRED_VERSION_busybox = "1.9.2"
PREFERRED_VERSION_cairo = "1.6.4"
PREFERRED_VERSION_dbus = "1.2.1"
-PREFERRED_VERSION_glib-2.0 = "2.16.1"
+PREFERRED_VERSION_fontconfig = "2.4.1"
+PREFERRED_VERSION_glib-2.0 = "2.16.3"
PREFERRED_VERSION_gst-pulse = "0.9.7"
-PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_libsdl-x11 = "1.2.11"
+PREFERRED_VERSION_libtool = "2.2.4"
+PREFERRED_VERSION_libtool-native = "2.2.4"
+PREFERRED_VERSION_libtool-cross = "2.2.4"
+PREFERRED_VERSION_libtool-sdk = "2.2.4"
PREFERRED_VERSION_pango = "1.18.3"
PREFERRED_VERSION_pixman = "0.10.0"
-PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_pkgconfig = "0.23"
+PREFERRED_VERSION_pkgconfig-native = "0.23"
+PREFERRED_VERSION_pulseaudio = "0.9.10"
+PREFERRED_VERSION_tiff = "3.8.2+4.0.0beta2"
PREFERRED_VERSION_udev = "118"
PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
PREFERRED_VERSION_dropbear = "0.50"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 99f0390dee..1fc30312f5 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -165,7 +165,7 @@ PREFERRED_VERSION_clamsmtp ?= "1.8"
PREFERRED_VERSION_classpath ?= "0.97.1"
PREFERRED_VERSION_classpath-gtk ?= "0.97.1"
PREFERRED_VERSION_classpath-minimal ?= "0.97.1"
-PREFERRED_VERSION_classpath-native ?= "0.97.1"
+PREFERRED_VERSION_classpath-native ?= "0.96.1"
PREFERRED_VERSION_clearsilver ?= "0.10.3"
PREFERRED_VERSION_clish ?= "0.7.1"
PREFERRED_VERSION_cmake-native ?= "2.4.7"
diff --git a/packages/e17/e-wm/applications.menu b/packages/e17/e-wm/applications.menu
index 9cd933a240..032c6b7d26 100644
--- a/packages/e17/e-wm/applications.menu
+++ b/packages/e17/e-wm/applications.menu
@@ -62,10 +62,15 @@
<Name>Settings</Name>
<Directory>Settings.directory</Directory>
<Include>
- <Or>
- <Category>SystemSettings</Category>
- <Category>Settings</Category>
- </Or>
+ <And>
+ <Or>
+ <Category>SystemSettings</Category>
+ <Category>Settings</Category>
+ </Or>
+ <Not>
+ <Category>System</Category>
+ </Not>
+ </And>
</Include>
</Menu>
diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 41e27da46a..87161526e0 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -2,10 +2,12 @@ DESCRIPTION = "The Enlightenment Window Mananger Version 17"
DEPENDS = "eet evas ecore edje efreet"
LICENSE = "MIT BSD"
PV = "0.16.999.042+cvs${SRCDATE}"
-PR = "r5"
+PR = "r8"
inherit e update-alternatives
+RDEPENDS += "shared-mime-info mime-support"
+
SRC_URI = "${E_CVS};module=e17/apps/e \
file://disable-e-cursor.patch;patch=1 \
file://pkgconfig-fix.patch;patch=1;pnum=0;mindate=20080328;maxdate=20080401 \
@@ -58,6 +60,8 @@ FILES_${PN}-dev += "\
${libdir}/enlightenment/preload/*.?a \
"
+CONFFILES_${PN} = "/etc/xdg/menus/applications.menu"
+
ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe"
ALTERNATIVE_NAME = "x-window-manager"
ALTERNATIVE_LINK = "${bindir}/x-window-manager"
diff --git a/packages/gcc/gcc-4.3.0.inc b/packages/gcc/gcc-4.3.0.inc
index b5ab13f1b4..f0aac4ca78 100644
--- a/packages/gcc/gcc-4.3.0.inc
+++ b/packages/gcc/gcc-4.3.0.inc
@@ -68,5 +68,5 @@ SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
FORTRAN = ""
JAVA = ""
-EXTRA_OECONF_BASE = " --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
+EXTRA_OECONF_BASE = " --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
diff --git a/packages/gcc/gcc-cross_4.3.0.bb b/packages/gcc/gcc-cross_4.3.0.bb
index 72f72835c3..382a234816 100644
--- a/packages/gcc/gcc-cross_4.3.0.bb
+++ b/packages/gcc/gcc-cross_4.3.0.bb
@@ -7,6 +7,12 @@ require gcc-package-cross.inc
SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 "
-EXTRA_OECONF += "--disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+EXTRA_OECONF += " --enable-cheaders=c_std --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
+
+# Hack till we fix *libc properly
+do_stage_append() {
+ ln -sf ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${CROSS_DIR}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+}
+
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${layout_includedir}"
diff --git a/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
index d6cbeeb8a4..b21851bd63 100644
--- a/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
+++ b/packages/glib-2.0/glib-2.0-2.16.1/gcc-4.2-inline-fix.patch
@@ -1,13 +1,29 @@
+Stole from gentoo bugzilla
+http://bugs.gentoo.org/show_bug.cgi?id=156475
+
+Lets this work with gcc 4.2/4.3
+-Khem
Index: glib-2.16.1/glib/gutils.h
===================================================================
---- glib-2.16.1.orig/glib/gutils.h 2008-03-21 16:18:57.000000000 +0100
-+++ glib-2.16.1/glib/gutils.h 2008-03-21 16:19:09.000000000 +0100
-@@ -97,7 +97,7 @@
+--- glib-2.16.1.orig/glib/gutils.h 2008-03-10 17:31:56.000000000 -0700
++++ glib-2.16.1/glib/gutils.h 2008-06-04 15:19:12.000000000 -0700
+@@ -96,13 +96,14 @@
+ #ifdef G_IMPLEMENT_INLINES
# define G_INLINE_FUNC
# undef G_CAN_INLINE
- #elif defined (__GNUC__)
+-#elif defined (__GNUC__)
-# ifdef __GNUC_STDC_INLINE__
-+# ifdef __GNUC_GNU_INLINE__
- # define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
+-# define G_INLINE_FUNC extern inline __attribute__ ((__gnu_inline__))
++#elif defined (__GNUC__)
++# if __GNUC_PREREQ (4,2) && defined (__STDC_VERSION__) \
++ && __STDC_VERSION__ >= 199901L
++# define G_INLINE_FUNC extern __inline __attribute__ ((__gnu_inline__))
# else
- # define G_INLINE_FUNC extern inline
+-# define G_INLINE_FUNC extern inline
++# define G_INLINE_FUNC extern __inline
+ # endif
+-#elif defined (G_CAN_INLINE)
++#elif defined (G_CAN_INLINE)
+ # define G_INLINE_FUNC static inline
+ #else /* can't inline */
+ # define G_INLINE_FUNC
diff --git a/packages/glib-2.0/glib-2.0_2.16.1.bb b/packages/glib-2.0/glib-2.0_2.16.1.bb
index ef7a1e84fc..8f6079a84e 100644
--- a/packages/glib-2.0/glib-2.0_2.16.1.bb
+++ b/packages/glib-2.0/glib-2.0_2.16.1.bb
@@ -1,6 +1,6 @@
require glib.inc
-PR = "r4"
+PR = "r5"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.16/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index ff42ba532b..60361f5862 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
require ipkg-utils_${PV}.bb
RDEPENDS = ""
-PR = "r17"
+PR = "r18"
inherit native
diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
index 389a86018b..02f30c1504 100644
--- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
+++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
@@ -1,6 +1,7 @@
-diff -r 720080c24d2f arfile.py
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/arfile.py Sun Jan 27 23:26:35 2008 +0200
+Index: ipkg-utils/arfile.py
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ipkg-utils/arfile.py 2008-05-30 15:33:49.000000000 +0100
@@ -0,0 +1,124 @@
+"""
+arfile - A module to parse GNU ar archives.
@@ -126,10 +127,11 @@ diff -r 720080c24d2f arfile.py
+
+ f2 = tarf.extractfile("control")
+ print f2.read()
-diff -r 720080c24d2f ipkg.py
---- a/ipkg.py Sun Jan 27 23:13:26 2008 +0200
-+++ b/ipkg.py Sun Jan 27 23:26:35 2008 +0200
-@@ -41,6 +41,8 @@ import string
+Index: ipkg-utils/ipkg.py
+===================================================================
+--- ipkg-utils.orig/ipkg.py 2008-05-30 15:33:49.000000000 +0100
++++ ipkg-utils/ipkg.py 2008-05-30 15:35:58.000000000 +0100
+@@ -41,6 +41,8 @@
import string
import commands
from stat import ST_SIZE
@@ -138,7 +140,7 @@ diff -r 720080c24d2f ipkg.py
class Version:
"""A class for holding parsed package version information."""
-@@ -131,77 +133,61 @@ class Package:
+@@ -131,78 +133,63 @@
self.section = None
self.filename_header = None
self.file_list = []
@@ -174,9 +176,9 @@ diff -r 720080c24d2f ipkg.py
- self.md5 = sum.hexdigest()
- else:
- self.md5 = string.join(map((lambda x:"%02x" % ord(x)),sum.digest()),'')
-- stat = os.stat(fn)
+ stat = os.stat(fn)
- self.size = stat[ST_SIZE]
-+
++ self.size = stat[ST_SIZE]
self.filename = os.path.basename(fn)
## sys.stderr.write(" extracting control.tar.gz from %s\n"% (fn,))
- if self.isdeb:
@@ -232,7 +234,7 @@ diff -r 720080c24d2f ipkg.py
self.scratch_dir = None
self.file_dir = None
self.meta_dir = None
-+
+
+ def __getattr__(self, name):
+ if name == "md5":
+ self._computeFileMD5()
@@ -250,10 +252,11 @@ diff -r 720080c24d2f ipkg.py
+ sum.update(data)
+ f.close()
+ self.md5 = sum.hexdigest()
-
++
def read_control(self, control):
import os
-@@ -221,9 +207,15 @@ class Package:
+
+@@ -221,9 +208,15 @@
value = value + '\n' + line
if name == 'size':
self.size = int(value)
@@ -270,7 +273,7 @@ diff -r 720080c24d2f ipkg.py
return # consumes one blank line at end of package descriptoin
else:
line = control.readline()
-@@ -314,7 +306,27 @@ class Package:
+@@ -314,7 +307,27 @@
return self.section
def get_file_list(self):
@@ -299,10 +302,11 @@ diff -r 720080c24d2f ipkg.py
def write_package(self, dirname):
buf = self.render_control()
-diff -r 720080c24d2f setup.py
---- a/setup.py Sun Jan 27 23:13:26 2008 +0200
-+++ b/setup.py Sun Jan 27 23:26:35 2008 +0200
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
+Index: ipkg-utils/setup.py
+===================================================================
+--- ipkg-utils.orig/setup.py 2005-03-03 16:40:17.000000000 +0000
++++ ipkg-utils/setup.py 2008-05-30 15:33:49.000000000 +0100
+@@ -16,6 +16,6 @@
platforms = 'POSIX',
keywords = 'ipkg familiar',
url = 'http://www.handhelds.org/sources.html/',
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index 4b7471a163..f64e644bd3 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
CONFLICTS = "ipkg-link"
RDEPENDS = "python"
SRCDATE = "20050404"
-PR = "r19"
+PR = "r20"
SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
file://ipkg-utils-fix.patch;patch=1 \
diff --git a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
index fc8b179507..15830dc5d3 100644
--- a/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
+++ b/packages/linux/linux-rp_2.6.25+2.6.26-rc4.bb
@@ -45,7 +45,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \
${RPSRC}/integrator_rgb-r1.patch;patch=1;status=hack \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1;status=hack \
file://sharpsl-rc-r1.patch;patch=1 \
- file://sharpsl-rc-r2.patch;patch=1 \
file://spitz_h_rewrite.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1;status=hack \
file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 08:16:42 +0000