summaryrefslogtreecommitdiff
path: root/packages/gnome/gconf-dbus
diff options
context:
space:
mode:
Diffstat (limited to 'packages/gnome/gconf-dbus')
-rw-r--r--packages/gnome/gconf-dbus/gconf-dbus-update.patch31
-rw-r--r--packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch16
-rw-r--r--packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch11
3 files changed, 0 insertions, 58 deletions
diff --git a/packages/gnome/gconf-dbus/gconf-dbus-update.patch b/packages/gnome/gconf-dbus/gconf-dbus-update.patch
deleted file mode 100644
index 9870078b86..0000000000
--- a/packages/gnome/gconf-dbus/gconf-dbus-update.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-? gconf/gconf.service
-Index: gconf/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v
-retrieving revision 1.78.4.8
-diff -u -r1.78.4.8 Makefile.am
---- gconf/Makefile.am 21 Dec 2003 14:21:15 -0000 1.78.4.8
-+++ gconf/Makefile.am 22 Jan 2005 00:30:13 -0000
-@@ -155,6 +155,7 @@
-
- libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
- libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS)
-+libgconf_2_la_CFLAGS = $(AM_CFLAGS)
-
- if HAVE_DBUS
- servicedir = $(DBUS_SERVICE_DIR)
-Index: backends/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gconf/backends/Makefile.am,v
-retrieving revision 1.30
-diff -u -r1.30 Makefile.am
---- backends/Makefile.am 3 Nov 2003 00:19:33 -0000 1.30
-+++ backends/Makefile.am 22 Jan 2005 00:30:14 -0000
-@@ -17,6 +17,7 @@
-
- libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
- libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
-+libgconfbackend_oldxml_la_CFLAGS = $(AM_CFLAGS)
-
- libgconfbackend_xml_la_SOURCES = \
- markup-backend.c \
diff --git a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
deleted file mode 100644
index c195aad639..0000000000
--- a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- trunk/backends/xml-backend.c~ 2006-01-18 09:57:39.000000000 -0800
-+++ trunk/backends/xml-backend.c 2006-01-19 11:38:37.000000000 -0800
-@@ -115,6 +115,13 @@
-
- typedef struct _XMLSource XMLSource;
-
-+extern GConfLock*
-+gconf_get_lock (const gchar *lock_directory,
-+ GError **err);
-+extern gboolean
-+gconf_release_lock (GConfLock *lock,
-+ GError **err);
-+
- /* XMLSource **/
-
- struct _XMLSource {
diff --git a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
deleted file mode 100644
index 312a356c84..0000000000
--- a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/backends/Makefile~ 2006-01-19 09:52:22.000000000 -0800
-+++ trunk/backends/Makefile 2006-01-19 13:13:23.000000000 -0800
-@@ -84,7 +84,7 @@
- xml_test_OBJECTS = $(am_xml_test_OBJECTS)
- xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
-- $(top_builddir)/backends/libgconfbackend-oldxml.la
-+ libgconfbackend-oldxml.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles