From 538d9d737af25b68ae2a8bca3c15cbf1372a9dd3 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 4 Apr 2007 16:09:04 +0000
Subject: 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
---
 meta/packages/gnome/gconf-2.6.1/backends.patch | 13 ----------
 meta/packages/gnome/gconf_2.6.1.bb             | 33 --------------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 meta/packages/gnome/gconf-2.6.1/backends.patch
 delete mode 100644 meta/packages/gnome/gconf_2.6.1.bb

(limited to 'meta/packages/gnome')

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 @@
---- gconf/backends/Makefile.am~	2003-11-03 00:19:33.000000000 +0000
-+++ gconf/backends/Makefile.am	2004-05-15 19:01:38.000000000 +0100
-@@ -28,8 +28,8 @@
- 
- noinst_PROGRAMS = xml-test
- 
--xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c
--xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
-+#xml_test_SOURCES= $(libgconfbackend_oldxml_la_SOURCES) xml-test.c
-+xml_test_LDADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la libgconfbackend-oldxml.la
- 
- bin_PROGRAMS = gconf-merge-tree
- 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 @@
-LICENSE = "LGPL"
-SECTION = "x11/gnome"
-DESCRIPTION = "GNOME configuration database system"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
-	   file://backends.patch;patch=1"
-DEPENDS = "orbit2 glib-2.0  libxml2 gtk+"
-ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
-
-FILES_${PN} += " ${libdir}/GConf/*"
-PR = "r1"
-
-S = "${WORKDIR}/GConf-${PV}"
-
-EXTRA_OECONF = "--disable-gtk-doc --enable-gtk"
-
-inherit autotools pkgconfig gettext
-
-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"
-
-do_compile() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
-}
-
-do_stage() {
-	oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/gconf/2/gconf/
-	( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/$i; done )
-	install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
-}
-
-do_install() {
-	oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
-}
-- 
cgit v1.2.3-54-g00ecf