- bring in patch from upstream SVN: close gtkrc files after use so we don't

run out of file descriptors
This commit is contained in:
ajacoutot 2009-04-14 22:04:31 +00:00
parent 55cecfa859
commit b8be481690
3 changed files with 21 additions and 35 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.60 2009/04/14 17:16:54 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.61 2009/04/14 22:04:31 ajacoutot Exp $
COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 2.24.0.1
PKGNAME= ${DISTNAME}p14
PKGNAME= ${DISTNAME}p15
SHARED_LIBS += gnome-window-settings 2.0 # .1.0
CATEGORIES= x11

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-capplets_common_gtkrc-utils_c,v 1.3 2009/04/14 22:04:31 ajacoutot Exp $
--- capplets/common/gtkrc-utils.c.orig Wed Sep 24 18:36:22 2008
+++ capplets/common/gtkrc-utils.c Tue Apr 14 23:13:34 2009
@@ -24,6 +24,7 @@
#endif
#include <string.h>
+#include <unistd.h>
#include <glib.h>
#include <glib/gstdio.h>
#include <fcntl.h>
@@ -156,6 +157,7 @@ gtkrc_get_details (gchar *filename, GSList **engines,
}
}
+ close (file);
}
}

View File

@ -1,33 +0,0 @@
$OpenBSD: patch-capplets_common_theme-thumbnail_c,v 1.1 2009/04/14 17:16:54 ajacoutot Exp $
Disable thumbnailer: GNOME Bugzilla #578835
--- capplets/common/theme-thumbnail.c.orig Mon Apr 13 23:58:25 2009
+++ capplets/common/theme-thumbnail.c Tue Apr 14 00:00:49 2009
@@ -1185,7 +1185,7 @@ generate_icon_theme_thumbnail_async (GnomeThemeIconInf
void
theme_thumbnail_factory_init (int argc, char *argv[])
{
-#ifndef __APPLE__
+#if ! defined(__APPLE__) && ! defined(__OpenBSD__)
gint child_pid;
#endif
@@ -1197,7 +1197,7 @@ theme_thumbnail_factory_init (int argc, char *argv[])
* disable the thumbnailer on MacOS for now. That means no thumbs
* until the thumbnailing process is rewritten, but at least we won't
* make apps crash. */
-#ifndef __APPLE__
+#if ! defined(__APPLE__) && ! defined(__OpenBSD__)
child_pid = fork ();
if (child_pid == 0)
{
@@ -1236,7 +1236,7 @@ theme_thumbnail_factory_init (int argc, char *argv[])
/* Parent */
close (pipe_to_factory_fd[0]);
close (pipe_from_factory_fd[1]);
-#endif /* __APPLE__ */
+#endif /* __APPLE__ && __OpenBSD__ */
async_data.set = FALSE;
async_data.theme_name = NULL;