Index: head/x11-fm/thunar/Makefile =================================================================== --- head/x11-fm/thunar/Makefile (revision 421121) +++ head/x11-fm/thunar/Makefile (revision 421122) @@ -1,71 +1,71 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= Thunar PORTVERSION= 1.6.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fm xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME:tl}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Xfce file manager LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB LIB_DEPENDS= libtumbler-1.so:deskutils/xfce4-tumbler \ libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS= pkexec:sysutils/polkit GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_GNOME= gtk20 intltool intlhack gdkpixbuf2 USE_LDCONFIG= yes USE_XFCE= libexo USE_XORG= sm x11 USES= desktop-file-utils gmake pathfix perl5 libtool pkgconfig \ gettext-tools xfce tar:bzip2 INSTALL_TARGET= install-strip OPTIONS_DEFINE= NLS NOTIFY OPTIONS_GROUP= PLUGINS OPTIONS_GROUP_PLUGINS= PLUG_APR PLUG_SBR PLUG_TPA PLUG_UCA PLUG_WALL OPTIONS_DEFAULT= NOTIFY PLUG_APR PLUG_SBR PLUG_UCA PLUG_TPA PLUG_WALL # Override NOTIFY_DESC NOTIFY_DESC= Display notifications PLUG_APR_DESC= Advanced Properties plugin PLUG_SBR_DESC= Simple Builtin Renamers plugin PLUG_TPA_DESC= Trash Panel Applet plugin PLUG_UCA_DESC= User Customizable Actions plugin PLUG_WALL_DESC= Wallpaper plugin NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify NOTIFY_CONFIGURE_ENABLE= notifications PLUG_APR_LIB_DEPENDS= libexif.so:graphics/libexif PLUG_APR_CONFIGURE_ENABLE= apr-plugin exif PLUG_SBR_LIB_DEPENDS= libpcre.so:devel/pcre PLUG_SBR_CONFIGURE_ENABLE= sbr-plugin pcre PLUG_TPA_USE= gnome=gvfs xfce=panel PLUG_TPA_CONFIGURE_ENABLE= tpa-plugin PLUG_UCA_CONFIGURE_ENABLE= uca-plugin PLUG_WALL_CONFIGURE_ENABLE= wallpaper-plugin OPTIONS_SUB= yes CONFIGURE_ARGS+=--enable-gio-unix \ --disable-gudev \ --enable-dbus post-patch: ${REINPLACE_CMD} -e 's|internet-mail|mail-send|' \ ${WRKSRC}/plugins/thunar-sendto-email/thunar-sendto-email.desktop.in.in # Workaround for missing 'inode/directory' content-type icon. # https://bugs.freedesktop.org/show_bug.cgi?id=89150 ${FIND} ${WRKSRC} -type f -name '*.c' \ | ${XARGS} ${REINPLACE_CMD} -e 's|inode/directory|folder|' .include Index: head/x11-fm/thunar/files/patch-thunar_thunar-file.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-file.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-file.c (revision 421122) @@ -0,0 +1,30 @@ +--- thunar/thunar-file.c.orig 2015-05-22 13:25:36 UTC ++++ thunar/thunar-file.c +@@ -795,13 +795,15 @@ thunar_file_monitor (GFileMonitor *m + if (event_type == G_FILE_MONITOR_EVENT_MOVED) + { + /* reload the target file if cached */ ++ if (other_path == NULL) ++ return; + other_file = thunar_file_cache_lookup (other_path); + if (other_file) + thunar_file_reload (other_file); + else + other_file = thunar_file_get (other_path, NULL); + +- if (!other_file) ++ if (other_file == NULL) + return; + + /* notify the thumbnail cache that we can now also move the thumbnail */ +@@ -3918,7 +3920,9 @@ thunar_file_unwatch (ThunarFile *file) + gboolean + thunar_file_reload (ThunarFile *file) + { +- _thunar_return_if_fail (THUNAR_IS_FILE (file)); ++ /* if the file has already been destroyed, break here */ ++ if (!THUNAR_IS_FILE (file)) ++ return FALSE; + + /* clear file pxmap cache */ + thunar_icon_factory_clear_pixmap_cache (file); Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-file.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-thunar_thunar-folder.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-folder.c (nonexistent) +++ head/x11-fm/thunar/files/patch-thunar_thunar-folder.c (revision 421122) @@ -0,0 +1,49 @@ +--- thunar/thunar-folder.c.orig 2015-05-22 13:25:36 UTC ++++ thunar/thunar-folder.c +@@ -773,27 +773,30 @@ thunar_folder_monitor (GFileMonitor + { + /* destroy the old file and update the new one */ + thunar_file_destroy (lp->data); +- file = thunar_file_get(other_file, NULL); +- if (file != NULL && THUNAR_IS_FILE (file)) ++ if (other_file != NULL) + { +- thunar_file_reload (file); +- +- /* if source and target folders are different, also tell +- the target folder to reload for the changes */ +- if (thunar_file_has_parent (file)) ++ file = thunar_file_get(other_file, NULL); ++ if (file != NULL && THUNAR_IS_FILE (file)) + { +- other_parent = thunar_file_get_parent (file, NULL); +- if (other_parent && +- !g_file_equal (thunar_file_get_file(folder->corresponding_file), +- thunar_file_get_file(other_parent))) ++ thunar_file_reload (file); ++ ++ /* if source and target folders are different, also tell ++ the target folder to reload for the changes */ ++ if (thunar_file_has_parent (file)) + { +- thunar_file_reload (other_parent); +- g_object_unref (other_parent); ++ other_parent = thunar_file_get_parent (file, NULL); ++ if (other_parent && ++ !g_file_equal (thunar_file_get_file(folder->corresponding_file), ++ thunar_file_get_file(other_parent))) ++ { ++ thunar_file_reload (other_parent); ++ g_object_unref (other_parent); ++ } + } +- } + +- /* drop reference on the other file */ +- g_object_unref (file); ++ /* drop reference on the other file */ ++ g_object_unref (file); ++ } + } + + /* reload the folder of the source file */ Property changes on: head/x11-fm/thunar/files/patch-thunar_thunar-folder.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property