diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2019-01-25 17:09:22 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2019-01-25 17:09:22 +0000 |
| commit | 053e538f04f94c5448c82c4ec1210aeea8b48b09 (patch) | |
| tree | b0a05ac0489df072bdf1c9ed93d063795ea46bc1 /x11-fm/thunar | |
| parent | a6b5ca3557e171f1e4b016ea78b4b464127f67ff (diff) | |
| download | ports-053e538f04f94c5448c82c4ec1210aeea8b48b09.tar.gz ports-053e538f04f94c5448c82c4ec1210aeea8b48b09.zip | |
- Update Thunar to 1.6.16
- Remove two part patch, partly upstreamed, partly unneeded
Notes
Notes:
svn path=/head/; revision=491161
Diffstat (limited to 'x11-fm/thunar')
| -rw-r--r-- | x11-fm/thunar/Makefile | 2 | ||||
| -rw-r--r-- | x11-fm/thunar/distinfo | 6 | ||||
| -rw-r--r-- | x11-fm/thunar/files/patch-thunar_thunar-file.c | 27 |
3 files changed, 4 insertions, 31 deletions
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index d1c2d85610e7..f41ef328b330 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Thunar -DISTVERSION= 1.6.15 +DISTVERSION= 1.6.16 CATEGORIES= x11-fm xfce MASTER_SITES= XFCE/src/xfce/${PORTNAME:tl}/${PORTVERSION:R} DIST_SUBDIR= xfce4 diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo index ad56cf7f4956..ca91580c722d 100644 --- a/x11-fm/thunar/distinfo +++ b/x11-fm/thunar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1523000526 -SHA256 (xfce4/Thunar-1.6.15.tar.bz2) = e81291a8519f495e0a059ff1f2d29608bc6d37c0be83b1f38f3c9aa25f8d252d -SIZE (xfce4/Thunar-1.6.15.tar.bz2) = 1964447 +TIMESTAMP = 1548368589 +SHA256 (xfce4/Thunar-1.6.16.tar.bz2) = cb9fc2a8005494124a8d412eff7d7cb8032f7ff91b3d254fcff2d0a0d2790d20 +SIZE (xfce4/Thunar-1.6.16.tar.bz2) = 1977562 diff --git a/x11-fm/thunar/files/patch-thunar_thunar-file.c b/x11-fm/thunar/files/patch-thunar_thunar-file.c deleted file mode 100644 index baa23b7c7bb5..000000000000 --- a/x11-fm/thunar/files/patch-thunar_thunar-file.c +++ /dev/null @@ -1,27 +0,0 @@ ---- thunar/thunar-file.c.orig 2017-11-25 16:54:56 UTC -+++ thunar/thunar-file.c -@@ -3966,7 +3966,9 @@ thunar_file_unwatch (ThunarFile *file) - gboolean - thunar_file_reload (ThunarFile *file) - { -- _thunar_return_val_if_fail (THUNAR_IS_FILE (file), FALSE); -+ /* 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); -@@ -4090,11 +4092,11 @@ thunar_file_compare_by_name (const ThunarFile *file_a, - - /* case insensitive checking */ - if (G_LIKELY (!case_sensitive)) -- result = strcmp (file_a->collate_key_nocase, file_b->collate_key_nocase); -+ result = g_strcmp0 (file_a->collate_key_nocase, file_b->collate_key_nocase); - - /* fall-back to case sensitive */ - if (result == 0) -- result = strcmp (file_a->collate_key, file_b->collate_key); -+ result = g_strcmp0 (file_a->collate_key, file_b->collate_key); - - /* this happens in the trash */ - if (result == 0) |