diff options
| author |   Chris Lord <chris@openedhand.com> | 2004-10-18 13:33:46 +0000 |
|---|---|---|
| committer | Chris Lord <chris@openedhand.com> | 2004-10-18 13:33:46 +0000 |
| commit | dfcdb1ea5e302d587686cf1027aea32a803875fe (patch) | |
| tree | 8de0d6decfc09a652b23d8d85e1e8fa041776984 | |
| parent | ebb8982670d97ee82bafeaa430a436eb8874bf3f (diff) | |
| download | openembedded-dfcdb1ea5e302d587686cf1027aea32a803875fe.tar.gz | |
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
| -rw-r--r-- | gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch | 0 | ||||
| -rw-r--r-- | gpe-bluetooth/gpe-bluetooth_0.37.oe | 3 | ||||
| -rw-r--r-- | gtk+/gtk+-2.4.13/single-click.patch | 0 | ||||
| -rw-r--r-- | gtk+/gtk+-2.4.13/small-gtkfilesel.patch | 0 | ||||
| -rw-r--r-- | gtk+/gtk+_2.4.13.oe | 6 | ||||
| -rw-r--r-- | librsvg/librsvg_2.6.5.oe | 2 |
6 files changed, 8 insertions, 3 deletions
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 --- /dev/null +++ b/gpe-bluetooth/gpe-bluetooth-0.37/change-sdp-to-bluetooth.patch 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 --- /dev/null +++ b/gtk+/gtk+-2.4.13/single-click.patch 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 --- /dev/null +++ b/gtk+/gtk+-2.4.13/small-gtkfilesel.patch 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" |