--- a/fontsupport/fontutils/group/bld.inf	Fri Jul 09 18:26:31 2010 +0800
+++ b/fontsupport/fontutils/group/bld.inf	Fri Jul 23 17:22:50 2010 +0800
@@ -26,15 +26,6 @@
 
 PRJ_EXPORTS
 
-// Copy font rasterizer
-../iTypeRaster/winscw/ityperast.dll                 /epoc32/release/winscw/udeb/iTypeRast.dll
-../iTypeRaster/winscw/ityperast.dll                 /epoc32/release/winscw/urel/iTypeRast.dll
-../iTypeRaster/winscw/ityperast.RSC                 /epoc32/release/winscw/udeb/z/resource/plugins/iTypeRast.rsc
-../iTypeRaster/winscw/ityperast.RSC                 /epoc32/release/winscw/urel/z/resource/plugins/iTypeRast.rsc
-
-../iTypeRaster/armv5/ityperast.dll                  /epoc32/release/armv5/udeb/iTypeRast.dll
-../iTypeRaster/armv5/ityperast.dll                  /epoc32/release/armv5/urel/iTypeRast.dll
-../iTypeRaster/armv5/ityperast.RSC                  /epoc32/data/z/resource/plugins/iTypeRast.RSC
 
 // Select correct font source directory
 #ifndef RD_KANNADA_FONTS

--- a/uigraphics/AknIcon/MifToCdlIndex/DllCreator.cpp	Fri Jul 09 18:26:31 2010 +0800
+++ b/uigraphics/AknIcon/MifToCdlIndex/DllCreator.cpp	Fri Jul 23 17:22:50 2010 +0800
@@ -25,8 +25,8 @@
 #include <CdlCompilerToolkit/CdlTkProcess.h>
 #include <sstream>
 
-DllCreator::DllCreator()
-:	iInterface(*CCdlTkCdlFileParser("\\epoc32\\include\\platform\\mw\\MifHeader.cdl").LoadAndParse(true)),
+DllCreator::DllCreator( const std::string& aFileName )
+:	iInterface(*CCdlTkCdlFileParser(aFileName).LoadAndParse(true)),
 	iInstance(iInterface)
 	{
 	iInstance.TemplateAllImplementations();

--- a/uigraphics/AknIcon/MifToCdlIndex/DllCreator.h	Fri Jul 09 18:26:31 2010 +0800
+++ b/uigraphics/AknIcon/MifToCdlIndex/DllCreator.h	Fri Jul 23 17:22:50 2010 +0800
@@ -33,7 +33,7 @@
 class DllCreator
 	{
 public:
-	DllCreator();
+	DllCreator( const std::string& aFileName );
 	void SetNameAndUid(const string& aDllName, const string& dllUid);
 	void SetIndex(const MifIndex& index);
 	void WriteSource();

--- a/uigraphics/AknIcon/MifToCdlIndex/MifToCdlIndex.cpp	Fri Jul 09 18:26:31 2010 +0800
+++ b/uigraphics/AknIcon/MifToCdlIndex/MifToCdlIndex.cpp	Fri Jul 23 17:22:50 2010 +0800
@@ -107,7 +107,17 @@
 	mif.Modify(dllUid);
 	mif.Write(mifName);
 
-	DllCreator dll;
+// START: Raptor chnages for linux
+	const char* epocRoot = getenv("EPOCROOT");
+	if(NULL == epocRoot)
+	    {
+	    throw MainArgsErr();
+	    }
+	std::string epocRootStr(epocRoot); 
+	std::string finalStr = epocRootStr + "epoc32//include//platform//mw//MifHeader.cdl";
+
+	DllCreator dll(finalStr);
+//  END
 	dll.SetNameAndUid(dllName, dllUid);
 	dll.SetIndex(index);
 	dll.WriteSource();

--- a/uigraphics/AknIcon/group/MifToCdlIndex.mmp	Fri Jul 09 18:26:31 2010 +0800
+++ b/uigraphics/AknIcon/group/MifToCdlIndex.mmp	Fri Jul 23 17:22:50 2010 +0800
@@ -37,11 +37,12 @@
 SYSTEMINCLUDE ../MifToCdlIndex ../inc
 MW_LAYER_SYSTEMINCLUDE
 
-START TOOLS
-  #if defined(CW32)
-    win32_library /epoc32/release/cwtools/rel/CdlCompilerToolkit.lib
-  #elif defined(VC32)
-    win32_library /epoc32/release/tools/rel/CdlCompilerToolkit.lib
-  #endif
-END
+STATICLIBRARY CdlCompilerToolkit.lib
+//START TOOLS
+//  #if defined(CW32)
+//    win32_library /epoc32/release/cwtools/rel/CdlCompilerToolkit.lib
+//  #elif defined(VC32)
+//    win32_library /epoc32/release/tools/rel/CdlCompilerToolkit.lib
+//  #endif
+//END
 

--- a/uigraphics/AknIcon/group/bld.inf	Fri Jul 09 18:26:31 2010 +0800
+++ b/uigraphics/AknIcon/group/bld.inf	Fri Jul 23 17:22:50 2010 +0800
@@ -20,7 +20,7 @@
 #include <platform_paths.hrh>
 
 PRJ_PLATFORMS 
-DEFAULT TOOLS 
+DEFAULT TOOLS2 TOOLS
 
 PRJ_EXPORTS
 
@@ -36,7 +36,7 @@
 ./s60extensions.xml      /epoc32/tools/makefile_templates/s60/s60extensions.xml
 
 PRJ_EXTENSIONS
-#if defined(SBSV2) && !defined(TOOLS)
+#if defined(SBSV2) && !defined(TOOLS) && !defined(TOOLS2)
 start extension s60/akniconinterfaces
 option FILENAME MifHeader
 end
@@ -44,7 +44,7 @@
 
 
 PRJ_MMPFILES
-#if defined(TOOLS)
+#if defined(TOOLS) || defined(TOOLS2)
 MifToCdlIndex.mmp
 #else
   

--- a/uigraphics/AknIcon/src/AknNvgFormatHandler.cpp	Fri Jul 09 18:26:31 2010 +0800
+++ b/uigraphics/AknIcon/src/AknNvgFormatHandler.cpp	Fri Jul 23 17:22:50 2010 +0800
@@ -170,6 +170,8 @@
         CFbsBitmap* aMask, TSize Bitmapsize, TDisplayMode Bitmapdepth,
         TDisplayMode Maskdepth, TRgb aColor, TBool aMarginFlag)
     {
+    if(!iData)
+        User::Leave(KErrNotFound);
     FormCommonHeader(aBitmap, EFalse, aColor, aMarginFlag);
     aBitmap->CreateExtendedBitmap(Bitmapsize, Bitmapdepth,
             KUidNvgProprietaryFormat, iData->Ptr(), iData->Length());
@@ -238,7 +240,7 @@
     {
     // Modes currently supported by SVG engine are:
     // EGray2, EColor4K, EColor64K, EColor16M
-    if ( aMode != EGray2 )
+//    if ( aMode != EGray2 ) EASK-824CMD:VGISymbianCopyToBitmap fails for bitmaps with EGray2 display modes.Modifying to create bitmaps with supported displaymodes
         {
         aMode = aPreferredMode;
         }