Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded

into mebius.(none):/home/pb/oe/oe

2005/02/15 12:11:02+00:00 (none)!pb
remove expat.patch; now integrated in upstream libsvg cvs

BKrev: 4211e722l-OA1b8-AoBEsPcJjmQrZg

diff --git a/packages/cairo/libsvg/expat.patch b/packages/cairo/libsvg/expat.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packages/cairo/libsvg_cvs.bb b/packages/cairo/libsvg_cvs.bb
index b2aa43e..8cdb7a9 100644 (file)
--- a/packages/cairo/libsvg_cvs.bb
+++ b/packages/cairo/libsvg_cvs.bb
@@ -5,10 +5,9 @@ MAINTAINER = "Phil Blundell <pb@debian.org>"
 DEPENDS = "expat jpeg zlib libpng"
 DESCRIPTION = "SVG parser library"
 LICENSE = "LGPL"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg \
-       file://expat.patch;patch=1;pnum=0"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.cairographics.org/cvs/cairo;module=libsvg"
 S = "${WORKDIR}/libsvg"
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--with-expat"