Date: Sat, 15 Jun 2002 10:44:03 +0200 (CEST) From: Franz Klammer <klammer@webonaut.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/39323: update port: x11-fm/file_menu_applet from 0.4 to 0.5 Message-ID: <20020615084403.D7F566FAF4@ncc-1701.webonaut.com>
next in thread | raw e-mail | index | archive | help
>Number: 39323 >Category: ports >Synopsis: update port: x11-fm/file_menu_applet from 0.4 to 0.5 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 15 01:50:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Franz Klammer >Release: FreeBSD 4.6-RC i386 >Organization: >Environment: System: FreeBSD ncc-1701.webonaut.com 4.6-RC FreeBSD 4.6-RC #0: Wed Jun 5 11:22:10 CEST 2002 root@ncc-1701.webonaut.com:/usr/obj/usr/src/sys/NCC-1701 i386 >Description: Update from 0.4 to 0.5 new in 0.5: nautilus theme support >How-To-Repeat: >Fix: --- fma.diff begins here --- diff -ruN file_menu_applet_04/Makefile file_menu_applet/Makefile --- file_menu_applet_04/Makefile Mon May 6 23:22:22 2002 +++ file_menu_applet/Makefile Fri Jun 14 16:49:57 2002 @@ -6,7 +6,7 @@ # PORTNAME= file_menu_applet -PORTVERSION= 0.4 +PORTVERSION= 0.5 CATEGORIES= x11-fm gnome MASTER_SITES= http://www.zoned.net:8000/~xkahn/file_menu_applet/ diff -ruN file_menu_applet_04/distinfo file_menu_applet/distinfo --- file_menu_applet_04/distinfo Mon May 6 23:22:22 2002 +++ file_menu_applet/distinfo Fri Jun 14 16:51:14 2002 @@ -1 +1 @@ -MD5 (file_menu_applet-0.4.tar.gz) = 611cf15b5b52e821f8ce056df1fe74ee +MD5 (file_menu_applet-0.5.tar.gz) = 2038c3bf76485c17f6e8c8096d69cfd5 diff -ruN file_menu_applet_04/files/patch-aa file_menu_applet/files/patch-aa --- file_menu_applet_04/files/patch-aa Mon May 6 23:22:25 2002 +++ file_menu_applet/files/patch-aa Thu Jan 1 01:00:00 1970 @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Mon May 6 02:39:52 2002 -+++ src/Makefile.in Mon May 6 02:40:05 2002 -@@ -107,7 +107,7 @@ - -DLOCALEDIR=\""$(datadir)/locale"\" \ - -DIMAGEDIR=\""$(datadir)/pixmaps"\" \ - -DICONDIR=\""$(datadir)/images/file_menu_applet"\" \ -- -DMIMEICONDIR=\"$(datadir)/pixmaps/nautilus\" \ -+ -DMIMEICONDIR=\"$(datadir)/pixmaps\" \ - -DGLADEDIR=\""$(gladedir)"\" - - diff -ruN file_menu_applet_04/files/patch-ab file_menu_applet/files/patch-ab --- file_menu_applet_04/files/patch-ab Mon May 6 23:22:25 2002 +++ file_menu_applet/files/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,16 +0,0 @@ ---- src/flist-mime-icon.c.orig Mon May 6 02:42:16 2002 -+++ src/flist-mime-icon.c Mon May 6 02:43:24 2002 -@@ -107,8 +107,11 @@ - if (!g_file_exists (icon)) { - file = g_concat_dir_and_file (MIMEICONDIR, icon); - if (!g_file_exists (file)) { -- g_free (file); -- return NULL; -+ file = g_concat_dir_and_file(g_strdup_printf ("%s/%s", MIMEICONDIR, "nautilus"), icon); -+ if (!g_file_exists (file)) { -+ g_free (file); -+ return NULL; -+ } - } - } - else diff -ruN file_menu_applet_04/files/patch-ac file_menu_applet/files/patch-ac --- file_menu_applet_04/files/patch-ac Mon May 6 23:22:25 2002 +++ file_menu_applet/files/patch-ac Thu Jan 1 01:00:00 1970 @@ -1,22 +0,0 @@ ---- src/main.c.orig Wed Mar 27 06:06:21 2002 -+++ src/main.c Mon May 6 18:35:11 2002 -@@ -213,7 +213,7 @@ - - gnome_vfs_file_info_unref (dir_info); - -- if (!fma->icon_menus) { -+ if (fma->icon_menus) { - result = gnome_vfs_directory_visit - (rp, (GNOME_VFS_FILE_INFO_FOLLOW_LINKS - | GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE), -@@ -400,6 +400,10 @@ - - if (!fma->menu_label) - fma->menu_label = strdup ("Home Directory"); -+ if (!fma->dir_watch) -+ fma->menu_label = strdup ("~/"); -+ if (!fma->menu_label) -+ fma->icon_menus = strdup ("true"); - - /* Create */ - fma->menu_bar = gtk_menu_bar_new (); diff -ruN file_menu_applet_04/files/patch-src::flist-mime-icon.c file_menu_applet/files/patch-src::flist-mime-icon.c --- file_menu_applet_04/files/patch-src::flist-mime-icon.c Thu Jan 1 01:00:00 1970 +++ file_menu_applet/files/patch-src::flist-mime-icon.c Fri Jun 14 21:24:56 2002 @@ -0,0 +1,41 @@ +--- src/flist-mime-icon.c.orig Wed May 29 03:31:00 2002 ++++ src/flist-mime-icon.c Fri Jun 14 21:24:00 2002 +@@ -132,7 +132,7 @@ + const char * + flist_mime_get_icon (const char *mime_type) + { +- gchar *mime_part, *index, *icon_name, *icon_name2; ++ gchar *mime_part, *index, *icon_name, *icon_name2, *icon_name3; + + if (!mime_type) + goto skip_theme_stuff; +@@ -170,6 +170,19 @@ + + skip_theme_stuff: + ++ mime_part = g_strdup (mime_type); ++ index = strchr (mime_part, '/'); ++ *index = '-'; ++ ++ icon_name3 = g_strconcat (MIMEICONDIR, "document-icons/gnome-", mime_part, ".png", NULL); ++ ++ g_free(mime_part); ++ ++ if (g_file_exists (icon_name3)) ++ return icon_name3; ++ ++ g_free (icon_name3); ++ + return gnome_vfs_mime_get_icon (mime_type); + } + +@@ -218,6 +231,9 @@ + if (!file) { + if (!icon) return NULL; + flist_nautilus_theme_load (); ++ ++ if (!strstr(icon, ".png")) ++ icon = g_strconcat(icon, ".png", NULL); + + if (!g_file_exists (icon)) { + if (nautilus_theme_dir) file = g_concat_dir_and_file (nautilus_theme_dir, icon); diff -ruN file_menu_applet_04/files/patch-src::main.c file_menu_applet/files/patch-src::main.c --- file_menu_applet_04/files/patch-src::main.c Thu Jan 1 01:00:00 1970 +++ file_menu_applet/files/patch-src::main.c Fri Jun 14 23:16:04 2002 @@ -0,0 +1,29 @@ +--- src/main.c.orig Thu May 30 22:31:15 2002 ++++ src/main.c Fri Jun 14 23:13:34 2002 +@@ -318,13 +318,12 @@ + g_timer_start (dm->timer); + g_timer_elapsed (dm->timer, &dm->last_time); + +- if (fma->icon_menus) { ++ if (!fma->icon_menus) { + options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS +- | GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE + | GNOME_VFS_FILE_INFO_GET_MIME_TYPE; + } else { + options = GNOME_VFS_FILE_INFO_FOLLOW_LINKS +- | GNOME_VFS_FILE_INFO_GET_MIME_TYPE; ++ | GNOME_VFS_FILE_INFO_FORCE_FAST_MIME_TYPE; + } + + result = gnome_vfs_directory_visit +@@ -559,6 +558,10 @@ + + if (!fma->menu_label) + fma->menu_label = strdup ("Home Directory"); ++ if (!fma->dir_watch) ++ fma->dir_watch = strdup ("~/"); ++ if (fma->icon_menus == "(null)") ++ fma->icon_menus = strdup ("true"); + + /* Create */ + fma->menu_bar = gtk_menu_bar_new (); --- fma.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020615084403.D7F566FAF4>