--- a/patches/GParted-01-solaris.diff Fri Oct 16 16:45:40 2009 +0000
+++ b/patches/GParted-01-solaris.diff Fri Oct 16 23:01:14 2009 +0000
@@ -1,6 +1,6 @@
-diff -ru ../gparted-0.4.5/compose/ucompose.hpp ./compose/ucompose.hpp
---- ../gparted-0.4.5/compose/ucompose.hpp 2009-04-18 13:38:05.000000000 -0700
-+++ ./compose/ucompose.hpp 2009-08-28 13:37:02.167527000 -0700
+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
@@ -127,7 +127,11 @@
return Glib::convert(std::string(reinterpret_cast<const char *>(str.data()),
@@ -13,9 +13,9 @@
}
// specialisations for the common string types
-diff -ru ../gparted-0.4.5/configure ./configure
---- ../gparted-0.4.5/configure 2009-05-08 09:05:43.000000000 -0700
-+++ ./configure 2009-06-12 10:12:27.781410000 -0700
+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
@@ -22031,6 +22031,10 @@
#include <stdio.h>
#include <parted/parted.h>
@@ -27,9 +27,9 @@
int main ()
{
int min_major ;
-diff -ru ../gparted-0.4.5/configure.in ./configure.in
---- ../gparted-0.4.5/configure.in 2009-05-08 08:50:41.000000000 -0700
-+++ ./configure.in 2009-06-12 10:12:05.631528000 -0700
+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
@@ -49,6 +49,10 @@
#include <stdio.h>
#include <parted/parted.h>
@@ -41,9 +41,9 @@
int main ()
{
int min_major ;
-diff -ru ../gparted-0.4.5/gparted.desktop ./gparted.desktop
---- ../gparted-0.4.5/gparted.desktop 2009-05-08 09:05:53.000000000 -0700
-+++ ./gparted.desktop 2009-06-12 10:44:28.470185000 -0700
+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
@@ -58,7 +58,7 @@
Comment[zh_CN]=创建、重新组织或删除分区
Comment[zh_HK]=建立、編輯或刪除分割區
@@ -53,9 +53,9 @@
Icon=gparted
Terminal=false
Type=Application
-diff -ru ../gparted-0.4.5/src/GParted_Core.cc ./src/GParted_Core.cc
---- ../gparted-0.4.5/src/GParted_Core.cc 2009-05-02 09:59:49.000000000 -0700
-+++ ./src/GParted_Core.cc 2009-06-10 15:19:53.573670000 -0700
+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
@@ -847,7 +847,11 @@
strncpy(magic, buf+0, 6) ; magic[6] = '\0' ; //set and terminate string
ped_device_close( lp_device );
@@ -111,9 +111,9 @@
{
temp = _( "BTRFS is not yet supported." ) ;
temp += "\n" ;
-diff -ru ../gparted-0.4.5/src/Utils.cc ./src/Utils.cc
---- ../gparted-0.4.5/src/Utils.cc 2009-04-19 11:05:13.000000000 -0700
-+++ ./src/Utils.cc 2009-06-10 15:02:38.660042000 -0700
+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
@@ -19,6 +19,7 @@
#include <sstream>
@@ -122,9 +122,9 @@
#include <regex.h>
#include <locale.h>
-diff -ru ../gparted-0.4.5/src/Win_GParted.cc ./src/Win_GParted.cc
---- ../gparted-0.4.5/src/Win_GParted.cc 2009-04-19 11:05:13.000000000 -0700
-+++ ./src/Win_GParted.cc 2009-06-10 15:04:57.634572000 -0700
+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
@@ -1690,9 +1690,14 @@
*succes = true ;
@@ -150,9 +150,122 @@
if ( *succes && failed_mountpoints .size() )
-diff -ru ../gparted-0.4.5/src/main.cc ./src/main.cc
---- ../gparted-0.4.5/src/main.cc 2009-04-18 13:38:05.000000000 -0700
-+++ ./src/main.cc 2009-06-12 10:38:31.131138000 -0700
+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
+@@ -62,12 +62,12 @@
+ {
+ index = output .find( "Free blocks:" ) ;
+ if ( index >= output .length() ||
+- sscanf( output.substr( index ) .c_str(), "Free blocks: %Ld", &N ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "Free blocks: %lld", &N ) != 1 )
+ N = -1 ;
+
+ index = output .find( "Block size:" ) ;
+ if ( index >= output.length() ||
+- sscanf( output.substr( index ) .c_str(), "Block size: %Ld", &S ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "Block size: %lld", &S ) != 1 )
+ S = -1 ;
+
+ 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
+@@ -63,12 +63,12 @@
+ {
+ index = output .find( "Free blocks:" ) ;
+ if ( index >= output .length() ||
+- sscanf( output.substr( index ) .c_str(), "Free blocks: %Ld", &N ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "Free blocks: %lld", &N ) != 1 )
+ N = -1 ;
+
+ index = output .find( "Block size:" ) ;
+ if ( index >= output.length() ||
+- sscanf( output.substr( index ) .c_str(), "Block size: %Ld", &S ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "Block size: %lld", &S ) != 1 )
+ S = -1 ;
+
+ 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
+@@ -67,12 +67,12 @@
+ {
+ index = output .find( "Free blocks:" ) ;
+ if ( index >= output .length() ||
+- sscanf( output.substr( index ) .c_str(), "Free blocks: %Ld", &N ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "Free blocks: %lld", &N ) != 1 )
+ N = -1 ;
+
+ index = output .find( "Block size:" ) ;
+ if ( index >= output.length() ||
+- sscanf( output.substr( index ) .c_str(), "Block size: %Ld", &S ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "Block size: %lld", &S ) != 1 )
+ S = -1 ;
+
+ 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
+@@ -68,14 +68,14 @@
+ {
+ //free clusters
+ index = output .find( ",", output .find( partition .get_path() ) + partition .get_path() .length() ) +1 ;
+- if ( index < output .length() && sscanf( output .substr( index ) .c_str(), "%Ld/%Ld", &S, &N ) == 2 )
++ if ( index < output .length() && sscanf( output .substr( index ) .c_str(), "%lld/%lld", &S, &N ) == 2 )
+ N -= S ;
+ else
+ N = -1 ;
+
+ //bytes per cluster
+ index = output .rfind( "\n", output .find( "bytes per cluster" ) ) +1 ;
+- if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%Ld", &S ) != 1 )
++ if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%lld", &S ) != 1 )
+ S = -1 ;
+
+ 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
+@@ -68,14 +68,14 @@
+ {
+ //free clusters
+ index = output .find( ",", output .find( partition .get_path() ) + partition .get_path() .length() ) +1 ;
+- if ( index < output .length() && sscanf( output .substr( index ) .c_str(), "%Ld/%Ld", &S, &N ) == 2 )
++ if ( index < output .length() && sscanf( output .substr( index ) .c_str(), "%lld/%lld", &S, &N ) == 2 )
+ N -= S ;
+ else
+ N = -1 ;
+
+ //bytes per cluster
+ index = output .rfind( "\n", output .find( "bytes per cluster" ) ) +1 ;
+- if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%Ld", &S ) != 1 )
++ if ( index >= output .length() || sscanf( output .substr( index ) .c_str(), "%lld", &S ) != 1 )
+ S = -1 ;
+
+ 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
+@@ -82,13 +82,13 @@
+ //blocksize
+ index = output .find( "Block Size:" ) ;
+ if ( index >= output .length() ||
+- sscanf( output .substr( index ) .c_str(), "Block Size: %Ld", &S ) != 1 )
++ sscanf( output .substr( index ) .c_str(), "Block Size: %lld", &S ) != 1 )
+ S = -1 ;
+
+ //free blocks
+ index = output .find( "dn_nfree:" ) ;
+ if ( index >= output .length() ||
+- sscanf( output .substr( index ) .c_str(), "dn_nfree: %Lx", &N ) != 1 )
++ sscanf( output .substr( index ) .c_str(), "dn_nfree: %llx", &N ) != 1 )
+ N = -1 ;
+
+ 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
@@ -20,8 +20,16 @@
#include <gtkmm/messagedialog.h>
#include <gtkmm/main.h>
@@ -170,3 +283,72 @@
//initialize thread system
Glib::thread_init() ;
+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
+@@ -66,9 +66,8 @@
+ {
+ index = output .find( "resize at" ) ;
+ if ( index >= output .length() ||
+- sscanf( output .substr( index ) .c_str(), "resize at %Ld", &N ) != 1 )
++ sscanf( output .substr( index ) .c_str(), "resize at %lld", &N ) != 1 )
+ N = -1 ;
+-
+ if ( N > -1 )
+ partition .set_used( Utils::round( N / 512.0 ) ) ;
+ }
+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
+@@ -59,12 +59,12 @@
+ {
+ index = output .find( "free blocks" ) ;
+ if ( index >= output .length() ||
+- sscanf( output.substr( index ) .c_str(), "free blocks: %Ld", &N ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "free blocks: %lld", &N ) != 1 )
+ N = -1 ;
+
+ index = output .find( "blksize" ) ;
+ if ( index >= output.length() ||
+- sscanf( output.substr( index ) .c_str(), "blksize: %Ld", &S ) != 1 )
++ sscanf( output.substr( index ) .c_str(), "blksize: %lld", &S ) != 1 )
+ S = -1 ;
+
+ 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
+@@ -67,12 +67,12 @@
+ {
+ index = output .find( "Blocksize" ) ;
+ if ( index >= output .length() ||
+- sscanf( output .substr( index ) .c_str(), "Blocksize: %Ld", &S ) != 1 )
++ sscanf( output .substr( index ) .c_str(), "Blocksize: %lld", &S ) != 1 )
+ S = -1 ;
+
+ index = output .find( ":", output .find( "Free blocks" ) ) +1 ;
+ if ( index >= output .length() ||
+- sscanf( output .substr( index ) .c_str(), "%Ld", &N ) != 1 )
++ sscanf( output .substr( index ) .c_str(), "%lld", &N ) != 1 )
+ N = -1 ;
+
+ 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
+@@ -85,13 +85,13 @@
+ true ) )
+ {
+ //blocksize
+- if ( sscanf( output .c_str(), "blocksize = %Ld", &S ) != 1 )
++ if ( sscanf( output .c_str(), "blocksize = %lld", &S ) != 1 )
+ S = -1 ;
+
+ //free blocks
+ index = output .find( "fdblocks" ) ;
+ if ( index > output .length() ||
+- sscanf( output .substr( index ) .c_str(), "fdblocks = %Ld", &N ) != 1 )
++ sscanf( output .substr( index ) .c_str(), "fdblocks = %lld", &N ) != 1 )
+ N = -1 ;
+
+ if ( N > -1 && S > -1 )