diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-11-03 07:28:59 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-11-03 07:28:59 +0800 |
| commit | 0d26c0b50b5136c1ee5fecb50ff4ead579e2fcbe (patch) | |
| tree | 709712921c53b4d29a30a83c2d82b4170173ba9d /devel/dconf | |
| parent | 76d393eba0ece94f702aa3354b54ff475d41abea (diff) | |
| download | marcuscom-ports-0d26c0b50b5136c1ee5fecb50ff4ead579e2fcbe.tar.gz marcuscom-ports-0d26c0b50b5136c1ee5fecb50ff4ead579e2fcbe.tar.zst marcuscom-ports-0d26c0b50b5136c1ee5fecb50ff4ead579e2fcbe.zip | |
Use ftuncate() instead of commented out code block with posix_fallocate().
Fix some memleaks while here.
Obtained from: dconf git
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14856 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel/dconf')
| -rw-r--r-- | devel/dconf/Makefile | 3 | ||||
| -rw-r--r-- | devel/dconf/files/patch-engine_dconf-engine.c | 20 | ||||
| -rw-r--r-- | devel/dconf/files/patch-gsettings_dconfsettingsbackend.c | 36 |
3 files changed, 44 insertions, 15 deletions
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile index 539d30329..1cb33b4c4 100644 --- a/devel/dconf/Makefile +++ b/devel/dconf/Makefile @@ -3,11 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/dconf/Makefile,v 1.6 2010/07/13 08:07:04 kwm Exp $ +# $MCom: ports/devel/dconf/Makefile,v 1.7 2010/10/23 11:29:28 kwm Exp $ # PORTNAME= dconf PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= devel gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 diff --git a/devel/dconf/files/patch-engine_dconf-engine.c b/devel/dconf/files/patch-engine_dconf-engine.c index 9dcb9e594..328a8f53f 100644 --- a/devel/dconf/files/patch-engine_dconf-engine.c +++ b/devel/dconf/files/patch-engine_dconf-engine.c @@ -1,19 +1,11 @@ ---- engine/dconf-engine.c.orig 2010-10-21 13:49:19.000000000 +0200 -+++ engine/dconf-engine.c 2010-10-21 14:16:31.000000000 +0200 -@@ -144,6 +144,7 @@ dconf_engine_setup_user (DConfEngine *en +--- engine/dconf-engine.c.orig 2010-08-04 17:40:53.000000000 +0200 ++++ engine/dconf-engine.c 2010-11-03 00:23:07.000000000 +0100 +@@ -144,7 +144,7 @@ dconf_engine_setup_user (DConfEngine *en if (fd >= 0) { -+/* - if (posix_fallocate (fd, 0, 1) == 0) +- if (posix_fallocate (fd, 0, 1) == 0) ++ if (ftruncate (fd, 1) == 0) { engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0); -@@ -151,7 +152,7 @@ dconf_engine_setup_user (DConfEngine *en - if (engine->shm == MAP_FAILED) - engine->shm = NULL; - } -- -+*/ - close (fd); - } - } + diff --git a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c b/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c new file mode 100644 index 000000000..36c996ae8 --- /dev/null +++ b/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c @@ -0,0 +1,36 @@ +--- gsettings/dconfsettingsbackend.c.orig 2010-11-03 00:18:46.000000000 +0100 ++++ gsettings/dconfsettingsbackend.c 2010-11-03 00:21:03.000000000 +0100 +@@ -155,6 +155,7 @@ dconf_settings_backend_remove_outstandin + g_dbus_message_get_sender (message), + g_dbus_message_get_body (message), + anti_expose, NULL); ++ g_slice_free (Outstanding, tmp); + + found = TRUE; + break; +@@ -457,6 +458,7 @@ dconf_settings_backend_write_tree (GSett + gpointer origin_tag) + { + DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend; ++ gboolean success = False; + volatile guint32 *serial; + DConfEngineMessage dcem; + GDBusConnection *bus; +@@ -478,15 +480,11 @@ dconf_settings_backend_write_tree (GSett + + g_settings_backend_keys_changed (backend, prefix, keys, origin_tag); + +- return TRUE; ++ success = TRUE; + } + } + +- g_free (prefix); +- g_free (values); +- g_free (keys); +- +- return FALSE; ++ return success; + } + + static void |