clutter: Use gtk-doc.bbclass

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4480 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/clutter/clutter.inc b/meta/packages/clutter/clutter.inc
index a3a00c03e7e166719d17c4ec5b44da5438853a5d..76dfd0872370f5b0aaa092e4f277601ec3f4a4e5 100644 (file)
--- a/meta/packages/clutter/clutter.inc
+++ b/meta/packages/clutter/clutter.inc
@@ -23,7 +23,7 @@ EXTRA_OECONF_mx31ads = "${BASE_CONF} --with-flavour=eglnative"
 PACKAGE_ARCH_mx31ads = "${MACHINE_ARCH}"
 LDFLAGS_append_mx31ads = " -lpvrNULLWSEGL -lstdc++ "
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig gtk-doc
 
 PACKAGES =+ "clutter-examples"
 FILES_clutter-examples = "${bindir}/test-*"
@@ -33,7 +33,6 @@ require clutter-fpu.inc
 
 #Fix up some weirdness in the docs
 do_configure_prepend() {
-       touch ${S}/gtk-doc.make
         sed -i s:doc/reference/Makefile::g ${S}/configure.ac
         sed -i s:doc::g ${S}/Makefile.am
 }

diff --git a/meta/packages/clutter/clutter/configure_fix.patch b/meta/packages/clutter/clutter/configure_fix.patch
deleted file mode 100644 (file)
index d37b64c..0000000
--- a/meta/packages/clutter/clutter/configure_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: clutter/doc/reference/clutter/Makefile.am
-===================================================================
---- clutter.orig/doc/reference/clutter/Makefile.am     2008-05-01 16:02:49.000000000 +0100
-+++ clutter/doc/reference/clutter/Makefile.am  2008-05-01 16:03:00.000000000 +0100
-@@ -124,7 +124,7 @@
- 
- # Other files to distribute
- # e.g. EXTRA_DIST += version.xml.in
--EXTRA_DIST += \
-+EXTRA_DIST = \
-       version.xml.in \
-       actor-box.png \
-       alpha-func.png \

diff --git a/meta/packages/clutter/clutter_svn.bb b/meta/packages/clutter/clutter_svn.bb
index edc0259dff51bb4a4ea2f9ad79577fcbc9ba282d..f3afbd9bef8f8c586e1b29d72599ace42d4bc4ef 100644 (file)
--- a/meta/packages/clutter/clutter_svn.bb
+++ b/meta/packages/clutter/clutter_svn.bb
@@ -3,10 +3,9 @@ require clutter.inc
 DEFAULT_PREFERENCE = "-1"
 
 PV = "0.7.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \
-           file://configure_fix.patch;patch=1 \
            file://enable_tests.patch;patch=1 "
 
 S = "${WORKDIR}/clutter"