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

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/27 00:28:12+02:00 vanille.de!mickeyl
Merge bk://openembedded@openembedded.bkbits.net/packages
into allanon.vanille.de:/usr/local/projects/packages

2004/07/27 00:25:53+02:00 vanille.de!mickeyl
reduce duplicated modules in machine configurations

2004/07/26 22:55:52+01:00 nexus.co.uk!pb
set DEFAULT_PREFERENCE=1 so that oemake prefers it over version 2.0

2004/07/26 22:08:47+01:00 nexus.co.uk!pb
Merge bk://openembedded@openembedded.bkbits.net/packages
into workhouse.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/26 22:07:37+01:00 nexus.co.uk!pb
update gtk to 2.4.4


2004/07/26 21:48:34+01:00 (none)!pb
add --export-dynamic to LDFLAGS

2004/07/26 21:47:42+01:00 (none)!pb
set ORBIT_IDL in do_compile

BKrev: 4105871divQBk4byqxFye_T1td67Zw

16 files changed, 15 insertions, 7 deletions

diff --git a/compositeext/compositeext_cvs.oe b/compositeext/compositeext_cvs.oe
index 8f9b1be0de..7b4f8e7908 100644
--- a/compositeext/compositeext_cvs.oe
+++ b/compositeext/compositeext_cvs.oe
@@ -3,6 +3,7 @@ SECTION = "libs"
 MAINTAINER = "Greg Gilbert <greg@treke.net>"
 DEPENDS = "xextensions fixesext"
 DESCRIPTION = "X Composite extension headers and specification"
+DEFAULT_PREFERENCE = 1
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=CompositeExt"
 S = "${WORKDIR}/CompositeExt"
diff --git a/conf/beagle.conf b/conf/beagle.conf
index 39808c09d2..ee09262cb7 100644
--- a/conf/beagle.conf
+++ b/conf/beagle.conf
@@ -8,9 +8,10 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules \
-kernel-module-gpio kernel-module-ip-gre kernel-module-ipip kernel-module-irnet \
-kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
-kernel-module-usbdcore kernel-module-usbdmonitor " 
+kernel-module-net-fd \
+kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor " 
+
+#kernel-module-gpio kernel-module-registers
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
diff --git a/conf/collie.conf b/conf/collie.conf
index 17cc50adde..f84f1cd77d 100644
--- a/conf/collie.conf
+++ b/conf/collie.conf
@@ -8,8 +8,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support \
-kernel-module-devinfo kernel-module-gpio kernel-module-ip-gre  \
-kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
+kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor " 
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index 160bb3c386..eda4ea9a30 100644
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-kernel-module-ip-gre kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral chkhinge"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
diff --git a/galculator/galculator_1.2.3.oe b/galculator/galculator_1.2.3.oe
index 4721bca94a..d6350a3c37 100644
--- a/galculator/galculator_1.2.3.oe
+++ b/galculator/galculator_1.2.3.oe
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 inherit autotools pkgconfig
 
@@ -15,6 +15,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2 \
 
 #EXTRA_OECONF = ""
 
+LDFLAGS += '-Wl,--export-dynamic'
+
 do_install_append () {
         mkdir -p ${D}${datadir}/pixmaps
         install -m 0644 ${WORKDIR}/gnome-calc2.png ${D}${datadir}/pixmaps/gnome-calc2.png
diff --git a/gtk+/gtk+-2.4.4/automake-lossage.patch b/gtk+/gtk+-2.4.4/automake-lossage.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/automake-lossage.patch
diff --git a/gtk+/gtk+-2.4.4/disable-tooltips.patch b/gtk+/gtk+-2.4.4/disable-tooltips.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/disable-tooltips.patch
diff --git a/gtk+/gtk+-2.4.4/gtk+-handhelds.patch b/gtk+/gtk+-2.4.4/gtk+-handhelds.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/gtk+-handhelds.patch
diff --git a/gtk+/gtk+-2.4.4/gtk-doc.m4 b/gtk+/gtk+-2.4.4/gtk-doc.m4
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/gtk-doc.m4
diff --git a/gtk+/gtk+-2.4.4/gtklabel-resize-patch b/gtk+/gtk+-2.4.4/gtklabel-resize-patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/gtklabel-resize-patch
diff --git a/gtk+/gtk+-2.4.4/hardcoded_libtool.patch b/gtk+/gtk+-2.4.4/hardcoded_libtool.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/hardcoded_libtool.patch
diff --git a/gtk+/gtk+-2.4.4/no-demos.patch b/gtk+/gtk+-2.4.4/no-demos.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/no-demos.patch
diff --git a/gtk+/gtk+-2.4.4/no-xwc.patch b/gtk+/gtk+-2.4.4/no-xwc.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/no-xwc.patch
diff --git a/gtk+/gtk+-2.4.4/spinbutton.patch b/gtk+/gtk+-2.4.4/spinbutton.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+-2.4.4/spinbutton.patch
diff --git a/gtk+/gtk+_2.4.4.oe b/gtk+/gtk+_2.4.4.oe
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gtk+/gtk+_2.4.4.oe
diff --git a/rhythmbox/rhythmbox_0.8.5.oe b/rhythmbox/rhythmbox_0.8.5.oe
index 79b20cd20d..8dc2d14bcf 100644
--- a/rhythmbox/rhythmbox_0.8.5.oe
+++ b/rhythmbox/rhythmbox_0.8.5.oe
@@ -17,3 +17,8 @@ do_configure_prepend() {
 }
 
 inherit autotools
+
+do_compile() {
+	oe_runmake ORBIT_IDL=`which orbit-idl-2`
+}
+