diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-04 16:09:04 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-04-04 16:09:04 +0000 |
commit | 538d9d737af25b68ae2a8bca3c15cbf1372a9dd3 (patch) | |
tree | c66325fbbe9f8069eee83e3ba5f930f22c347db1 /meta/packages/gnome | |
parent | 1742551a6f7a3729647fa5b240111bb88b01ff84 (diff) | |
download | poky-538d9d737af25b68ae2a8bca3c15cbf1372a9dd3.tar.gz |
gconf: dropped 2.6.1 due to orbit2 dependency
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1435 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gnome')
-rw-r--r-- | meta/packages/gnome/gconf-2.6.1/backends.patch | 13 | ||||
-rw-r--r-- | meta/packages/gnome/gconf_2.6.1.bb | 33 |
2 files changed, 0 insertions, 46 deletions
diff --git a/meta/packages/gnome/gconf-2.6.1/backends.patch b/meta/packages/gnome/gconf-2.6.1/backends.patch deleted file mode 100644 index 8d6099b41f..0000000000 --- a/meta/packages/gnome/gconf-2.6.1/backends.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | --- gconf/backends/Makefile.am~ 2003-11-03 00:19:33.000000000 +0000 | ||
2 | +++ gconf/backends/Makefile.am 2004-05-15 19:01:38.000000000 +0100 | ||
3 | @@ -28,8 +28,8 @@ | ||
4 | |||
5 | noinst_PROGRAMS = xml-test | ||
6 | |||
7 | -xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c | ||
8 | -xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la | ||
9 | +#xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c | ||
10 | +xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la libgconfbackend-oldxml.la | ||
11 | |||
12 | bin_PROGRAMS = gconf-merge-tree | ||
13 | gconf_merge_tree_SOURCES = gconf-merge-tree.c | ||
diff --git a/meta/packages/gnome/gconf_2.6.1.bb b/meta/packages/gnome/gconf_2.6.1.bb deleted file mode 100644 index 2ef0913d8f..0000000000 --- a/meta/packages/gnome/gconf_2.6.1.bb +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | LICENSE = "LGPL" | ||
2 | SECTION = "x11/gnome" | ||
3 | DESCRIPTION = "GNOME configuration database system" | ||
4 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ | ||
5 | file://backends.patch;patch=1" | ||
6 | DEPENDS = "orbit2 glib-2.0 libxml2 gtk+" | ||
7 | ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" | ||
8 | |||
9 | FILES_${PN} += " ${libdir}/GConf/*" | ||
10 | PR = "r1" | ||
11 | |||
12 | S = "${WORKDIR}/GConf-${PV}" | ||
13 | |||
14 | EXTRA_OECONF = "--disable-gtk-doc --enable-gtk" | ||
15 | |||
16 | inherit autotools pkgconfig gettext | ||
17 | |||
18 | HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" | ||
19 | |||
20 | do_compile() { | ||
21 | oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" | ||
22 | } | ||
23 | |||
24 | do_stage() { | ||
25 | oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} | ||
26 | install -d ${STAGING_INCDIR}/gconf/2/gconf/ | ||
27 | ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/$i; done ) | ||
28 | install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 | ||
29 | } | ||
30 | |||
31 | do_install() { | ||
32 | oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install | ||
33 | } | ||