--- Merging r33262 into '.':

U    rtl/haiku/sysos.inc
U    rtl/bsd/sysos.inc
U    rtl/solaris/sysos.inc
U    rtl/linux/sysos.inc
--- Recording mergeinfo for merge of r33262 into '.':
 U   .
--- Merging r33263 into '.':
U    rtl/aix/sysos.inc
--- Recording mergeinfo for merge of r33263 into '.':
 G   .
--- Merging r33291 into '.':
U    packages/fcl-image/src/fpwritebmp.pp
U    packages/fcl-image/src/fpreadbmp.pp
--- Recording mergeinfo for merge of r33291 into '.':
 G   .
--- Merging r33295 into '.':
U    packages/librsvg/fpmake.pp
--- Recording mergeinfo for merge of r33295 into '.':
 G   .

# revisions: 33262,33263,33291,33295

git-svn-id: branches/fixes_3_0@33391 -

packages/fcl-image/src/fpreadbmp.pp

@@ -62,6 +62,8 @@ type
     public
       constructor Create; override;
       destructor Destroy; override;
+      property XPelsPerMeter : integer read BFI.XPelsPerMeter;
+      property YPelsPerMeter : integer read BFI.YPelsPerMeter;
   end;
 
 implementation

packages/fcl-image/src/fpwritebmp.pp

@@ -36,6 +36,8 @@ type
     BFH : TBitMapFileHeader;
     BFI : TBitMapInfoHeader;
     Colinfo : array of TColorRGBA;
+    fXPelsPerMeter,
+    fYPelsPerMeter : integer;
     procedure SetColorSize (AValue : Byte);
     function GetColorSize : byte;
     procedure SetBpp (const abpp : byte);
@@ -53,6 +55,8 @@ type
   public
     constructor Create; override;
     property BitsPerPixel : byte read FBpp write SetBpp;
+    property XPelsPerMeter : integer read fXPelsPerMeter write fXPelsPerMeter;
+    property YPelsPerMeter : integer read fYPelsPerMeter write fYPelsPerMeter;
     property RLECompress : boolean read FRleCompress write FRleCompress;
     Property BytesPerPixel : Byte Read GetColorSize Write SetColorSize; deprecated;
   end;
@@ -86,6 +90,8 @@ end;
 constructor TFPWriterBMP.create;
 begin
   inherited create;
+  fXPelsPerMeter:=100;
+  fYPelsPerMeter:=100;
   FBpp:=24;
   FRleCompress:=false;
 end;
@@ -247,8 +253,8 @@ begin
     Planes:=1;
     if FBpp=15 then BitCount:=16
     else BitCount:=FBpp;
-    XPelsPerMeter:=100;
-    YPelsPerMeter:=100;
+    XPelsPerMeter:=fXPelsPerMeter;
+    YPelsPerMeter:=fYPelsPerMeter;
     ClrImportant:=0;
     end;
   with BFH do

packages/librsvg/fpmake.pp

@@ -16,7 +16,7 @@ begin
 {$ifdef ALLPACKAGES}
     P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
-    P.OSes := [beos,haiku,freebsd,netbsd,openbsd,linux,win32,aix,dragonfly];
+    P.OSes := [beos,haiku,freebsd,netbsd,openbsd,linux,win32,win64,aix,dragonfly];
     // Do not build x11 on iPhone (=arm-darwin)
     if Defaults.CPU<>arm then
       P.OSes := P.OSes + [darwin];

rtl/aix/sysos.inc

@@ -70,6 +70,8 @@ begin
  ESysENAMETOOLONG : Inoutres := 3;
     ESysEROFS,
    ESysEEXIST,
+   ESysEBusy,
+   ESysENOTDIR,        // busy, enotdir, mantis #25931
    ESysEACCES : Inoutres:=5;
    ESysEISDIR : InOutRes:=5;
   else

rtl/bsd/sysos.inc

@@ -128,6 +128,8 @@ begin
     ESysEROFS,
    ESysEEXIST,
    ESysENOTEMPTY,
+   ESysEBusy,
+   ESysENOTDIR,        // busy, enotdir, mantis #25931
    ESysEACCES : Inoutres:=5;
    ESysEISDIR : InOutRes:=5;
   else

rtl/haiku/sysos.inc

@@ -108,6 +108,8 @@ begin
     ESysEROFS,
    ESysEEXIST,
    ESysENOTEMPTY,
+   ESysEBusy,
+   ESysENOTDIR,        // busy, enotdir, mantis #25931
    ESysEACCES : Inoutres:=5;
    ESysEISDIR : InOutRes:=5;
    ESysEPERM  : InOutRes:=5;

rtl/linux/sysos.inc

@@ -113,6 +113,8 @@ begin
     ESysEEXIST,
     ESysENOTEMPTY,
     ESysEACCES:         r:=5;
+    ESysEBusy,
+    ESysENOTDIR,        // busy, enotdir, mantis #25931      
     ESysEISDIR:         r:=5;
   else
     r:=PosixErrno;

rtl/solaris/sysos.inc

@@ -71,6 +71,8 @@ begin
     ESysEROFS,
    ESysEEXIST,
    ESysENOTEMPTY,
+   ESysEBusy,
+   ESysENOTDIR,        // busy, enotdir, mantis #25931
    ESysEACCES : Inoutres:=5;
    ESysEISDIR : InOutRes:=5;
   else