summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-02-28 20:35:40 +0000
committerRod Whitby <rod@whitby.id.au>2005-02-28 20:35:40 +0000
commit12486db5a8a94532e9a72c85490509e8444247d7 (patch)
treebfde0a1f4d8012ecb7c7cdb1da682bc805002dfa
parent8686f7150e6f111a56ec9e1402c7894d543920c4 (diff)
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/openembedded 2005/02/27 13:38:33-08:00 bkbits.net!nslu2-linux.adm Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/28 20:35:38+00:00 (none)!pb patch gtk+ for display migration 2005/02/28 20:32:22+00:00 (none)!pb add patch for gcc bug #15342 2005/02/28 19:58:29+00:00 (none)!pb update gst-plugins to 0.8.7 BKrev: 4223809ctIUz5QLCYyQLpU5IdSPc-w
-rw-r--r--packages/gcc/gcc-3.4.3/15342.patch0
-rw-r--r--packages/gcc/gcc_3.4.3.bb5
-rw-r--r--packages/gstreamer/gst-plugins_0.8.7.bb0
-rw-r--r--packages/gtk+/files/migration.patch0
-rw-r--r--packages/gtk+/gtk+_2.6.2.bb9
5 files changed, 8 insertions, 6 deletions
diff --git a/packages/gcc/gcc-3.4.3/15342.patch b/packages/gcc/gcc-3.4.3/15342.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gcc/gcc-3.4.3/15342.patch
diff --git a/packages/gcc/gcc_3.4.3.bb b/packages/gcc/gcc_3.4.3.bb
index ad0f7a0bb9..99e028f48c 100644
--- a/packages/gcc/gcc_3.4.3.bb
+++ b/packages/gcc/gcc_3.4.3.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
DESCRIPTION = "The GNU cc and gcc C compilers."
HOMEPAGE = "http://www.gnu.org/software/gcc/"
SECTION = "devel"
@@ -20,6 +20,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc-3.4.0-arm-nolibfloat.patch;patch=1 \
file://gcc-3.4.0-arm-bigendian.patch;patch=1 \
file://gcc-3.4.0-arm-bigendian-uclibc.patch;patch=1 \
- file://GCC3.4.0VisibilityPatch.diff;patch=1"
+ file://GCC3.4.0VisibilityPatch.diff;patch=1 \
+ file://15342.patch;patch=1"
include gcc3-build.inc
diff --git a/packages/gstreamer/gst-plugins_0.8.7.bb b/packages/gstreamer/gst-plugins_0.8.7.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gstreamer/gst-plugins_0.8.7.bb
diff --git a/packages/gtk+/files/migration.patch b/packages/gtk+/files/migration.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gtk+/files/migration.patch
diff --git a/packages/gtk+/gtk+_2.6.2.bb b/packages/gtk+/gtk+_2.6.2.bb
index 33dd7804b4..dbfcb93c30 100644
--- a/packages/gtk+/gtk+_2.6.2.bb
+++ b/packages/gtk+/gtk+_2.6.2.bb
@@ -6,7 +6,7 @@ SECTION = "libs"
PRIORITY = "optional"
MAINTAINER = "Philip Blundell <pb@handhelds.org>"
DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor gtk-doc"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
file://no-demos.patch;patch=1 \
@@ -21,9 +21,10 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
file://xsettings.patch;patch=1 \
file://scroll-timings.patch;patch=1 \
file://small-gtkfilesel.patch;patch=1 \
- file://single-click.patch;patch=1"
+ file://single-click.patch;patch=1 \
+ file://migration.patch;patch=1;pnum=0"
-inherit autotools pkgconfig flow-lossage
+inherit autotools pkgconfig
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
${bindir}/gtk-query-immodules-2.0 \
@@ -33,7 +34,7 @@ FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindi
RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
-EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest"
+EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
# --disable-cruft
LIBV = "2.4.0"