summaryrefslogtreecommitdiffstats
path: root/meta-gnome/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-18 16:41:39 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-18 16:41:39 +0100
commit9e58848ef93cd352e399b18c4754e824a641bbdd (patch)
tree486a71a224ec0a42feaa5d344d3fb5bf2d18bb38 /meta-gnome/packages
parentc41f317a14403050131aeb7dc2a53a751b39676d (diff)
downloadpoky-9e58848ef93cd352e399b18c4754e824a641bbdd.tar.gz
gnome: Promote gnome-settings-daemon and dependencies into meta/. Also remove now unneeded custom staging functions
Diffstat (limited to 'meta-gnome/packages')
-rw-r--r--meta-gnome/packages/gnome/gnome-desktop.inc18
-rw-r--r--meta-gnome/packages/gnome/gnome-desktop/no-desktop-docs.patch10
-rw-r--r--meta-gnome/packages/gnome/gnome-desktop_2.26.2.bb3
-rw-r--r--meta-gnome/packages/gnome/gnome-doc-utils.inc16
-rw-r--r--meta-gnome/packages/gnome/gnome-doc-utils_0.12.0.bb3
-rw-r--r--meta-gnome/packages/gnome/gnome-settings-daemon_2.26.1.bb22
-rw-r--r--meta-gnome/packages/gnome/libgnomekbd_2.26.0.bb19
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 @@
1DESCRIPTION = "GNOME library for reading .desktop files"
2SECTION = "x11/gnome"
3LICENSE = "GPL"
4DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
5
6EXTRA_OECONF = "--disable-scrollkeeper"
7
8do_configure_prepend () {
9 cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
10}
11
12do_stage () {
13 autotools_stage_all
14}
15
16FILES_${PN} += "${datadir}/gnome-about"
17
18inherit 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 @@
1--- Makefile.am~ 2007-05-22 16:50:35.000000000 +0200
2+++ Makefile.am 2007-05-22 16:50:35.000000000 +0200
3@@ -3,7 +3,6 @@
4 libgnome-desktop \
5 gnome-about \
6 pixmaps \
7- desktop-docs \
8 docs \
9 man
10
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 @@
1require gnome-desktop.inc
2
3SRC_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 @@
1LICENSE = "GPL LGPL"
2DEPENDS = "libxml2 libxslt libxslt-native"
3
4PR = "r1"
5
6inherit gnome
7
8EXTRA_OECONF = "--disable-scrollkeeper"
9
10do_stage() {
11 mkdir -p ${STAGING_DATADIR}/xml/gnome/xslt/
12 cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
13 autotools_stage_all
14}
15
16FILES_${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 @@
1require gnome-doc-utils.inc
2
3PR = "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 @@
1DESCRIPTION = "GNOME settings daemon"
2LICENSE = "GPL"
3
4PR = "r1"
5
6DEPENDS = "libxklavier libgnomekbd gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl gnome-desktop"
7
8inherit gnome
9
10FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
11 ${datadir}/dbus-1/ \
12 ${datadir}/icon* \
13 ${datadir}/xsession*"
14
15FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
16FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.a ${libdir}/gnome-settings-daemon-2.0/*.la"
17
18do_stage() {
19 autotools_stage_all
20}
21
22ASNEEDED = "" \ 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 @@
1DESCRIPTION = "GNOME keyboard library"
2LICENSE = "LGPL"
3
4DEPENDS = "gconf-dbus dbus libxklavier gtk+"
5
6inherit gnome
7
8do_configure_append() {
9 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
10 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
11}
12
13do_stage() {
14 autotools_stage_all
15}
16
17
18
19