gtksourceview2: add 2.10.0, convert 2.9.1 to new style staging

Conflicts:

	recipes/gtksourceview/gtksourceview2_2.9.1.bb

diff --git a/recipes/gtksourceview/gtksourceview2_2.10.0.bb b/recipes/gtksourceview/gtksourceview2_2.10.0.bb
new file mode 100644 (file)
index 0000000..ddceb93
--- /dev/null
+++ b/recipes/gtksourceview/gtksourceview2_2.10.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Portable C library for multiline text editing"
+HOMEPAGE = "http://projects.gnome.org/gtksourceview/"
+LICENSE = "LGPL"
+DEPENDS = "gtk+ libgnomeprint"
+
+PNAME = "gtksourceview"
+
+S = "${WORKDIR}/${PNAME}-${PV}"
+
+inherit gnome lib_package
+
+# overrule SRC_URI from gnome.conf
+SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2;name=archive"
+SRC_URI[archive.md5sum] = "04279db5d4fda41a35bf3d9aafa3a6c1"
+SRC_URI[archive.sha256sum] = "a72484ff661d3515130911b59f78a88afc1344421431e05e99e9dab791be948f"
+
+SRC_URI += " \
+           file://gtk-doc.make \
+"
+
+do_configure_prepend() {
+    cp ${WORKDIR}/gtk-doc.make ${S}/
+    sed -i -e s:docs::g ${S}/Makefile.am
+    echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
+}
+
+FILES_${PN} += " ${datadir}/gtksourceview-2.0"

diff --git a/recipes/gtksourceview/gtksourceview2_2.9.1.bb b/recipes/gtksourceview/gtksourceview2_2.9.1.bb
index f6695ec..640c2e8 100644 (file)
--- a/recipes/gtksourceview/gtksourceview2_2.9.1.bb
+++ b/recipes/gtksourceview/gtksourceview2_2.9.1.bb
@@ -7,7 +7,7 @@ PNAME = "gtksourceview"
 
 S = "${WORKDIR}/${PNAME}-${PV}"
 
-inherit gnome pkgconfig lib_package
+inherit gnome lib_package
 
 # overrule SRC_URI from gnome.conf
 SRC_URI = "${GNOME_MIRROR}/${PNAME}/${@gnome_verdir("${PV}")}/${PNAME}-${PV}.tar.bz2"
@@ -22,9 +22,7 @@ do_configure_prepend() {
     echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
 }
 
-do_stage() {
-       autotools_stage_all
-}
-
 FILES_${PN} += " ${datadir}/gtksourceview-2.0"
 
+SRC_URI[md5sum] = "1e3a378af5f6319d53413394620c4e4a"
+SRC_URI[sha256sum] = "b5ebdc5e7d33b99790c6dda14a717711963039f8ea6242c889f540b24ed6678f"