1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-03 01:23:49 +00:00

Remove a patch that cause some GTK+2 (mostly xfce4) apps to start up too

long and consume 100% CPU. If anyone want to revisit with improvement on
this patch, I personal think it should be take up to upstream first before
we can re-add it. Bump the PORTREVISION.

PR:		ports/117556
Submitted by:	Stephen Hurd <shurd@sasktel.net>
Approved by:	portmgr (marcus)
This commit is contained in:
Jeremy Messenger 2007-11-02 20:53:38 +00:00
parent df1b9d2bde
commit 52613f1e62
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=202487
4 changed files with 2 additions and 100 deletions

View File

@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.12.1
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \

View File

@ -1,49 +0,0 @@
--- gtk/gtkiconcache.c.orig Mon Aug 29 07:05:13 2005
+++ gtk/gtkiconcache.c Sat Nov 19 19:14:10 2005
@@ -75,6 +75,37 @@
}
}
+static gboolean
+is_uptodate (const char *dirname, time_t cache_mtime)
+{
+ GDir *dir;
+ const char *filename;
+ gboolean uptodate = TRUE;
+
+ dir = g_dir_open (dirname, 0, NULL);
+ if (! dir)
+ return TRUE;
+
+ while (uptodate && (filename = g_dir_read_name (dir)))
+ if (filename[0] != '.')
+ {
+ char *pathname;
+ struct stat st;
+
+ pathname = g_build_filename (dirname, filename, NULL);
+ if (g_stat (pathname, &st) >= 0
+ && (cache_mtime < st.st_mtime
+ || (S_ISDIR (st.st_mode)
+ && ! is_uptodate (pathname, cache_mtime))))
+ uptodate = FALSE;
+ g_free(pathname);
+ }
+
+ g_dir_close(dir);
+
+ return uptodate;
+}
+
GtkIconCache *
_gtk_icon_cache_new_for_path (const gchar *path)
{
@@ -106,7 +137,7 @@
goto done;
/* Verify cache is uptodate */
- if (st.st_mtime < path_st.st_mtime)
+ if (st.st_mtime < path_st.st_mtime || ! is_uptodate(path, st.st_mtime))
{
GTK_NOTE (ICONTHEME,
g_print ("cache outdated\n"));

View File

@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.12.1
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \

View File

@ -1,49 +0,0 @@
--- gtk/gtkiconcache.c.orig Mon Aug 29 07:05:13 2005
+++ gtk/gtkiconcache.c Sat Nov 19 19:14:10 2005
@@ -75,6 +75,37 @@
}
}
+static gboolean
+is_uptodate (const char *dirname, time_t cache_mtime)
+{
+ GDir *dir;
+ const char *filename;
+ gboolean uptodate = TRUE;
+
+ dir = g_dir_open (dirname, 0, NULL);
+ if (! dir)
+ return TRUE;
+
+ while (uptodate && (filename = g_dir_read_name (dir)))
+ if (filename[0] != '.')
+ {
+ char *pathname;
+ struct stat st;
+
+ pathname = g_build_filename (dirname, filename, NULL);
+ if (g_stat (pathname, &st) >= 0
+ && (cache_mtime < st.st_mtime
+ || (S_ISDIR (st.st_mode)
+ && ! is_uptodate (pathname, cache_mtime))))
+ uptodate = FALSE;
+ g_free(pathname);
+ }
+
+ g_dir_close(dir);
+
+ return uptodate;
+}
+
GtkIconCache *
_gtk_icon_cache_new_for_path (const gchar *path)
{
@@ -106,7 +137,7 @@
goto done;
/* Verify cache is uptodate */
- if (st.st_mtime < path_st.st_mtime)
+ if (st.st_mtime < path_st.st_mtime || ! is_uptodate(path, st.st_mtime))
{
GTK_NOTE (ICONTHEME,
g_print ("cache outdated\n"));