Index: head/x11-fm/thunar/Makefile =================================================================== --- head/x11-fm/thunar/Makefile (revision 434180) +++ head/x11-fm/thunar/Makefile (revision 434181) @@ -1,71 +1,69 @@ # Created by: Oliver Lehmann # $FreeBSD$ PORTNAME= Thunar -PORTVERSION= 1.6.10 -PORTREVISION= 2 +PORTVERSION= 1.6.11 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 + libdbus-1.so:devel/dbus \ + libdbus-glib-1.so:devel/dbus-glib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 RUN_DEPENDS= pkexec:sysutils/polkit GNU_CONFIGURE= yes INSTALLS_ICONS= yes -USE_GNOME= gtk20 intltool intlhack gdkpixbuf2 +USE_GNOME= glib20 gtk20 intltool cairo gdkpixbuf2 USE_LDCONFIG= yes USE_XFCE= libexo -USE_XORG= sm x11 +USE_XORG= ice 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/distinfo =================================================================== --- head/x11-fm/thunar/distinfo (revision 434180) +++ head/x11-fm/thunar/distinfo (revision 434181) @@ -1,2 +1,3 @@ -SHA256 (xfce4/Thunar-1.6.10.tar.bz2) = 7e9d24067268900e5e44d3325e60a1a2b2f8f556ec238ec12574fbea15fdee8a -SIZE (xfce4/Thunar-1.6.10.tar.bz2) = 1948762 +TIMESTAMP = 1487135952 +SHA256 (xfce4/Thunar-1.6.11.tar.bz2) = b1c7c3121827f59610900ef1cc19aa10a50ab2cc3ae38eee15181b64256e8b42 +SIZE (xfce4/Thunar-1.6.11.tar.bz2) = 1929426 Index: head/x11-fm/thunar/files/patch-thunar_thunar-folder.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-folder.c (revision 434180) +++ head/x11-fm/thunar/files/patch-thunar_thunar-folder.c (nonexistent) @@ -1,49 +0,0 @@ ---- 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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-thunar_thunar-file.c =================================================================== --- head/x11-fm/thunar/files/patch-thunar_thunar-file.c (revision 434180) +++ head/x11-fm/thunar/files/patch-thunar_thunar-file.c (nonexistent) @@ -1,30 +0,0 @@ ---- 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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-fm/thunar/files/patch-Thunar-folder-handler.desktop.in.in =================================================================== --- head/x11-fm/thunar/files/patch-Thunar-folder-handler.desktop.in.in (revision 434180) +++ head/x11-fm/thunar/files/patch-Thunar-folder-handler.desktop.in.in (nonexistent) @@ -1,12 +0,0 @@ -Workaround for https://bugs.freedesktop.org/show_bug.cgi?id=89150 - ---- Thunar-folder-handler.desktop.in.in.orig 2013-07-30 05:44:48 UTC -+++ Thunar-folder-handler.desktop.in.in -@@ -10,6 +10,6 @@ Terminal=false - StartupNotify=true - Type=Application - Categories=System;Utility;Core;GTK;FileTools;FileManager; --MimeType=inode/directory; -+MimeType=inode/directory;folder; - - # vi:set encoding=UTF-8: Property changes on: head/x11-fm/thunar/files/patch-Thunar-folder-handler.desktop.in.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-fm/thunar/pkg-plist =================================================================== --- head/x11-fm/thunar/pkg-plist (revision 434180) +++ head/x11-fm/thunar/pkg-plist (revision 434181) @@ -1,109 +1,110 @@ bin/Thunar bin/thunar bin/thunar-settings %%PLUG_UCA%%etc/xdg/Thunar/uca.xml include/thunarx-2/thunarx/thunarx-config.h include/thunarx-2/thunarx/thunarx-file-info.h include/thunarx-2/thunarx/thunarx-menu-provider.h include/thunarx-2/thunarx/thunarx-preferences-provider.h include/thunarx-2/thunarx/thunarx-property-page-provider.h include/thunarx-2/thunarx/thunarx-property-page.h include/thunarx-2/thunarx/thunarx-provider-factory.h include/thunarx-2/thunarx/thunarx-provider-plugin.h include/thunarx-2/thunarx/thunarx-renamer-provider.h include/thunarx-2/thunarx/thunarx-renamer.h include/thunarx-2/thunarx/thunarx.h lib/Thunar/ThunarBulkRename lib/Thunar/thunar-sendto-email lib/libthunarx-2.so lib/libthunarx-2.so.0 lib/libthunarx-2.so.0.0.0 %%PLUG_APR%%lib/thunarx-2/thunar-apr.so %%PLUG_SBR%%lib/thunarx-2/thunar-sbr.so %%PLUG_UCA%%lib/thunarx-2/thunar-uca.so %%PLUG_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.so %%PLUG_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.so libdata/pkgconfig/thunarx-2.pc man/man1/Thunar.1.gz share/Thunar/sendto/thunar-sendto-email.desktop share/appdata/thunar.appdata.xml share/applications/Thunar-bulk-rename.desktop share/applications/Thunar-folder-handler.desktop share/applications/Thunar.desktop share/applications/thunar-settings.desktop share/dbus-1/services/org.xfce.FileManager.service share/dbus-1/services/org.xfce.Thunar.service %%DOCSDIR%%/README.gtkrc share/icons/hicolor/16x16/apps/Thunar.png share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png share/icons/hicolor/16x16/stock/navigation/stock_folder-move.png share/icons/hicolor/16x16/stock/navigation/stock_thunar-shortcuts.png share/icons/hicolor/24x24/apps/Thunar.png share/icons/hicolor/24x24/stock/navigation/stock_folder-copy.png share/icons/hicolor/24x24/stock/navigation/stock_folder-move.png share/icons/hicolor/48x48/apps/Thunar.png share/icons/hicolor/64x64/apps/Thunar.png share/icons/hicolor/128x128/apps/Thunar.png share/icons/hicolor/scalable/apps/Thunar.svg %%NLS%%share/locale/am/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/en_AU/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ar/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ast/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/be/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/bg/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/bn/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ca/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/cs/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/da/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/de/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/el/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/eo/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/es/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/et/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/eu/LC_MESSAGES/Thunar.mo +%%NLS%%share/locale/fa_IR/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/fi/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/fr/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/gl/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/he/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/hr/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/hu/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/id/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/is/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/it/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ja/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/kk/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ko/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/lt/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/lv/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ms/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/nb/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/nl/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/nn/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/oc/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/pa/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/pl/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/pt/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ro/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ru/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/si/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/sk/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/sl/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/sq/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/sr/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/sv/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/te/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/th/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/tr/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ug/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/uk/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ur/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/ur_PK/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/vi/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/zh_HK/LC_MESSAGES/Thunar.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/Thunar.mo share/pixmaps/Thunar/Thunar-about-logo.png share/polkit-1/actions/org.xfce.thunar.policy %%PLUG_TPA%%share/xfce4/panel/plugins/thunar-tpa.desktop