CVS commit: pkgsrc/sysutils/xfce4-mount-plugin

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Tue Jun 20 22:35:59 UTC 2017

Modified Files:
        pkgsrc/sysutils/xfce4-mount-plugin: Makefile distinfo
        pkgsrc/sysutils/xfce4-mount-plugin/patches:
            patch-panel-plugin_devices.c

Log Message:
Update xfce4-mount-plugin to 1.1.0:

2017/01/28 - Version 1.1.0
- Gtk 3.22 supported
- Allow several spaces in mountpoint names
- Support fuseblk devices by not using fusermount -u for them (checks for fuse.* now)

2016/05/29 - Version 1.0.0
- Gtk 3 Support only
- Panel Version 4.12 only


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/xfce4-mount-plugin/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/xfce4-mount-plugin/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xfce4-mount-plugin/Makefile
diff -u pkgsrc/sysutils/xfce4-mount-plugin/Makefile:1.5 pkgsrc/sysutils/xfce4-mount-plugin/Makefile:1.6
--- pkgsrc/sysutils/xfce4-mount-plugin/Makefile:1.5     Sun Feb 12 06:26:03 2017
+++ pkgsrc/sysutils/xfce4-mount-plugin/Makefile Tue Jun 20 22:35:58 2017
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2017/02/12 06:26:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/20 22:35:58 youri Exp $
 
-PKGREVISION= 4
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=      xfce4-mount-plugin-0.6.7
+DISTNAME=      xfce4-mount-plugin-1.1.0
 CATEGORIES=    sysutils
-MASTER_SITES=  http://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/0.6/
+MASTER_SITES=  http://archive.xfce.org/src/panel-plugins/xfce4-mount-plugin/1.1/
 
 HOMEPAGE=      http://goodies.xfce.org/projects/panel-plugins/xfce4-mount-plugin
 COMMENT=       Xfce mount/umount utility for the panel

Index: pkgsrc/sysutils/xfce4-mount-plugin/distinfo
diff -u pkgsrc/sysutils/xfce4-mount-plugin/distinfo:1.2 pkgsrc/sysutils/xfce4-mount-plugin/distinfo:1.3
--- pkgsrc/sysutils/xfce4-mount-plugin/distinfo:1.2     Wed Nov  4 01:32:40 2015
+++ pkgsrc/sysutils/xfce4-mount-plugin/distinfo Tue Jun 20 22:35:58 2017
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:40 agc Exp $
+$NetBSD: distinfo,v 1.3 2017/06/20 22:35:58 youri Exp $
 
-SHA1 (xfce4-mount-plugin-0.6.7.tar.bz2) = aff1b5883cd6b3e80989dcc963579b0078631712
-RMD160 (xfce4-mount-plugin-0.6.7.tar.bz2) = b17828ee08c28bd7ceaf083d1d1d94f7d66c98f3
-SHA512 (xfce4-mount-plugin-0.6.7.tar.bz2) = 18f4f4fc88c521f1fd6dcbcd3146fc8379e3aa0fb00e4787a34b6c52f68f765f18354e6b66e50c8b1a42e4f2366a5779cf057ba8b71fee45d0d3d023afe6fa7b
-Size (xfce4-mount-plugin-0.6.7.tar.bz2) = 390163 bytes
-SHA1 (patch-panel-plugin_devices.c) = 95685dd7eaf73028985ddbe85b8ea1ad9fcb1e3f
+SHA1 (xfce4-mount-plugin-1.1.0.tar.bz2) = dd651c48e819fb735795db4a70c8d09dc8a7fabd
+RMD160 (xfce4-mount-plugin-1.1.0.tar.bz2) = 058368d4d8ec61da315491a28fabbc3b4f3296e3
+SHA512 (xfce4-mount-plugin-1.1.0.tar.bz2) = 086fee8425c58448d07ff99c912bb7ef6eb1afcf0e29de4a62e445e67d5e37d7d808f04f271b8ae7a1fbabcc111edc135300cdb3eb77e4a6ad7d08fdeca34341
+Size (xfce4-mount-plugin-1.1.0.tar.bz2) = 425879 bytes
+SHA1 (patch-panel-plugin_devices.c) = c31984bf6f6e70f46b085460625787125309d50a

Index: pkgsrc/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c
diff -u pkgsrc/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c:1.1 pkgsrc/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c:1.2
--- pkgsrc/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c:1.1 Tue Apr 21 08:56:40 2015
+++ pkgsrc/sysutils/xfce4-mount-plugin/patches/patch-panel-plugin_devices.c     Tue Jun 20 22:35:59 2017
@@ -1,8 +1,9 @@
-$NetBSD: patch-panel-plugin_devices.c,v 1.1 2015/04/21 08:56:40 jperkin Exp $
+$NetBSD: patch-panel-plugin_devices.c,v 1.2 2017/06/20 22:35:59 youri Exp $
 
 Fix NetBSD build.
 Add SunOS support.
---- panel-plugin/devices.c.orig        2014-04-26 21:31:42.000000000 +0000
+
+--- panel-plugin/devices.c.orig        2017-01-28 15:03:36.000000000 +0000
 +++ panel-plugin/devices.c
 @@ -25,7 +25,12 @@ Foundation, Inc., 675 Mass Ave, Cambridg
  #include <config.h>
@@ -41,7 +42,7 @@ Add SunOS support.
  #include <libxfce4panel/xfce-panel-plugin.h>
  #include <libxfce4util/libxfce4util.h>
  #include <libxfce4ui/libxfce4ui.h>
-@@ -57,7 +71,6 @@ t_mount_info * mount_info_new_from_stat
+@@ -57,7 +71,6 @@ t_mount_info * mount_info_new_from_stat 
  
  #define MTAB "/etc/mtab"
  
@@ -49,7 +50,7 @@ Add SunOS support.
  /**
   * Return a string containing a size expressed in KB, MB or GB and the unit
   * it is expressed in.
-@@ -427,7 +440,15 @@ disks_new (gboolean include_NFSs, gboole
+@@ -468,7 +481,15 @@ disks_new (gboolean include_NFSs, gboole
  {
      GPtrArray * pdisks; /* to be returned */
      t_disk * pdisk;
@@ -63,9 +64,9 @@ Add SunOS support.
      struct fstab *pfstab;
 +#endif
      gboolean has_valid_mount_device;
-     GtkWidget *dialog;
  
-@@ -452,23 +473,46 @@ disks_new (gboolean include_NFSs, gboole
+     pdisks = g_ptr_array_new();
+@@ -501,23 +522,46 @@ disks_new (gboolean include_NFSs, gboole
      }
  
  
@@ -112,7 +113,7 @@ Add SunOS support.
              if (!device_or_mountpoint_exists(pdisks, pdisk))
                g_ptr_array_add (pdisks , pdisk);
  
-@@ -476,6 +520,9 @@ disks_new (gboolean include_NFSs, gboole
+@@ -525,6 +569,9 @@ disks_new (gboolean include_NFSs, gboole
  
      } /* end for */
  
@@ -122,7 +123,7 @@ Add SunOS support.
      endfsent(); /* close file */
  
      return pdisks;
-@@ -697,7 +744,11 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+@@ -746,7 +793,11 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
  
  #ifdef HAVE_GETMNTENT
      FILE * fmtab = NULL; /* file /etc/mtab */
@@ -134,7 +135,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
      int i, nb_mounted_fs = 0;
  #endif
-@@ -717,7 +768,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+@@ -766,7 +817,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
      pstatfs = g_new0 (struct statfs, 1);
  
      /* open file */
@@ -148,7 +149,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
      /* get mounted fs */
      nb_mounted_fs = getmntinfo(&pstatfs,MNT_WAIT);
-@@ -725,11 +782,19 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+@@ -774,11 +831,19 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
  
      /* start looking for mounted devices */
  #ifdef HAVE_GETMNTENT
@@ -168,7 +169,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
      for (i = 0; i < nb_mounted_fs ; i++) {
          DBG (" have entry: %s on %s : type %s", pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname, pstatfs[i].f_fstypename );
-@@ -740,13 +805,21 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+@@ -789,13 +854,21 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
          /* get pointer on disk from pdisks */
          /* CHANGED to reflect change in disk_search */
  #ifdef HAVE_GETMNTENT
@@ -190,7 +191,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
              exclude = exclude_filesystem (excluded_FSs, pstatfs[i].f_mntonname, pstatfs[i].f_mntfromname);
  #endif
-@@ -757,6 +830,18 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+@@ -806,6 +879,18 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
              /* test for mnt_dir==none or neither block device nor NFS or system device */
              if ( exclude ||
  #ifdef HAVE_GETMNTENT
@@ -209,15 +210,15 @@ Add SunOS support.
                g_ascii_strcasecmp(pmntent->mnt_dir, "none") == 0 ||
                g_str_has_prefix(pmntent->mnt_fsname, "gvfs-fuse-daemon") ||
                !(g_str_has_prefix(pmntent->mnt_fsname, "/dev/") ||
-@@ -767,6 +852,7 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
-                 g_str_has_prefix(pmntent->mnt_type, "shfs") 
+@@ -816,6 +901,7 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+                 g_str_has_prefix(pmntent->mnt_type, "shfs")
                ) ||
                g_str_has_prefix(pmntent->mnt_dir, "/sys/")
 +#endif
  #elif defined (HAVE_GETMNTINFO)
                /* TODO: add support for more fs types on BSD */
                g_ascii_strcasecmp(pstatfs[i].f_mntonname, "none") == 0 ||
-@@ -779,8 +865,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+@@ -828,8 +914,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
  
              /* else have valid entry reflecting block device or NFS */
  #ifdef HAVE_GETMNTENT
@@ -231,7 +232,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
              pdisk = disk_new (pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname, length);
              pdisk->dc = disk_classify (pstatfs[i].f_mntfromname, pstatfs[i].f_mntonname);
-@@ -790,8 +881,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
+@@ -839,8 +930,13 @@ disks_refresh(GPtrArray * pdisks, GPtrAr
  
          /* create new t_mount_info */
  #ifdef HAVE_GETMNTENT
@@ -245,7 +246,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
          mount_info = mount_info_new_from_stat (&pstatfs[i], pstatfs[i].f_fstypename,
                                                 pstatfs[i].f_mntonname);
-@@ -847,7 +943,11 @@ disk_check_mounted (const char *disk)
+@@ -896,7 +992,11 @@ disk_check_mounted (const char *disk)
  {
  #ifdef HAVE_GETMNTENT
      FILE *fmtab = NULL; /* file /etc/mtab */
@@ -257,7 +258,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
      struct statfs * pstatfs = NULL;
      int i, nb_mounted_fs = 0;
-@@ -856,7 +956,13 @@ disk_check_mounted (const char *disk)
+@@ -905,7 +1005,13 @@ disk_check_mounted (const char *disk)
  
  #ifdef HAVE_GETMNTENT
      /* open file */
@@ -271,7 +272,7 @@ Add SunOS support.
  #elif defined (HAVE_GETMNTINFO)
      /* get mounted fs */
      nb_mounted_fs = getmntinfo(&pstatfs,MNT_WAIT);
-@@ -864,14 +970,23 @@ disk_check_mounted (const char *disk)
+@@ -913,14 +1019,23 @@ disk_check_mounted (const char *disk)
  
      /* start looking for mounted devices */
  #ifdef HAVE_GETMNTENT