gnome: Promote gnome-settings-daemon and dependencies into meta/. Also remove now unneeded custom staging functions

7 files changed, 0 insertions, 91 deletions

diff --git a/meta-gnome/packages/gnome/gnome-desktop.inc b/meta-gnome/packages/gnome/gnome-desktop.inc
deleted file mode 100644
index be00145a13..0000000000
--- a/meta-gnome/packages/gnome/gnome-desktop.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "GNOME library for reading .desktop files"
-SECTION = "x11/gnome"
-LICENSE = "GPL"
-DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-do_configure_prepend () {
-        cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
-}
-
-do_stage () {
-        autotools_stage_all
-}
-
-FILES_${PN} += "${datadir}/gnome-about"
-
-inherit gnome pkgconfig
\ No newline at end of file
diff --git a/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch b/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch
deleted file mode 100644
index c132341728..0000000000
--- a/meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am~        2007-05-22 16:50:35.000000000 +0200
-+++ Makefile.am 2007-05-22 16:50:35.000000000 +0200
-@@ -3,7 +3,6 @@
-        libgnome-desktop        \
-        gnome-about             \
-        pixmaps                 \
--       desktop-docs            \
-        docs                    \
-        man
- 
diff --git a/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb b/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb
deleted file mode 100644
index f4184a4d65..0000000000
--- a/meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require gnome-desktop.inc
-
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
diff --git a/meta-gnome/packages/gnome/gnome-doc-utils.inc b/meta-gnome/packages/gnome/gnome-doc-utils.inc
deleted file mode 100644
index ff62257aa8..0000000000
--- a/meta-gnome/packages/gnome/gnome-doc-utils.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-LICENSE = "GPL LGPL"
-DEPENDS = "libxml2 libxslt libxslt-native"
-
-PR = "r1"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-scrollkeeper"
-
-do_stage() {
-        mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-        cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-        autotools_stage_all
-}
-
-FILES_${PN} += "${datadir}/xml*"
diff --git a/meta-gnome/packages/gnome/gnome-doc-utils_0.12.0.bb b/meta-gnome/packages/gnome/gnome-doc-utils_0.12.0.bb
deleted file mode 100644
index 2499ac36e4..0000000000
--- a/meta-gnome/packages/gnome/gnome-doc-utils_0.12.0.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require gnome-doc-utils.inc
-
-PR = "r1"
diff --git a/meta-gnome/packages/gnome/gnome-settings-daemon_2.26.1.bb b/meta-gnome/packages/gnome/gnome-settings-daemon_2.26.1.bb
deleted file mode 100644
index 4fd2a35778..0000000000
--- a/meta-gnome/packages/gnome/gnome-settings-daemon_2.26.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "GNOME settings daemon"
-LICENSE = "GPL"
-
-PR = "r1"
-
-DEPENDS = "libxklavier libgnomekbd gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl gnome-desktop"
-
-inherit gnome
-
-FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
-                ${datadir}/dbus-1/ \
-                ${datadir}/icon* \
-                ${datadir}/xsession*"
-
-FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
-FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.a ${libdir}/gnome-settings-daemon-2.0/*.la"
-
-do_stage() {    
-        autotools_stage_all
-}
-
-ASNEEDED = ""
\ No newline at end of file
diff --git a/meta-gnome/packages/gnome/libgnomekbd_2.26.0.bb b/meta-gnome/packages/gnome/libgnomekbd_2.26.0.bb
deleted file mode 100644
index a5e95759ad..0000000000
--- a/meta-gnome/packages/gnome/libgnomekbd_2.26.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "GNOME keyboard library"
-LICENSE = "LGPL"
-
-DEPENDS = "gconf-dbus dbus libxklavier gtk+"
-
-inherit gnome
-
-do_configure_append() {
-        find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
-        find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
-}
-
-do_stage() {
-    autotools_stage_all
-}
-
-
-
-