diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-13 01:46:37 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-13 01:46:37 +0800 |
commit | 76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f (patch) | |
tree | 4d0e90aeb270ea5ec1a1028ffe6e9222b917b99f /devel/gio-fam-backend | |
parent | f1dec62a3f43d430a0508091f586cfb7795e9bd1 (diff) | |
download | marcuscom-ports-76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f.tar marcuscom-ports-76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f.tar.gz marcuscom-ports-76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f.tar.bz2 marcuscom-ports-76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f.tar.lz marcuscom-ports-76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f.tar.xz marcuscom-ports-76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f.tar.zst marcuscom-ports-76cff9e83ab04b3bf03320e43440f9a7c5b9ef8f.zip |
Add a better fix for the FAM monitor unref problem.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10719 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/gio-fam-backend')
-rw-r--r-- | devel/gio-fam-backend/Makefile | 3 | ||||
-rw-r--r-- | devel/gio-fam-backend/files/patch-fam | 39 |
2 files changed, 19 insertions, 23 deletions
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile index d6d09576c..ee68f1c07 100644 --- a/devel/gio-fam-backend/Makefile +++ b/devel/gio-fam-backend/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.7 2008/03/10 19:06:33 marcus Exp $ +# $MCom: ports/devel/gio-fam-backend/Makefile,v 1.8 2008/03/11 03:10:53 marcus Exp $ # PORTNAME= gio-fam-backend PORTVERSION= 2.16.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ diff --git a/devel/gio-fam-backend/files/patch-fam b/devel/gio-fam-backend/files/patch-fam index 0760f88fe..a3b5fe4aa 100644 --- a/devel/gio-fam-backend/files/patch-fam +++ b/devel/gio-fam-backend/files/patch-fam @@ -8,28 +8,6 @@ fam_sub* _fam_sub_add (const gchar* pathname, gboolean directory, gpointer user_data); ---- gio/fam/gfamdirectorymonitor.c.orig 2008-03-10 13:50:21.000000000 -0400 -+++ gio/fam/gfamdirectorymonitor.c 2008-03-10 13:50:29.000000000 -0400 -@@ -53,6 +53,8 @@ g_fam_directory_monitor_finalize (GObjec - fam_monitor->sub = NULL; - } - -+ _fam_sub_shutdown (); -+ - if (G_OBJECT_CLASS (g_fam_directory_monitor_parent_class)->finalize) - (*G_OBJECT_CLASS (g_fam_directory_monitor_parent_class)->finalize) (object); - } ---- gio/fam/gfamfilemonitor.c.orig 2008-03-10 13:50:18.000000000 -0400 -+++ gio/fam/gfamfilemonitor.c 2008-03-10 13:50:29.000000000 -0400 -@@ -52,6 +52,8 @@ g_fam_file_monitor_finalize (GObject *ob - fam_monitor->sub = NULL; - } - -+ _fam_sub_shutdown (); -+ - if (G_OBJECT_CLASS (g_fam_file_monitor_parent_class)->finalize) - (*G_OBJECT_CLASS (g_fam_file_monitor_parent_class)->finalize) (object); - } --- gio/fam/fam-helper.c.orig 2008-03-10 20:31:58.000000000 -0400 +++ gio/fam/fam-helper.c 2008-03-10 23:06:32.000000000 -0400 @@ -181,6 +181,22 @@ _fam_sub_startup (void) @@ -55,3 +33,20 @@ fam_sub* _fam_sub_add (const gchar* pathname, gboolean directory, +--- gio/fam/fam-module.c.orig 2008-03-12 13:38:54.000000000 -0400 ++++ gio/fam/fam-module.c 2008-03-12 13:39:31.000000000 -0400 +@@ -26,6 +26,7 @@ + #include "giomodule.h" + #include "gfamdirectorymonitor.h" + #include "gfamfilemonitor.h" ++#include "fam-helper.h" + + void + g_io_module_load (GIOModule *module) +@@ -37,5 +38,6 @@ g_io_module_load (GIOModule *module) + void + g_io_module_unload (GIOModule *module) + { ++ _fam_sub_shutdown (); + } + |