From 1c021147a19678afab14c0b42189eb2be02cf7bc Mon Sep 17 00:00:00 2001
From: Shane Volpe <shanevolpe@gmail.com>
Date: Wed, 26 Sep 2007 00:48:36 +0000
Subject: cairo-directfb: R1 Added RPROVIDES to stop interference with cairo

---
 packages/cairo/cairo-directfb_1.4.8.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/cairo/cairo-directfb_1.4.8.bb b/packages/cairo/cairo-directfb_1.4.8.bb
index 0a2090cf66..ada747600e 100644
--- a/packages/cairo/cairo-directfb_1.4.8.bb
+++ b/packages/cairo/cairo-directfb_1.4.8.bb
@@ -1,5 +1,6 @@
 require cairo.inc
 RCONFLICTS = "cairo"
+RPROVIDES = "cairo-directfb"
 DEPENDS = "directfb libsm libpng fontconfig"
 SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \
 	   file://cairo_directfb_is_similar-typo.patch;patch=1 \
@@ -12,6 +13,6 @@ EXTRA_OECONF += " --enable-directfb \
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
 
-PR = "r1"
+PR = "r2"
 
 S = "${WORKDIR}/cairo-${PV}"
-- 
cgit v1.2.3


From d1c28c4debcfc278dcfcc18171dc54cdb0dcd855 Mon Sep 17 00:00:00 2001
From: Shane Volpe <shanevolpe@gmail.com>
Date: Wed, 26 Sep 2007 00:49:12 +0000
Subject: gtk+-directfb: added RPROVIDES

---
 packages/gtk+/gtk+-directfb_2.10.14.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/gtk+/gtk+-directfb_2.10.14.bb b/packages/gtk+/gtk+-directfb_2.10.14.bb
index 9a855d078d..e77f24638d 100644
--- a/packages/gtk+/gtk+-directfb_2.10.14.bb
+++ b/packages/gtk+/gtk+-directfb_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-PR = "r1"
+PR = "r2"
 
 # disable per default - untested and not all patches included.
 DEFAULT_PREFERENCE = "-1"
@@ -8,6 +8,7 @@ S = "${WORKDIR}/gtk+-${PV}"
 
 
 RCONFLICTS = "gtk+"
+RPROVIDES ="gtk+-directfb"
 DEPENDS = "glib-2.0 pango-directfb atk jpeg libpng gtk-doc libgcrypt cairo-directfb cups"
 LDFLAGS_append += " -ldirectfb"
 CFLAGS_append  += " -I${STAGING_INCDIR}/directfb"
-- 
cgit v1.2.3


From c1175ca8dd64905eba92cda879668612ab154fa2 Mon Sep 17 00:00:00 2001
From: Shane Volpe <shanevolpe@gmail.com>
Date: Wed, 26 Sep 2007 00:50:03 +0000
Subject: pango-directfb: Added it back with RPROVIDES to stop conflicts

---
 packages/pango/pango-directfb_1.18.1.bb | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 packages/pango/pango-directfb_1.18.1.bb

diff --git a/packages/pango/pango-directfb_1.18.1.bb b/packages/pango/pango-directfb_1.18.1.bb
new file mode 100644
index 0000000000..7e5c798221
--- /dev/null
+++ b/packages/pango/pango-directfb_1.18.1.bb
@@ -0,0 +1,10 @@
+require pango.inc
+RCONFLICTS = "pango"
+RPROVIDES = "pango-directfb"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc cairo-directfb"
+SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/pango/1.18/pango-${PV}.tar.bz2 \
+	   file://no-tests.patch;patch=1"
+
+S = "${WORKDIR}/pango-${PV}"
+RRECOMMENDS_${PN} = "" 
+FILESPATH = "${FILE_DIRNAME}/pango-${PV}:${FILE_DIRNAME}/files"
-- 
cgit v1.2.3