diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-10-14 18:33:48 +0800 |
commit | 1b3327761c8bcb98d89b529daeae9600844b4361 (patch) | |
tree | 0be1cd4eb5fec6661da4798906b0d9bd522e794f /devel/gconf2/files | |
parent | a65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff) | |
download | marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2 marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip |
Clean out MarcusCom after the big import into ports.
Next stop, GNOME 2.17.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gconf2/files')
-rw-r--r-- | devel/gconf2/files/patch-ab | 11 | ||||
-rw-r--r-- | devel/gconf2/files/patch-gconf_gconfd.c | 64 | ||||
-rw-r--r-- | devel/gconf2/files/patch-gconf_gconftool.c | 28 |
3 files changed, 0 insertions, 103 deletions
diff --git a/devel/gconf2/files/patch-ab b/devel/gconf2/files/patch-ab deleted file mode 100644 index 6f25900e7..000000000 --- a/devel/gconf2/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Sun Aug 4 22:38:39 2002 -+++ Makefile.in Sun Aug 4 22:39:52 2002 -@@ -35,7 +35,7 @@ - DESTDIR = - - pkgdatadir = $(datadir)/@PACKAGE@ --pkglibdir = $(libdir)/@PACKAGE@ -+pkglibdir = $(prefix)/libdata/pkgconfig - pkgincludedir = $(includedir)/@PACKAGE@ - - top_builddir = . diff --git a/devel/gconf2/files/patch-gconf_gconfd.c b/devel/gconf2/files/patch-gconf_gconfd.c deleted file mode 100644 index ef551cb28..000000000 --- a/devel/gconf2/files/patch-gconf_gconfd.c +++ /dev/null @@ -1,64 +0,0 @@ ---- gconf/gconfd.c.orig Fri May 5 12:40:23 2006 -+++ gconf/gconfd.c Fri May 5 12:41:43 2006 -@@ -124,12 +124,6 @@ - - static gboolean in_shutdown = FALSE; - --/* -- * Flag indicating we received a SIGHUP and we should reaload -- * all sources during the next periodic_cleanup() -- */ --static gboolean need_db_reload = FALSE; -- - /* - * CORBA goo - */ -@@ -410,6 +404,18 @@ - } - - static void -+reload_db (void) -+{ -+ gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); -+ -+ logfile_save (); -+ shutdown_databases (); -+ init_databases (); -+ gconf_server_load_sources (); -+ logfile_read (); -+} -+ -+static void - signal_handler (int signo) - { - static gint in_fatal = 0; -@@ -482,8 +488,8 @@ - case SIGHUP: - --in_fatal; - -- /* reload sources during next periodic_cleanup() */ -- need_db_reload = TRUE; -+ /* reload sources immediately */ -+ reload_db (); - break; - #endif - -@@ -864,18 +870,6 @@ - static gboolean - periodic_cleanup_timeout(gpointer data) - { -- if (need_db_reload) -- { -- gconf_log (GCL_INFO, _("SIGHUP received, reloading all databases")); -- -- need_db_reload = FALSE; -- logfile_save (); -- shutdown_databases (); -- init_databases (); -- gconf_server_load_sources (); -- logfile_read (); -- } -- - gconf_log (GCL_DEBUG, "Performing periodic cleanup, expiring cache cruft"); - - drop_old_clients (); diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c deleted file mode 100644 index c47e5e426..000000000 --- a/devel/gconf2/files/patch-gconf_gconftool.c +++ /dev/null @@ -1,28 +0,0 @@ ---- gconf/gconftool.c.orig Fri May 5 12:36:01 2006 -+++ gconf/gconftool.c Fri May 5 12:39:29 2006 -@@ -3724,6 +3724,8 @@ - static int - do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload) - { -+ int sync_result; -+ - if (args == NULL) - { - g_printerr (_("Must specify some schema files to install\n")); -@@ -3738,7 +3740,15 @@ - ++args; - } - -- return do_sync (conf); -+ sync_result = do_sync (conf); -+ -+ /* -+ * Send all the gconfd-2 processes a SIGHUP so that they reload the -+ * databases and pick up the added/removed schemas. -+ */ -+ system("/usr/bin/killall -SIGHUP gconfd-2 >/dev/null 2>&1"); -+ -+ return sync_result; - } - - typedef enum { |