diff options
author | Saleem Abdulrasool <compnerd@gentoo.org> | 2006-12-21 12:51:25 +0000 |
---|---|---|
committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2006-12-21 12:51:25 +0000 |
commit | f259b837d0f0fdb8f08703bb4b6959a03829e687 (patch) | |
tree | 1bdda15bed413ab03de80f1af215c34f0556008a /gnome-base/gconf/files | |
parent | gnome-1.x removal (diff) | |
download | gentoo-2-f259b837d0f0fdb8f08703bb4b6959a03829e687.tar.gz gentoo-2-f259b837d0f0fdb8f08703bb4b6959a03829e687.tar.bz2 gentoo-2-f259b837d0f0fdb8f08703bb4b6959a03829e687.zip |
gnome-1.x removal
(Portage version: 2.1.2_rc3-r9)
(Unsigned Manifest commit)
Diffstat (limited to 'gnome-base/gconf/files')
-rw-r--r-- | gnome-base/gconf/files/digest-gconf-1.0.9 | 3 | ||||
-rw-r--r-- | gnome-base/gconf/files/gconf-1.0.9-gcc4.patch | 23 | ||||
-rw-r--r-- | gnome-base/gconf/files/gconf-1.0.9-linguas.patch | 14 | ||||
-rw-r--r-- | gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch | 57 | ||||
-rw-r--r-- | gnome-base/gconf/files/gconfd-2-fix.patch | 36 |
5 files changed, 0 insertions, 133 deletions
diff --git a/gnome-base/gconf/files/digest-gconf-1.0.9 b/gnome-base/gconf/files/digest-gconf-1.0.9 deleted file mode 100644 index 6c04b3831cc6..000000000000 --- a/gnome-base/gconf/files/digest-gconf-1.0.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 613aea1d9b7a9c504f52217451c7bf99 GConf-1.0.9.tar.bz2 784363 -RMD160 d5cb8ae92146c33bc6ea073b485c3ad6f12f6cc7 GConf-1.0.9.tar.bz2 784363 -SHA256 863c3dd3e72cf7d35eff7497b833978cc28a9f9d12d7caeb9d61ea785731cb19 GConf-1.0.9.tar.bz2 784363 diff --git a/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch b/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch deleted file mode 100644 index 0d02cb359ef1..000000000000 --- a/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch +++ /dev/null @@ -1,23 +0,0 @@ -These functions are declared external in a header file, then defined with -static, the mismatch is an error with gcc4 - ---- GConf-1.0.9/backends/bdb.c.agriffis 2006-02-21 08:55:42.000000000 -0500 -+++ GConf-1.0.9/backends/bdb.c 2006-02-21 08:55:51.000000000 -0500 -@@ -331,7 +331,7 @@ - - /* } */ - --static guint32 -+guint32 - get_dir_id (BDB_Store * bdb, const char *dir) - { - int ret; -@@ -405,7 +405,7 @@ - - /* { Functions to create directories and maintain the dir hierarchy */ - --static guint32 -+guint32 - get_or_create_dir (BDB_Store * bdb, const char *dir) - { - guint32 parent_id; diff --git a/gnome-base/gconf/files/gconf-1.0.9-linguas.patch b/gnome-base/gconf/files/gconf-1.0.9-linguas.patch deleted file mode 100644 index 9f28a1dc613a..000000000000 --- a/gnome-base/gconf/files/gconf-1.0.9-linguas.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix bug 114805: gnome-base/gconf-1.0.9 fails to compile if LINGUAS contains zh - -diff -ruN GConf-1.0.9.orig/configure GConf-1.0.9/configure ---- GConf-1.0.9.orig/configure 2005-12-07 14:50:19.000000000 -0800 -+++ GConf-1.0.9/configure 2005-12-07 14:51:26.000000000 -0800 -@@ -10475,7 +10475,7 @@ - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in -- *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; -+ $lang|*\ $lang|$lang\ *|*\ $lang\ *) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS diff --git a/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch b/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch deleted file mode 100644 index 71dae2a61acf..000000000000 --- a/gnome-base/gconf/files/gconf-1.0.9-locallock_mdk.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- GConf-1.0.9/gconf/gconf-internals.c.locallock 2003-10-15 14:47:31.000000000 +0200 -+++ GConf-1.0.9/gconf/gconf-internals.c 2003-10-28 15:40:15.000000000 +0100 -@@ -2957,10 +2957,53 @@ - } - } - -+enum { UNKNOWN, LOCAL, NORMAL }; -+ -+ -+static gboolean -+gconf_use_local_locks (void) -+{ -+ static int local_locks = UNKNOWN; -+ -+ if (local_locks == UNKNOWN) -+ { -+ const char *l = -+ g_getenv ("GCONF_GLOBAL_LOCKS"); -+ -+ if (l && atoi (l) == 1) -+ local_locks = NORMAL; -+ else -+ local_locks = LOCAL; -+ } -+ -+ return local_locks == LOCAL; -+} -+ - char* - gconf_get_daemon_dir (void) - { -- return g_strconcat (g_get_home_dir (), "/.gconfd", NULL); -+ if (gconf_use_local_locks ()) -+ { -+ char *s; -+ char *subdir; -+ char *tmpdir; -+ -+ subdir = g_strconcat ("gconfd-", g_get_user_name (), NULL); -+ -+ if (g_getenv ("GCONF_TMPDIR")) { -+ tmpdir = g_getenv ("GCONF_TMPDIR"); -+ } else { -+ tmpdir = g_get_tmp_dir (); -+ } -+ -+ s = g_strconcat (tmpdir,"/", subdir, NULL); -+ -+ g_free (subdir); -+ -+ return s; -+ } -+ else -+ return g_strconcat (g_get_home_dir (), "/.gconfd", NULL); - } - - char* 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"\" \ |