From: Chris Lord <chris@openedhand.com>
Date: Mon, 18 Oct 2004 13:33:46 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~16561
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dfcdb1ea5e302d587686cf1027aea32a803875fe;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into chris.(none):/home/cwiiis/oe/packages

2004/10/18 14:33:12+01:00 (none)!cwiiis
Add missing patches from previous gtk versions to current.

2004/10/18 14:32:04+01:00 (none)!cwiiis
Fix building of gpe-bluetooth and librsvg

BKrev: 4173c63aMGFdm98dOb2bGMOspnanHg
---

diff --git a/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch b/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gpe-bluetooth/gpe-bluetooth_0.37.oe b/gpe-bluetooth/gpe-bluetooth_0.37.oe
index eccf1e36ee..11ba322f39 100644
--- a/gpe-bluetooth/gpe-bluetooth_0.37.oe
+++ b/gpe-bluetooth/gpe-bluetooth_0.37.oe
@@ -6,7 +6,8 @@ RDEPENDS = "bluez-utils blueprobe"
 MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 SECTION = "gpe"
 PRIORITY = "optional"
-PR = "r0"
+PR = "r1"
 
 FILES_${PN} += '${datadir}/bluez-pin'
 
+SRC_URI += "file://change-sdp-to-bluetooth.patch;patch=1"
diff --git a/gtk+/gtk+-2.4.13/single-click.patch b/gtk+/gtk+-2.4.13/single-click.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gtk+/gtk+-2.4.13/small-gtkfilesel.patch b/gtk+/gtk+-2.4.13/small-gtkfilesel.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/gtk+/gtk+_2.4.13.oe b/gtk+/gtk+_2.4.13.oe
index 7fe8e99513..fb57b9c88f 100644
--- a/gtk+/gtk+_2.4.13.oe
+++ b/gtk+/gtk+_2.4.13.oe
@@ -5,7 +5,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "glib-2.0 pango atk jpeg libpng xext libxcursor"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
            file://no-demos.patch;patch=1 \
@@ -20,7 +20,9 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.4/gtk+-${PV}.tar.bz2 \
 	   file://error-dialog.patch;patch=1 \
 	   file://xsettings.patch;patch=1 \
 	   file://scroll-timings.patch;patch=1 \
-	   file://gtk-doc.m4"
+	   file://gtk-doc.m4 \
+	   file://small-gtkfilesel.patch;patch=1 \
+	   file://single-click.patch;patch=1"
 
 inherit autotools pkgconfig flow-lossage
 
diff --git a/librsvg/librsvg_2.6.5.oe b/librsvg/librsvg_2.6.5.oe
index 43d6c630ad..aa991f58a8 100644
--- a/librsvg/librsvg_2.6.5.oe
+++ b/librsvg/librsvg_2.6.5.oe
@@ -5,6 +5,8 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/librsvg/2.6/librsvg-${PV}.tar.b
 
 inherit autotools pkgconfig
 
+S = ${WORKDIR}/${PN}-${PV}/${PN}-${PV}
+
 PACKAGES =+ "librsvg-gtk librsvg-gtk-dev "
 FILES_librsvg-gtk = "${libdir}/gtk-2.0/*/*/*.so"
 FILES_librsvg-gtk-dev = "${libdir}/gtk-2.0"