summaryrefslogtreecommitdiff
path: root/packages/gnome/gconf-2.6.1
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2005-06-30 08:19:37 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-06-30 08:19:37 +0000
commitc8e5702127e507e82e6f68a4b8c546803accea9d (patch)
tree00583491f40ecc640f2b28452af995e3a63a09d7 /packages/gnome/gconf-2.6.1
parent87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff)
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/gnome/gconf-2.6.1')
-rw-r--r--packages/gnome/gconf-2.6.1/.mtn2git_empty0
-rw-r--r--packages/gnome/gconf-2.6.1/backends.patch13
2 files changed, 13 insertions, 0 deletions
diff --git a/packages/gnome/gconf-2.6.1/.mtn2git_empty b/packages/gnome/gconf-2.6.1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gnome/gconf-2.6.1/.mtn2git_empty
diff --git a/packages/gnome/gconf-2.6.1/backends.patch b/packages/gnome/gconf-2.6.1/backends.patch
index e69de29bb2..8d6099b41f 100644
--- a/packages/gnome/gconf-2.6.1/backends.patch
+++ b/packages/gnome/gconf-2.6.1/backends.patch
@@ -0,0 +1,13 @@
+--- 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