diff options
Diffstat (limited to 'gnome-base/gconf/files/gconfd-2-fix.patch')
| -rw-r--r-- | gnome-base/gconf/files/gconfd-2-fix.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/gnome-base/gconf/files/gconfd-2-fix.patch b/gnome-base/gconf/files/gconfd-2-fix.patch deleted file mode 100644 index 71b753006fb5..000000000000 --- a/gnome-base/gconf/files/gconfd-2-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urw GConf-1.0.8.orig/gconf/gconf-internals.c GConf-1.0.8/gconf/gconf-internals.c ---- GConf-1.0.8.orig/gconf/gconf-internals.c 2002-01-23 20:42:06.000000000 +0100 -+++ GConf-1.0.8/gconf/gconf-internals.c 2003-06-20 02:14:49.000000000 +0200 -@@ -3038,7 +3038,9 @@ - goto out; - } - -- if (gconf_file_exists (GCONF_BINDIR"/gconfd-2")) -+ if (gconf_file_exists (GCONF_LIBEXECDIR"/gconfd-2")) -+ argv[0] = g_strconcat (GCONF_LIBEXECDIR, "/gconfd-2", NULL); -+ else if (gconf_file_exists (GCONF_BINDIR"/gconfd-2")) - argv[0] = g_strconcat (GCONF_BINDIR, "/gconfd-2", NULL); - else - argv[0] = g_strconcat (GCONF_BINDIR, "/" GCONFD, NULL); -diff -urw GConf-1.0.8.orig/gconf/Makefile.am GConf-1.0.8/gconf/Makefile.am ---- GConf-1.0.8.orig/gconf/Makefile.am 2001-09-27 20:09:49.000000000 +0200 -+++ GConf-1.0.8/gconf/Makefile.am 2003-06-20 02:14:49.000000000 +0200 -@@ -16,6 +16,7 @@ - -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \ - -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ - -DGCONF_BINDIR=\""$(bindir)"\" \ -+ -DGCONF_LIBEXECDIR=\""$(libexecdir)"\" \ - -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ - -DVERSION=\""$(VERSION)"\" \ - -DIID=\""OAFIID:gconfd:19991118"\" \ -diff -urw GConf-1.0.8.orig/gconf/Makefile.in GConf-1.0.8/gconf/Makefile.in ---- GConf-1.0.8.orig/gconf/Makefile.in 2002-02-05 00:37:13.000000000 +0100 -+++ GConf-1.0.8/gconf/Makefile.in 2003-06-20 02:16:37.000000000 +0200 -@@ -161,6 +161,7 @@ - -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \ - -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ - -DGCONF_BINDIR=\""$(bindir)"\" \ -+ -DGCONF_LIBEXECDIR=\""$(libexecdir)"\" \ - -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ - -DVERSION=\""$(VERSION)"\" \ - -DIID=\""OAFIID:gconfd:19991118"\" \ |