diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-18 06:49:37 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-18 06:49:37 +0000 |
commit | 9c0caae1c20155b432bb0feb074a8fd9cc1c12bc (patch) | |
tree | 534d0190982c831de589344c3003940ec6f2d6b1 /x11-toolkits/libgnomeui/files | |
parent | Followup commit: Unbreak XFree86-4-Server-snap on -stable -- gcc 2 has no (diff) |
Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,
future plans, etc., please see http://www.gnome.org/start/2.4/.
This commit represents work done by adamw, bland, and myself as well as
many other contributers:
Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>
Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.
Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon). The
best way to upgrade so that you get all shared library dependencies is:
portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2
Approved by: portmgr (kris, will, myself implicitly)
Requested by: re as well as many other users
Notes
Notes:
svn path=/head/; revision=89023
Diffstat (limited to 'x11-toolkits/libgnomeui/files')
-rw-r--r-- | x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in | 6 | ||||
-rw-r--r-- | x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c | 24 |
2 files changed, 27 insertions, 3 deletions
diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in index c8ff2dcd7d66..69f8b2e7c4d5 100644 --- a/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_Makefile.in @@ -1,6 +1,6 @@ ---- libgnomeui/Makefile.in.orig Wed Jun 4 10:23:03 2003 -+++ libgnomeui/Makefile.in Wed Jun 4 10:23:38 2003 -@@ -144,7 +144,7 @@ +--- libgnomeui/Makefile.in.orig Fri Jun 13 14:41:05 2003 ++++ libgnomeui/Makefile.in Fri Jun 13 14:41:43 2003 +@@ -148,7 +148,7 @@ # libgnomeuiincludedir = $(includedir)/libgnomeui-2.0/libgnomeui diff --git a/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c new file mode 100644 index 000000000000..ecb6739ab17b --- /dev/null +++ b/x11-toolkits/libgnomeui/files/patch-libgnomeui_gnome-icon-lookup.c @@ -0,0 +1,24 @@ +--- libgnomeui/gnome-icon-lookup.c.orig Thu Sep 18 02:13:50 2003 ++++ libgnomeui/gnome-icon-lookup.c Thu Sep 18 02:16:19 2003 +@@ -107,6 +107,10 @@ + + if (vfs_mime_name) + { ++ /* Handle absolute files */ ++ if (vfs_mime_name[0] == '/') ++ return g_strdup (vfs_mime_name); ++ + p = strrchr(vfs_mime_name, '.'); + + if (p) +@@ -293,7 +297,9 @@ + if (mime_type) + { + mime_name = get_vfs_mime_name (mime_type); +- if (mime_name && gnome_icon_theme_has_icon (icon_theme, mime_name)) ++ if (mime_name && ++ ((mime_name[0] == '/' && g_file_test (mime_name, G_FILE_TEST_IS_REGULAR) || ++ gnome_icon_theme_has_icon (icon_theme, mime_name)))) + return mime_name; + g_free (mime_name); + |