patches/cairo-dock-plugins-02-solaris.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 3605 0b77689e02f3
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3227
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     1
--- cairo-dock-plugins-2.2.0-4/GMenu/src/applet-run-dialog.c	2010-10-02 00:42:14.000000000 +0200
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     2
+++ cairo-dock-plugins-2.2.0-4-patch/GMenu/src/applet-run-dialog.c	2011-02-20 17:02:37.663012082 +0100
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     3
@@ -62,11 +62,7 @@
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     4
 		
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     5
 		suffix = NULL;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     6
 		if (
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     7
-		/* don't use g_file_test at first so we don't stat() */
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     8
-		    dent->d_type == DT_DIR ||
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
     9
-		    (dent->d_type == DT_LNK &&
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    10
-		     g_file_test (file, G_FILE_TEST_IS_DIR))
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    11
-			//g_file_test (file, G_FILE_TEST_IS_DIR)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    12
+			g_file_test (file, G_FILE_TEST_IS_DIR)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    13
 		   )
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    14
 			suffix = "/";
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    15
 		
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    16
--- cairo-dock-plugins-2.2.0-4/mail/src/CMakeLists.txt	2010-10-02 00:42:12.000000000 +0200
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    17
+++ cairo-dock-plugins-2.2.0-4-patch/mail/src/CMakeLists.txt	2011-02-20 17:07:51.319858503 +0100
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    18
@@ -18,7 +18,7 @@
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    19
 add_library(${PACKAGE_MAIL} SHARED ${cd-mail_LIB_SRCS})
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    20
 
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    21
 ########### compil ###############
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    22
-add_definitions (-D_POSIX_SOURCE=1 -DHAVE_SSL_SUPPORT=1)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    23
+add_definitions (-D_XOPEN_SOURCE=600 -DHAVE_SSL_SUPPORT=1)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    24
 add_definitions (-DMY_APPLET_SHARE_DATA_DIR="${maildatadir}")
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    25
 add_definitions (-DMY_APPLET_PREVIEW_FILE="preview.jpg")
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    26
 add_definitions (-DMY_APPLET_CONF_FILE="mail.conf")
3605
0b77689e02f3 SFEcairo-dock-plugins.spec: bump to 2.3.0~3
jurikm
parents: 3227
diff changeset
    27
--- cairo-dock-plugins-2.3.0~3/shortcuts/src/applet-disk-usage.c	Sun Jun 19 01:27:28 2011
0b77689e02f3 SFEcairo-dock-plugins.spec: bump to 2.3.0~3
jurikm
parents: 3227
diff changeset
    28
+++ applet-disk-usage.c	Wed Jul 13 21:51:53 2011
3227
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    29
@@ -17,11 +17,12 @@
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    30
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    31
 */
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    32
 
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    33
+#include <stdio.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    34
 #include <string.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    35
-#include <mntent.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    36
 #include <sys/types.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    37
-#include <sys/statfs.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    38
-#include <mntent.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    39
+#include <sys/statvfs.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    40
+#include <sys/mntent.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    41
+#include <sys/mnttab.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    42
 #include <math.h>
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    43
 
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    44
 #include <cairo-dock.h>
3605
0b77689e02f3 SFEcairo-dock-plugins.spec: bump to 2.3.0~3
jurikm
parents: 3227
diff changeset
    45
@@ -32,13 +33,11 @@
3227
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    46
 
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    47
 void cd_shortcuts_get_fs_stat (const gchar *cDiskURI, CDDiskUsage *pDiskUsage)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    48
 {
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    49
-	static struct statfs sts;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    50
+	static struct statvfs sts;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    51
 	const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    52
 	
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    53
-	if (statfs (cMountPath, &sts) == 0)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    54
+	if (statvfs (cMountPath, &sts) == 0)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    55
 	{
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    56
-		if (pDiskUsage->iType == 0)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    57
-			pDiskUsage->iType = sts.f_type;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    58
 		pDiskUsage->iAvail = (long long)sts.f_bavail * sts.f_bsize;  // Blocs libres pour utilisateurs
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    59
 		pDiskUsage->iFree  = (long long)sts.f_bfree  * sts.f_bsize;  // Blocs libres
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    60
 		pDiskUsage->iTotal = (long long)sts.f_blocks * sts.f_bsize;  // Nombre total de blocs
3605
0b77689e02f3 SFEcairo-dock-plugins.spec: bump to 2.3.0~3
jurikm
parents: 3227
diff changeset
    61
@@ -153,8 +152,8 @@
3227
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    62
 static void _cd_shortcuts_get_fs_info (const gchar *cDiskURI, GString *sInfo)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    63
 {
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    64
 	const gchar *cMountPath = (strncmp (cDiskURI, "file://", 7) == 0 ? cDiskURI + 7 : cDiskURI);
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    65
-	struct mntent *me;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    66
-	FILE *mtab = setmntent ("/etc/mtab", "r");
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    67
+	struct mnttab *me;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    68
+	FILE *mtab = fopen ("/etc/mnttab", "r");
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    69
 	char *search_path;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    70
 	int match;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    71
 	char *slash;
3605
0b77689e02f3 SFEcairo-dock-plugins.spec: bump to 2.3.0~3
jurikm
parents: 3227
diff changeset
    72
@@ -166,22 +165,20 @@
3227
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    73
 	}
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    74
 	
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    75
 	gchar *cFsInfo = NULL;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    76
-	while ((me = getmntent (mtab)) != NULL)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    77
+	while (getmntent (mtab, me) == 0)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    78
 	{
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    79
-		if (me->mnt_dir && strcmp (me->mnt_dir, cMountPath) == 0)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    80
+		if (me->mnt_mountp && strcmp (me->mnt_mountp, cMountPath) == 0)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    81
 		{
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    82
 			g_string_append_printf (sInfo, "Mount point : %s\nFile system : %s\nDevice : %s\nMount options : %s",
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    83
-				me->mnt_dir,
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    84
-				me->mnt_type,
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    85
-				me->mnt_fsname,
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    86
-				me->mnt_opts);
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    87
-			if (me->mnt_freq != 0)
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    88
-				g_string_append_printf (sInfo, "\nBackup frequency : %d days", me->mnt_freq);
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    89
+				me->mnt_mountp,
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    90
+				me->mnt_fstype,
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    91
+				me->mnt_special,
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    92
+				me->mnt_mntopts);
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    93
 			break ;
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    94
 		}
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    95
 	}
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    96
 	
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    97
-	endmntent (mtab);
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    98
+	fclose (mtab);
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
    99
 }
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
   100
 
04dcfd2055b9 SFEcairo-dock.spec: update to 2.2.0-4
jurikm
parents:
diff changeset
   101
 gchar *cd_shortcuts_get_disk_info (const gchar *cDiskURI, const gchar *cDiskName)