--- a/patches/GParted-01-solaris.diff Thu Oct 22 13:48:08 2009 +0000
+++ b/patches/GParted-01-solaris.diff Thu Oct 22 23:26:55 2009 +0000
@@ -1,6 +1,6 @@
diff -ru /home/ml40262/gparted/gparted-0.4.5/compose/ucompose.hpp ./compose/ucompose.hpp
--- /home/ml40262/gparted/gparted-0.4.5/compose/ucompose.hpp 2009-04-18 13:38:05.000000000 -0700
-+++ ./compose/ucompose.hpp 2009-10-02 14:51:38.786219000 -0700
++++ ./compose/ucompose.hpp 2009-10-16 15:33:54.265337000 -0700
@@ -127,7 +127,11 @@
return Glib::convert(std::string(reinterpret_cast<const char *>(str.data()),
@@ -15,7 +15,7 @@
// specialisations for the common string types
diff -ru /home/ml40262/gparted/gparted-0.4.5/configure ./configure
--- /home/ml40262/gparted/gparted-0.4.5/configure 2009-05-08 09:05:43.000000000 -0700
-+++ ./configure 2009-10-02 14:51:38.823393000 -0700
++++ ./configure 2009-10-16 15:33:54.304150000 -0700
@@ -22031,6 +22031,10 @@
#include <stdio.h>
#include <parted/parted.h>
@@ -29,7 +29,7 @@
int min_major ;
diff -ru /home/ml40262/gparted/gparted-0.4.5/configure.in ./configure.in
--- /home/ml40262/gparted/gparted-0.4.5/configure.in 2009-05-08 08:50:41.000000000 -0700
-+++ ./configure.in 2009-10-02 14:51:38.831958000 -0700
++++ ./configure.in 2009-10-16 15:33:54.313587000 -0700
@@ -49,6 +49,10 @@
#include <stdio.h>
#include <parted/parted.h>
@@ -43,7 +43,7 @@
int min_major ;
diff -ru /home/ml40262/gparted/gparted-0.4.5/gparted.desktop ./gparted.desktop
--- /home/ml40262/gparted/gparted-0.4.5/gparted.desktop 2009-05-08 09:05:53.000000000 -0700
-+++ ./gparted.desktop 2009-10-02 14:53:45.420824000 -0700
++++ ./gparted.desktop 2009-10-16 15:36:22.402991000 -0700
@@ -58,7 +58,7 @@
Comment[zh_CN]=创建、重新组织或删除分区
Comment[zh_HK]=建立、編輯或刪除分割區
@@ -53,9 +53,22 @@
Icon=gparted
Terminal=false
Type=Application
+diff -ru /home/ml40262/gparted/gparted-0.4.5/include/Utils.h ./include/Utils.h
+--- /home/ml40262/gparted/gparted-0.4.5/include/Utils.h 2009-04-19 11:05:13.000000000 -0700
++++ ./include/Utils.h 2009-10-21 13:40:34.747259000 -0700
+@@ -71,7 +71,8 @@
+
+ FS_BTRFS = 20, /* FIXME: Move this higher up list when full support added */
+ FS_LVM2 = 21,
+- FS_LUKS = 22
++ FS_LUKS = 22,
++ FS_SOLARIS = 23
+ } ;
+
+ enum SIZE_UNIT
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/GParted_Core.cc ./src/GParted_Core.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/GParted_Core.cc 2009-05-02 09:59:49.000000000 -0700
-+++ ./src/GParted_Core.cc 2009-10-02 14:51:38.848272000 -0700
++++ ./src/GParted_Core.cc 2009-10-21 15:10:07.784757000 -0700
@@ -847,7 +847,11 @@
strncpy(magic, buf+0, 6) ; magic[6] = '\0' ; //set and terminate string
ped_device_close( lp_device );
@@ -68,7 +81,16 @@
{
temp = _( "Linux Unified Key Setup encryption is not yet supported." ) ;
temp += "\n" ;
-@@ -911,7 +915,16 @@
+@@ -900,6 +904,8 @@
+ return GParted::FS_HFSPLUS ;
+ else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "ufs" )
+ return GParted::FS_UFS ;
++ else if ( Glib::ustring( lp_partition ->fs_type ->name ) == "solaris" )
++ return GParted::FS_SOLARIS ;
+ }
+
+
+@@ -911,7 +917,16 @@
ped_geometry_read( & lp_partition ->geom, buf, 128, 1 ) ;
ped_device_close( lp_device );
@@ -85,7 +107,7 @@
return GParted::FS_REISER4 ;
//lvm2
-@@ -925,8 +938,13 @@
+@@ -925,8 +940,13 @@
strncpy(magic2, buf+24, 4) ; magic2[4] = '\0' ; //set and terminate string
ped_device_close( lp_device );
@@ -99,7 +121,7 @@
{
temp = _( "Logical Volume Management is not yet supported." ) ;
temp += "\n" ;
-@@ -949,7 +967,11 @@
+@@ -949,7 +969,11 @@
strncpy(magic, buf_btrfs+64, BTRFS_SIGNATURE .size()) ; magic[BTRFS_SIGNATURE .size()] = '\0' ; //set and terminate string
ped_device_close( lp_device ) ;
@@ -113,7 +135,7 @@
temp += "\n" ;
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/Utils.cc ./src/Utils.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/Utils.cc 2009-04-19 11:05:13.000000000 -0700
-+++ ./src/Utils.cc 2009-10-02 14:51:38.856621000 -0700
++++ ./src/Utils.cc 2009-10-21 14:20:52.259713000 -0700
@@ -19,6 +19,7 @@
#include <sstream>
@@ -122,9 +144,25 @@
#include <regex.h>
#include <locale.h>
+@@ -87,6 +88,7 @@
+ case FS_HFS : return "#E0B6AF" ; //red hilight
+ case FS_HFSPLUS : return "#C0A39E" ; // ~ serene red
+ case FS_UFS : return "#D1940C" ; //accent yellow dark
++ case FS_SOLARIS : return "#9933FF" ; //sun purple
+ case FS_USED : return "#F8F8BA" ; // ~ light tan yellow
+ case FS_UNUSED : return "#FFFFFF" ; //white
+ case FS_LVM2 : return "#CC9966" ; // ~ medium brown
+@@ -135,6 +137,7 @@
+ case FS_HFS : return "hfs" ;
+ case FS_HFSPLUS : return "hfs+" ;
+ case FS_UFS : return "ufs" ;
++ case FS_SOLARIS : return "solaris" ;
+ case FS_USED : return _("used") ;
+ case FS_UNUSED : return _("unused") ;
+ case FS_LVM2 : return "lvm2" ;
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/Win_GParted.cc ./src/Win_GParted.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/Win_GParted.cc 2009-04-19 11:05:13.000000000 -0700
-+++ ./src/Win_GParted.cc 2009-10-02 14:51:38.865559000 -0700
++++ ./src/Win_GParted.cc 2009-10-16 15:33:54.349055000 -0700
@@ -1690,9 +1690,14 @@
*succes = true ;
@@ -152,7 +190,7 @@
if ( *succes && failed_mountpoints .size() )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/ext2.cc ./src/ext2.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/ext2.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/ext2.cc 2009-10-16 15:06:56.532833000 -0700
++++ ./src/ext2.cc 2009-10-16 15:33:54.360072000 -0700
@@ -62,12 +62,12 @@
{
index = output .find( "Free blocks:" ) ;
@@ -170,7 +208,7 @@
if ( N > -1 && S > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/ext3.cc ./src/ext3.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/ext3.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/ext3.cc 2009-10-16 15:05:51.957713000 -0700
++++ ./src/ext3.cc 2009-10-16 15:33:54.368076000 -0700
@@ -63,12 +63,12 @@
{
index = output .find( "Free blocks:" ) ;
@@ -188,7 +226,7 @@
if ( N > -1 && S > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/ext4.cc ./src/ext4.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/ext4.cc 2009-04-19 11:05:13.000000000 -0700
-+++ ./src/ext4.cc 2009-10-16 15:05:40.694818000 -0700
++++ ./src/ext4.cc 2009-10-16 15:33:54.375586000 -0700
@@ -67,12 +67,12 @@
{
index = output .find( "Free blocks:" ) ;
@@ -206,7 +244,7 @@
if ( N > -1 && S > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/fat16.cc ./src/fat16.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/fat16.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/fat16.cc 2009-10-16 15:05:30.397691000 -0700
++++ ./src/fat16.cc 2009-10-16 15:33:54.382437000 -0700
@@ -68,14 +68,14 @@
{
//free clusters
@@ -226,7 +264,7 @@
if ( N > -1 && S > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/fat32.cc ./src/fat32.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/fat32.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/fat32.cc 2009-10-16 15:05:18.997818000 -0700
++++ ./src/fat32.cc 2009-10-16 15:33:54.389232000 -0700
@@ -68,14 +68,14 @@
{
//free clusters
@@ -246,7 +284,7 @@
if ( N > -1 && S > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/jfs.cc ./src/jfs.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/jfs.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/jfs.cc 2009-10-16 15:05:08.934564000 -0700
++++ ./src/jfs.cc 2009-10-16 15:33:54.396315000 -0700
@@ -82,13 +82,13 @@
//blocksize
index = output .find( "Block Size:" ) ;
@@ -265,7 +303,7 @@
if ( S > -1 && N > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/main.cc ./src/main.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/main.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/main.cc 2009-10-02 14:51:38.873907000 -0700
++++ ./src/main.cc 2009-10-16 15:33:54.403171000 -0700
@@ -20,8 +20,16 @@
#include <gtkmm/messagedialog.h>
#include <gtkmm/main.h>
@@ -285,7 +323,7 @@
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/ntfs.cc ./src/ntfs.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/ntfs.cc 2009-04-19 11:05:13.000000000 -0700
-+++ ./src/ntfs.cc 2009-10-16 15:04:51.868152000 -0700
++++ ./src/ntfs.cc 2009-10-16 15:33:54.410077000 -0700
@@ -66,9 +66,8 @@
{
index = output .find( "resize at" ) ;
@@ -299,7 +337,7 @@
}
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/reiser4.cc ./src/reiser4.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/reiser4.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/reiser4.cc 2009-10-16 15:04:23.543290000 -0700
++++ ./src/reiser4.cc 2009-10-16 15:33:54.416591000 -0700
@@ -59,12 +59,12 @@
{
index = output .find( "free blocks" ) ;
@@ -317,7 +355,7 @@
if ( N > -1 && S > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/reiserfs.cc ./src/reiserfs.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/reiserfs.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/reiserfs.cc 2009-10-16 15:04:11.614400000 -0700
++++ ./src/reiserfs.cc 2009-10-16 15:33:54.423380000 -0700
@@ -67,12 +67,12 @@
{
index = output .find( "Blocksize" ) ;
@@ -335,7 +373,7 @@
if ( N > -1 && S > -1 )
diff -ru /home/ml40262/gparted/gparted-0.4.5/src/xfs.cc ./src/xfs.cc
--- /home/ml40262/gparted/gparted-0.4.5/src/xfs.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/xfs.cc 2009-10-16 15:04:02.616708000 -0700
++++ ./src/xfs.cc 2009-10-16 15:33:54.431044000 -0700
@@ -85,13 +85,13 @@
true ) )
{