libgnomeui: add 2.24.1 and restructure to use libgnomeui.inc

6 files changed, 33 insertions, 69 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b5293c7ce5..b5721e8ab3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13714,6 +13714,10 @@ sha256=1f112ea46c51e063f4085e27b97c88d4e23164eb07056edbbee1a190abe713ec
 md5=7d50e1fc4c1ee3c268b26e8dfe7e677b
 sha256=9ecf81d3ad2e1ec0b371d720b37154e8b716af1cd464dbeb06232f8fa4c5e07d
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.24/libgnomeui-2.24.1.tar.bz2]
+md5=8e7d36dd1decfcf5cc4d5cb93bc4d217
+sha256=a2ed289b7b35956eff7ddd4d9f4e2507260a7fcb5d7d01969f2e3bb8278e8dc1
+
 [http://ftp.gnome.org/pub/GNOME/sources/libgnomeui/2.6/libgnomeui-2.6.1.1.tar.bz2]
 md5=16e6717b5d7da982db00fea6167188ef
 sha256=0c6c91a59e411d196fe56c814bd368224b04e11a341a8ad552398035e8f19d93
diff --git a/recipes/gnome/libgnomeui.inc b/recipes/gnome/libgnomeui.inc
new file mode 100644
index 0000000000..6cde2362d2
--- /dev/null
+++ b/recipes/gnome/libgnomeui.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "GNOME User Interface Library"
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+
+inherit gnome 
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
+                ${libdir}/libglade/*/lib*.so \
+                ${datadir}/pixmaps/gnome-about-logo.png"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
+
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
+}
+
+do_stage() {
+    autotools_stage_all
+}
diff --git a/recipes/gnome/libgnomeui_2.18.1.bb b/recipes/gnome/libgnomeui_2.18.1.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.18.1.bb
+++ b/recipes/gnome/libgnomeui_2.18.1.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
 
-inherit gnome 
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
-                ${libdir}/libglade/*/lib*.so \
-                ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
-}
-
-do_stage() {
-    autotools_stage_all
-}
diff --git a/recipes/gnome/libgnomeui_2.23.90.bb b/recipes/gnome/libgnomeui_2.23.90.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.23.90.bb
+++ b/recipes/gnome/libgnomeui_2.23.90.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
 
-inherit gnome 
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
-                ${libdir}/libglade/*/lib*.so \
-                ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
-}
-
-do_stage() {
-    autotools_stage_all
-}
diff --git a/recipes/gnome/libgnomeui_2.24.0.bb b/recipes/gnome/libgnomeui_2.24.0.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.24.0.bb
+++ b/recipes/gnome/libgnomeui_2.24.0.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
 
-inherit gnome 
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
-                ${libdir}/libglade/*/lib*.so \
-                ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
-}
-
-do_stage() {
-    autotools_stage_all
-}
diff --git a/recipes/gnome/libgnomeui_2.24.1.bb b/recipes/gnome/libgnomeui_2.24.1.bb
new file mode 100644
index 0000000000..3e848aefa9
--- /dev/null
+++ b/recipes/gnome/libgnomeui_2.24.1.bb
@@ -0,0 +1,2 @@
+require libgnomeui.inc
+