Mon Jun 8 00:06:38 CEST 2009

Author: zooey
Date: 2009-06-08 00:06:21 +0200 (Mon, 08 Jun 2009)
New Revision: 30991
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30991&view=rev

Added:
   haiku/branches/components/gsoc-locale-kit/data/bin/freetype-config
   haiku/branches/components/gsoc-locale-kit/data/system/data/licenses/GNU LGPL v3
   haiku/branches/components/gsoc-locale-kit/headers/private/graphics/ati/
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/debug_heap.h
   haiku/branches/components/gsoc-locale-kit/headers/private/locale/langinfo.h
   haiku/branches/components/gsoc-locale-kit/headers/private/locale/monetary.h
   haiku/branches/components/gsoc-locale-kit/headers/private/locale/nl_types.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/ati/
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/debugger/demangle/demangle.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/debugger/demangle/demangle.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/graphics/ati/
   haiku/branches/components/gsoc-locale-kit/src/bin/watch.c
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/debug_heap.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/generic/s_llrint.c
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/generic/s_llrintf.c
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/generic/s_llrintl.c
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/generic/s_lrint.c
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/generic/s_lrintf.c
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/generic/s_lrintl.c
   haiku/branches/components/gsoc-locale-kit/src/tests/system/kernel/cache/file_map_test.cpp
Removed:
   haiku/branches/components/gsoc-locale-kit/headers/posix/langinfo.h
   haiku/branches/components/gsoc-locale-kit/headers/posix/monetary.h
   haiku/branches/components/gsoc-locale-kit/headers/posix/nl_types.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/atimach64/
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/graphics/atimach64/
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/fsproto.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/version.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/version.h
   haiku/branches/components/gsoc-locale-kit/src/preferences/menu/
   haiku/branches/components/gsoc-locale-kit/src/preferences/mouse/MouseBitmap.h
Modified:
   haiku/branches/components/gsoc-locale-kit/build/config_headers/kernel_debug_config.h
   haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage
   haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies
   haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages
   haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles
   haiku/branches/components/gsoc-locale-kit/configure
   haiku/branches/components/gsoc-locale-kit/data/develop/makefile
   haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine
   haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript
   haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript.cd
   haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h
   haiku/branches/components/gsoc-locale-kit/headers/os/support/String.h
   haiku/branches/components/gsoc-locale-kit/headers/posix/math.h
   haiku/branches/components/gsoc-locale-kit/headers/posix/sys/ioctl.h
   haiku/branches/components/gsoc-locale-kit/headers/private/graphics/nvidia/DriverInterface.h
   haiku/branches/components/gsoc-locale-kit/headers/private/graphics/nvidia/nv_macros.h
   haiku/branches/components/gsoc-locale-kit/headers/private/graphics/vesa/vesa.h
   haiku/branches/components/gsoc-locale-kit/headers/private/graphics/vesa/vesa_info.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/arch/x86/arch_int.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/boot_device.h
   haiku/branches/components/gsoc-locale-kit/headers/private/kernel/vm_types.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/DecoderPlugin.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/PluginManager.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/ReaderPlugin.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/TList.h
   haiku/branches/components/gsoc-locale-kit/headers/private/media/TMap.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/nvidia/engine/nv_general.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/nvidia/engine/nv_i2c.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/nvidia/engine/nv_info.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/nvidia/engine/nv_proto.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/vesa/dpms.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/accelerants/vesa/mode.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/debugger/demangle/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/debugger/demangle/gcc2.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/debugger/demangle/gcc3+.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/debugger/disasm/disasm.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/graphics/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/graphics/vesa/device.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/drivers/graphics/vesa/vesa_private.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/bfs/Debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/iso9660/iso9660.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/iso9660/iso9660.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/layers/attribute_overlay/attribute_overlay.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/layers/write_overlay/write_overlay.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/attributes.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/fs_func.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/attrib.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/attrib.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/attrlist.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/bitmap.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/bitmap.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/bootsect.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/compat.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/compat.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/compress.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/debug.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/device.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/dir.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/dir.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/endians.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/index.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/index.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/inode.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/inode.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/layout.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/lcnalloc.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/logfile.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/logging.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/logging.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/mft.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/mft.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/misc.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/misc.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/mst.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/runlist.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/security.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/security.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/unistr.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/unistr.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/unix_io.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/volume.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/volume.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/libntfs/win32_io.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/lock.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/ntfs.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/ntfsdir.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/ntfsdir.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/settings/ntfs
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/utils.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/file_systems/ntfs/volume_util.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/network/stack/net_socket.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/avcodec/libavcodec/config.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/matroska/libMatroskaParser/MatroskaParser.c
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/matroska/libMatroskaParser/MatroskaParser.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/matroska/libMatroskaParser/StreamIO.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/matroska/libebml/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/matroska/libebml/ebml/EbmlTypes.h
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/matroska/libmatroska/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/add-ons/media/plugins/matroska/matroska_reader.cpp
   haiku/branches/components/gsoc-locale-kit/src/add-ons/translators/hvif/HVIFTranslator.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/activitymonitor/ActivityView.cpp
   haiku/branches/components/gsoc-locale-kit/src/apps/activitymonitor/CircularBuffer.h
   haiku/branches/components/gsoc-locale-kit/src/apps/cdplayer/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/apps/sudoku/SudokuView.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/bin/addattr/addAttr.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/addattr/addAttr.h
   haiku/branches/components/gsoc-locale-kit/src/bin/addattr/main.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/coreutils/src/copy.c
   haiku/branches/components/gsoc-locale-kit/src/bin/desklink/VolumeControl.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/locale/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/bin/mkfs/FsCreator.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/mountvolume.cpp
   haiku/branches/components/gsoc-locale-kit/src/bin/zip/ttyio.h
   haiku/branches/components/gsoc-locale-kit/src/build/libbe/support/String.cpp
   haiku/branches/components/gsoc-locale-kit/src/build/libroot/fs.cpp
   haiku/branches/components/gsoc-locale-kit/src/data/beos_mime/text/x-source-code
   haiku/branches/components/gsoc-locale-kit/src/data/etc/keymaps/Colemak.keymap
   haiku/branches/components/gsoc-locale-kit/src/kits/bluetooth/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/TextView.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/View.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/interface/Window.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/DecoderPlugin.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/MediaFile.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/PluginManager.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/media/ReaderPlugin.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/network/dns/irs/lcl_ho.c
   haiku/branches/components/gsoc-locale-kit/src/kits/network/dns/irs/lcl_sv.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/storage/disk_device/Partition.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/support/String.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/support/Url.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/tracker/InfoWindow.cpp
   haiku/branches/components/gsoc-locale-kit/src/kits/tracker/InfoWindow.h
   haiku/branches/components/gsoc-locale-kit/src/preferences/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/preferences/mouse/Mouse.rdef
   haiku/branches/components/gsoc-locale-kit/src/preferences/mouse/MouseView.cpp
   haiku/branches/components/gsoc-locale-kit/src/servers/app/app_server.rdef
   haiku/branches/components/gsoc-locale-kit/src/servers/net/Services.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/arch/x86/arch_debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/cache/block_cache.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/cache/file_map.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/debug_commands.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/debug/debug_parser.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/device_manager/IOScheduler.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/device_manager/devfs.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/fs/vfs.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/fs/vfs_boot.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/slab/Slab.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/thread.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/vm/VMAnonymousCache.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/vm/vm.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/kernel/vm/vm_cache.cpp
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/m68k/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/system/libroot/posix/glibc/arch/ppc/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/tests/add-ons/kernel/file_systems/random_file_actions/random_file_actions.cpp
   haiku/branches/components/gsoc-locale-kit/src/tests/add-ons/kernel/kernelland_emu/debug.cpp
   haiku/branches/components/gsoc-locale-kit/src/tests/system/kernel/cache/Jamfile
   haiku/branches/components/gsoc-locale-kit/src/tools/gensyscalls/gensyscalls.cpp
Log:
* merged changes from trunk up to r30990

Modified: haiku/branches/components/gsoc-locale-kit/build/config_headers/kernel_debug_config.h
===================================================================

--- haiku/branches/components/gsoc-locale-kit/build/config_headers/kernel_debug_config.h	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/build/config_headers/kernel_debug_config.h	2009-06-07 22:06:21 UTC (rev 30991)
@@ -18,6 +18,9 @@
 // benaphore-style.
 #define KDEBUG							KDEBUG_LEVEL_2
 
+// Size of the heap used by the kernel debugger.
+#define KDEBUG_HEAP						(64 * 1024)
+
 // Set to 0 to disable support for kernel breakpoints.
 #define KERNEL_BREAKPOINTS				1
 

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/HaikuImage	2009-06-07 22:06:21 UTC (rev 30991)
@@ -60,7 +60,7 @@
 	tr traceroute translate trash true truncate tsort tty
 	uname unchop unexpand unmount uniq unlink unrar unshar unzip unzipsfx
 	<bin>updatedb uptime urlwrapper useradd uudecode uuencode
-	vdir version vim vmstat waitfor wc wget whoami xargs xres yes
+	vdir version vim vmstat waitfor watch wc wget whoami xargs xres yes
 	zdiff zforce zgrep zip zipcloak <bin>zipgrep zipnote zipsplit zmore znew
 ;
 
@@ -71,7 +71,7 @@
 	StyledEdit Terminal TextSearch TV Workspaces
 ;
 SYSTEM_PREFERENCES = Appearance Backgrounds CPUFrequency DataTranslations E-mail
-	FileTypes Fonts Keyboard Keymap Locale Media Menu Mouse Network Printers
+	FileTypes Fonts Keyboard Keymap Locale Media Mouse Network Printers
 	Screen ScreenSaver Sounds Time Touchpad <preference>Tracker VirtualMemory
 ;
 SYSTEM_DEMOS = BSnow Chart Clock Cortex FontDemo
@@ -100,6 +100,7 @@
 	$(X86_ONLY)nvidia.accelerant $(X86_ONLY)matrox.accelerant
 	$(X86_ONLY)neomagic.accelerant $(X86_ONLY)intel_extreme.accelerant
 	$(X86_ONLY)s3.accelerant $(X86_ONLY)vesa.accelerant
+	$(X86_ONLY)ati.accelerant
 	#$(X86_ONLY)via.accelerant
 	#$(X86_ONLY)vmware.accelerant
 ;
@@ -142,6 +143,7 @@
 SYSTEM_ADD_ONS_DRIVERS_GRAPHICS = $(X86_ONLY)radeon $(X86_ONLY)nvidia
 	$(X86_ONLY)neomagic $(X86_ONLY)matrox $(X86_ONLY)intel_extreme
 	$(X86_ONLY)s3 $(X86_ONLY)vesa #$(X86_ONLY)via #$(X86_ONLY)vmware
+	$(X86_ONLY)ati
 ;
 SYSTEM_ADD_ONS_DRIVERS_MIDI = emuxki ;
 SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)broadcom440x
@@ -183,8 +185,8 @@
 	: <usb>uhci <usb>ohci <usb>ehci ;
 AddFilesToHaikuImage system add-ons kernel console : vga_text ;
 AddFilesToHaikuImage system add-ons kernel debugger
-	: $(X86_ONLY)<kdebug>disasm <kdebug>hangman <kdebug>invalidate_on_exit
-	<kdebug>usb_keyboard <kdebug>run_on_exit ;
+	: <kdebug>demangle $(X86_ONLY)<kdebug>disasm <kdebug>hangman
+	  <kdebug>invalidate_on_exit <kdebug>usb_keyboard <kdebug>run_on_exit ;
 AddFilesToHaikuImage system add-ons kernel file_systems
 	: $(SYSTEM_ADD_ONS_FILE_SYSTEMS) ;
 AddFilesToHaikuImage system add-ons kernel generic
@@ -197,11 +199,6 @@
 
 if $(TARGET_ARCH) = x86 {
 	AddFilesToHaikuImage system add-ons kernel cpu : generic_x86 ;
-
-	if $(HAIKU_GCC_VERSION[1]) = 2 {
-		AddFilesToHaikuImage system add-ons kernel debugger demangle :
-			<kdebug>gcc2 ;
-	}
 }
 
 # drivers

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackageDependencies	2009-06-07 22:06:21 UTC (rev 30991)
@@ -3,11 +3,12 @@
 # For transitive dependencies dependants should be listed before their
 # dependencies.
 
+OptionalPackageDependencies Subversion : APR-util Neon LibIconv LibXML2 OpenSSL SQLite ;
 OptionalPackageDependencies APR-util : APR ;
 OptionalPackageDependencies BeHappy : BeBook NetSurf ;
 OptionalPackageDependencies Development : DevelopmentBase Perl ;
-OptionalPackageDependencies DevelopmentBase : DevelopmentMin Yasm ;
+OptionalPackageDependencies DevelopmentBase : CDRecord DevelopmentMin Yasm ;
 OptionalPackageDependencies LibLayout : DevelopmentBase ;
 OptionalPackageDependencies NetSurf : OpenSSL ;
 OptionalPackageDependencies OpenSSH : OpenSSL ;
-OptionalPackageDependencies Subversion : OpenSSL ;
+

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/OptionalPackages	2009-06-07 22:06:21 UTC (rev 30991)
@@ -20,14 +20,19 @@
 #	BeOSCompatibility
 #	BePDF
 #	Bluetooth
+#	CDRecord
 #	CVS
 #	Development			- more complete dev environment (including autotools)
 #	DevelopmentBase		- basic development environment (gcc, headers, libs,...)
 #	DevelopmentMin		- development headers, libs, tools, from sources only
 #	Firefox
 #	KeymapSwitcher
+#	LibIconv
 #	LibLayout
+#	LibXML2
 #	Links
+#	Nano
+#	Neon
 #	NetSurf
 #	OpenSound
 #	OpenSSH
@@ -35,10 +40,13 @@
 #	P7zip
 #	Pe
 #	Perl
+#	Python
 #	Rsync
+#	SQLite
 #	Subversion
 #	Tar
 #	UserlandFS
+#	Vim
 #	Vision
 #	VLC
 #	Welcome
@@ -51,9 +59,9 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package APR available for $(TARGET_ARCH)" ;
 	} else {
-		local baseURL = http://haiku-files.org/files/optional-packages ;
-		InstallOptionalHaikuImagePackage apr-0.9.17-gcc2-2008-05-20
-			: $(baseURL)/apr-0.9.17-gcc2-2008-05-20.zip
+		local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr ;
+		InstallOptionalHaikuImagePackage apr-1.3.3-gcc2-haiku-2009-05-27
+			: $(baseURL)/apr-1.3.3-gcc2-haiku-2009-05-27.zip
 			:
 		;
 	}
@@ -65,9 +73,9 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package APR-util available for $(TARGET_ARCH)" ;
 	} else {
-		local baseURL = http://haiku-files.org/files/optional-packages ;
-		InstallOptionalHaikuImagePackage apr-util-0.9.15-gcc2-2008-05-15
-			: $(baseURL)/apr-util-0.9.15-gcc2-2008-05-15.zip
+		local baseURL = http://www.haiku-ports.de/packages/dev-libs/apr-util ;
+		InstallOptionalHaikuImagePackage apr-util-1.3.4-gcc2-haiku-2009-05-27
+			: $(baseURL)/apr-util-1.3.4-gcc2-haiku-2009-05-27.zip
 			:
 		;
 	}
@@ -179,6 +187,20 @@
 }
 
 
+# CDRecord
+if [ IsOptionalHaikuImagePackageAdded CDRecord ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package CDRecord available for $(TARGET_ARCH)" ;
+	} else {
+		local baseURL = http://www.haiku-ports.de/packages ;
+		InstallOptionalHaikuImagePackage cdrecord-2.01.01a59-gcc2-haiku-2009-05-26
+			: $(baseURL)/app-cdr/cdrtools/cdrecord-2.01.01a59-gcc2-haiku-2009-05-26.zip
+			:
+		;
+	}
+}
+
+
 # CVS
 if [ IsOptionalHaikuImagePackageAdded CVS ] {
 	if $(TARGET_ARCH) != x86 {
@@ -242,12 +264,14 @@
 	local baseURL = http://haiku-files.org/files/optional-packages ;
 	InstallOptionalHaikuImagePackage bison-2.4-gcc2-2008-11-09
 		: $(baseURL)/bison-2.4-gcc2-2008-11-09.zip ;
-	InstallOptionalHaikuImagePackage flex-2.5.35-gcc2-2008-11-09
-		: $(baseURL)/flex-2.5.35-gcc2-2008-11-09.zip ;
-	InstallOptionalHaikuImagePackage jam-haiku-gcc2-2008-03-27-2
-		: $(baseURL)/jam-haiku-gcc2-2008-03-27-2.zip ;
 	InstallOptionalHaikuImagePackage m4-1.4.12-gcc2-2008-11-04
 		: $(baseURL)/m4-1.4.12-gcc2-2008-11-04.zip ;
+	local baseURL = http://www.haiku-ports.de/packages ;		
+	InstallOptionalHaikuImagePackage flex-2.5.35-gcc2-haiku-2009-05-26
+		: $(baseURL)/sys-devel/flex/flex-2.5.35-gcc2-haiku-2009-05-26.zip ;
+	InstallOptionalHaikuImagePackage jam-gcc2-haiku-2009-05-26
+		: $(baseURL)/dev-util/jam/jam-gcc2-haiku-2009-05-26.zip ;
+
 }
 
 
@@ -302,8 +326,8 @@
 
 	# ABI independent stuff
 
-	# scripts: cc and c++ wrapper, setgcc
-	local scripts = cc c++ setgcc ;
+	# scripts: cc and c++ wrapper, freetype-config, setgcc
+	local scripts = cc c++ freetype-config setgcc ;
 	SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
 	AddFilesToHaikuImage system bin : $(scripts) ;
 
@@ -359,8 +383,9 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Firefox available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
+		local baseURL = http://haiku-files.org/files/optional-packages ;
 		InstallOptionalHaikuImagePackage BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01
-			: http://haiku-files.org/files/optional-packages/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
+			: $(baseURL)/BeZillaBrowser-2.0.0.21pre-haiku-gcc4-x86-09-03-01.zip
  			: apps
  		;
  		AddSymlinkToHaikuImage home config be Applications
@@ -383,11 +408,17 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package KeymapSwitcher available for $(TARGET_ARCH)" ;
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
-		Echo "No optional package KeymapSwitcher available for gcc4" ;
+		local baseURL = http://downloads.sourceforge.net/dotmatrix4beos ;
+		InstallOptionalHaikuImagePackage KeymapSwitcher-gcc4-20090531
+			:  $(baseURL)/KeymapSwitcher-1.2.3-gcc4-2009-05-31.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Desktop\ Applets
+			: /boot/common/bin/KeymapSwitcher ;
 	} else {
 		local baseURL = http://downloads.sourceforge.net/dotmatrix4beos ;
-		InstallOptionalHaikuImagePackage KeymapSwitcher-gcc2-20090409
-			:  $(baseURL)/HaikuKeymapSwitcher-package-1.0.2.zip
+		InstallOptionalHaikuImagePackage KeymapSwitcher-gcc2-20090531
+			:  $(baseURL)/KeymapSwitcher-1.2.3-gcc2-2009-05-31.zip
 			:
 		;
 		AddSymlinkToHaikuImage home config be Desktop\ Applets
@@ -396,6 +427,20 @@
 }
 
 
+# LibIconv
+if [ IsOptionalHaikuImagePackageAdded LibIconv ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package LibIconv available for $(TARGET_ARCH)" ;
+	} else {
+		local baseURL = http://www.haiku-ports.de/packages/dev-libs/libiconv ;
+		InstallOptionalHaikuImagePackage libiconv-1.13-gcc2-haiku-2009-05-27
+			: $(baseURL)/libiconv-1.13-gcc2-haiku-2009-05-27.zip
+			:
+		;
+	}
+}
+
+
 # LibLayout library
 if [ IsOptionalHaikuImagePackageAdded LibLayout ] {
 	if $(TARGET_ARCH) != x86 {
@@ -412,6 +457,20 @@
 }
 
 
+# LibXML2
+if [ IsOptionalHaikuImagePackageAdded LibXML2 ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package LibXML2 available for $(TARGET_ARCH)" ;
+	} else {
+		local baseURL = http://www.haiku-ports.de/packages/dev-libs/libxml2 ;
+		InstallOptionalHaikuImagePackage libxml2-2.7.3-gcc2-haiku-2009-05-27
+			: $(baseURL)/libxml2-2.7.3-gcc2-haiku-2009-05-27.zip
+			:
+		;
+	}
+}
+
+
 # Links web browser
 if [ IsOptionalHaikuImagePackageAdded Links ] {
 	if $(TARGET_ARCH) != x86 {
@@ -429,6 +488,34 @@
 }
 
 
+# Nano
+if [ IsOptionalHaikuImagePackageAdded Nano ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Nano available for $(TARGET_ARCH)" ;
+	} else {
+		local baseURL = http://www.haiku-ports.de/packages ;
+		InstallOptionalHaikuImagePackage nano-2.0.9-gcc2-haiku-2009-05-27
+			: $(baseURL)/app-editors/nano/nano-2.0.9-gcc2-haiku-2009-05-27.zip
+			:
+		;
+	}
+}
+
+
+# Neon
+if [ IsOptionalHaikuImagePackageAdded Neon ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Neon available for $(TARGET_ARCH)" ;
+	} else {
+		local baseURL = http://www.haiku-ports.de/packages/net-misc/neon ;
+		InstallOptionalHaikuImagePackage neon-0.28.4-gcc2-haiku-2009-05-23
+			: $(baseURL)/neon-0.28.4-gcc2-haiku-2009-05-23.zip
+			:
+		;
+	}
+}
+
+
 # NetSurf web browser
 if [ IsOptionalHaikuImagePackageAdded NetSurf ] {
 	if $(TARGET_ARCH) != x86 {
@@ -470,9 +557,9 @@
 				"variable to be set!" ;
 		}
 
-		local baseURL = http://haiku-files.org/files/optional-packages ;
-		InstallOptionalHaikuImagePackage openssh-5.0p1-gcc2-2008-05-04-1
-			: $(baseURL)/openssh-5.0p1-gcc2-2008-05-04-1.zip
+		local baseURL = http://www.haiku-ports.de/packages/net-misc/openssh ;
+		InstallOptionalHaikuImagePackage openssh-5.2p1-gcc2-haiku-2009-05-27
+			: $(baseURL)/openssh-5.2p1-gcc2-haiku-2009-05-27.zip
 			:
 		;
 
@@ -502,8 +589,9 @@
 	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
 		Echo "No optional package P7zip available for gcc4" ;
 	} else {
-		InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-20
-			: http://haiku-files.org/files/optional-packages/p7zip-4.65-gcc2-haiku-2009-05-20.zip
+		local baseURL = http://www.haiku-ports.de/packages/app-arch/p7zip ;
+		InstallOptionalHaikuImagePackage p7zip-4.65-gcc2-haiku-2009-05-24
+			: $(baseURL)/p7zip-4.65-gcc2-haiku-2009-05-24.zip
 			:
 		;
 
@@ -560,6 +648,34 @@
 }
 
 
+# Python
+if [ IsOptionalHaikuImagePackageAdded Python ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Python available for $(TARGET_ARCH)" ;
+	} else {
+		local baseURL = http://www.haiku-ports.de/packages/dev-lang/python ;
+		InstallOptionalHaikuImagePackage python-2.6.2-gcc2-haiku-2009-05-27
+			: $(baseURL)/python-2.6.2-gcc2-haiku-2009-05-27.zip
+			:
+		;
+	}
+}
+
+
+# SQLite
+if [ IsOptionalHaikuImagePackageAdded SQLite ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package SQLite available for $(TARGET_ARCH)" ;
+	} else {
+		local baseURL = http://www.haiku-ports.de/packages/dev-db/sqlite ;
+		InstallOptionalHaikuImagePackage sqlite-3.6.14-gcc2-haiku-2009-05-10
+			: $(baseURL)/sqlite-3.6.14-gcc2-haiku-2009-05-10.zip
+			:
+		;
+	}
+}
+
+
 # Rsync
 if [ IsOptionalHaikuImagePackageAdded Rsync ] {
 	if $(TARGET_ARCH) != x86 {
@@ -579,9 +695,10 @@
 	if $(TARGET_ARCH) != x86 {
 		Echo "No optional package Subversion available for $(TARGET_ARCH)" ;
 	} else {
-		InstallOptionalHaikuImagePackage Subversion
-			: http://haiku.mlotz.ch/subversion-1.4.6-haiku-20080628.zip
-			: home
+		local baseURL = http://www.haiku-ports.de/packages/dev-util/subversion ;
+		InstallOptionalHaikuImagePackage subversion-1.6.2-gcc2-haiku-2009-05-20
+			: $(baseURL)/subversion-1.6.2-gcc2-haiku-2009-05-20.zip
+			:
 		;
 	}
 }
@@ -654,6 +771,30 @@
 }
 
 
+# Vim
+if [ IsOptionalHaikuImagePackageAdded Vim ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package Vim available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
+		local baseURL = http://haiku-ports.de/packages/app-editors/vim ;
+		InstallOptionalHaikuImagePackage vim-7.2-gcc4-20090531
+			:  $(baseURL)/vim-7.2-gcc4-haiku-2009-05-31.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/common/bin/gvim ;
+	} else {
+		local baseURL = http://haiku-ports.de/packages/app-editors/vim ;
+		InstallOptionalHaikuImagePackage vim-7.2-gcc2-20090531
+			:  $(baseURL)/vim-7.2-gcc2-haiku-2009-05-31.zip
+			:
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/common/bin/gvim ;
+	}
+}
+
+
 # Vision
 if [ IsOptionalHaikuImagePackageAdded Vision ] {
 	if $(TARGET_ARCH) != x86 {

Modified: haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles
===================================================================
--- haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/build/jam/ReleaseBuildProfiles	2009-06-07 22:06:21 UTC (rev 30991)
@@ -9,7 +9,7 @@
 		HAIKU_ROOT_USER_REAL_NAME = "Yourself" ;
 		AddGroupToHaikuImage party : 101 : user sshd ;
 		HAIKU_IMAGE_HOST_NAME = shredder ;
-		HAIKU_IMAGE_SIZE = 400 ;
+		HAIKU_IMAGE_SIZE = 500 ;
 
 		AddOptionalHaikuImagePackages BePDF Firefox Pe Vision VLC WonderBrush ;
 		AddOptionalHaikuImagePackages CVS Development Subversion OpenSSH Yasm ;

Modified: haiku/branches/components/gsoc-locale-kit/configure
===================================================================
--- haiku/branches/components/gsoc-locale-kit/configure	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/configure	2009-06-07 22:06:21 UTC (rev 30991)
@@ -399,6 +399,17 @@
 	fi
 fi
 
+# check for case-sensitive filesystem if on darwin
+if [ $buildPlatform = "darwin" ]; then
+	diskutil info . | grep -i "case-sensitive" > /dev/null
+	if [ $? != 0 ]; then
+		echo "You need a case-sensitive file-system to build Haiku."
+		echo "Please see the following guide on how to set one up:"
+		echo "http://haiku-os.org/documents/dev/how_to_build_haiku_on_mac_os_x"
+		exit 1
+	fi
+fi
+
 # create output directory
 if [ "$currentDir" = "$sourceDir" ]; then
 	outputDir=$currentDir/generated

Copied: haiku/branches/components/gsoc-locale-kit/data/bin/freetype-config (from rev 30990, haiku/trunk/data/bin/freetype-config)

Modified: haiku/branches/components/gsoc-locale-kit/data/develop/makefile
===================================================================
--- haiku/branches/components/gsoc-locale-kit/data/develop/makefile	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/data/develop/makefile	2009-06-07 22:06:21 UTC (rev 30991)
@@ -1,4 +1,4 @@
-## BeOS Generic Makefile v2.2 ##
+## BeOS Generic Makefile v2.3 ##
 
 ## Fill in this file to specify the project being created, and the referenced
 ## makefile-engine will do all of the hard work for you.  This handles both

Modified: haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine
===================================================================
--- haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/data/develop/makefile-engine	2009-06-07 22:06:21 UTC (rev 30991)
@@ -2,7 +2,7 @@
 ##	Does all the hard work for the Generic Makefile
 ##	which simply defines the project parameters
 
-##	Supports Generic Makefile v2.0, 2.01, 2.1, 2.2
+##	Supports Generic Makefile v2.0, 2.01, 2.1, 2.2, 2.3
 
 #	determine wheather running on x86 or ppc
 MACHINE=$(shell uname -m)
@@ -351,9 +351,9 @@
 
 # rules to compile resource definition files
 $(OBJ_DIR)/%.rsrc : %.rdef
-	$(RESCOMP) -o $@ $<
+	cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o $@ -
 $(OBJ_DIR)/%.rsrc : %.RDEF
-	$(RESCOMP) -o $@ $<
+	cat $< | $(CC) -E $(INCLUDES) $(CFLAGS) - | grep -v '^#' | $(RESCOMP) -o $@ -
 
 #	rules to handle lex/flex and yacc/bison files
 

Modified: haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript
===================================================================
--- haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript	2009-06-07 22:06:21 UTC (rev 30991)
@@ -70,8 +70,8 @@
 launchscript $SCRIPTS/SetupEnvironment
 
 # If the boot volume is a CD we use another script
-iw=`/bin/isvolume -readonly-partition /boot`
-if [ "$iw" = "yes" ]; then
+isReadOnly=`/bin/isvolume -readonly-partition /boot`
+if [ "$isReadOnly" = "yes" ]; then
 	# block the CD tray (avoid accidental ejection)
 	# This option stays 'on' even if we continue booting to the desktop.
 	/bin/eject -b /boot
@@ -105,7 +105,7 @@
 fi
 
 # Now ask the user if he wants to run the Installer or continue to the Desktop.
-if [ "$iw" = "yes" ]; then
+if [ "$isReadOnly" = "yes" ]; then
 	/bin/alert "Do you wish to run the Installer or continue booting to the Desktop?" "Installer" "Desktop"
 	if [ $? -eq 0 ]; then
 		launchscript $SCRIPTS/Bootscript.cd

Modified: haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript.cd
===================================================================
--- haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript.cd	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/data/system/boot/Bootscript.cd	2009-06-07 22:06:21 UTC (rev 30991)
@@ -57,6 +57,7 @@
 	#launch system/apps/Terminal
 else
 	launch system/bin/consoled
+	exit 0 # return so we don't eject and reboot
 fi
 
 # sync disks

Copied: haiku/branches/components/gsoc-locale-kit/data/system/data/licenses/GNU LGPL v3 (from rev 30990, haiku/trunk/data/system/data/licenses/GNU LGPL v3)

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/media/MediaFile.h	2009-06-07 22:06:21 UTC (rev 30991)
@@ -1,12 +1,15 @@
+/*
+ * Copyright 2002-2009, Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _MEDIA_FILE_H
 #define	_MEDIA_FILE_H
 
-#include <kernel/image.h>
-#include <SupportDefs.h>
-#include <StorageDefs.h>
+#include <image.h>
 #include <List.h>
 #include <MediaDefs.h>
 #include <MediaFormats.h>
+#include <StorageDefs.h>
 
 
 namespace BPrivate {
@@ -45,172 +48,179 @@
 //
 
 class BMediaFile {
-
 public:
-					//	these four constructors are used for read-only access
-					BMediaFile(	const entry_ref *ref); 
-					BMediaFile(	BDataIO * source);     // BFile is a BDataIO
-					BMediaFile(	const entry_ref * ref,
-								int32 flags);
-					BMediaFile(	BDataIO * source,
-								int32 flags);     // BFile is a BDataIO
+	//	these four constructors are used for read-only access
+								BMediaFile(const entry_ref* ref); 
+								BMediaFile(BDataIO* source);
+									// BFile is a BDataIO
+								BMediaFile(const entry_ref* ref, int32 flags);
+								BMediaFile(BDataIO* source, int32 flags);
 
-					//	these three constructors are for read-write access
-					BMediaFile(const entry_ref *ref,   // these two are write-only
-							   const media_file_format * mfi,
-							   int32 flags=0);
-					BMediaFile(BDataIO	*destination,  // BFile is a BDataIO
-							   const media_file_format * mfi,
-							   int32 flags=0);
-					BMediaFile(const media_file_format * mfi, // set file later using SetTo()
-							   int32 flags=0);
+	//	these three constructors are for read-write access
+								BMediaFile(const entry_ref* ref,
+									const media_file_format* mfi,
+									int32 flags = 0);
+								BMediaFile(BDataIO* destination,
+								   const media_file_format* mfi,
+								   int32 flags = 0);
+								BMediaFile(const media_file_format* mfi,
+								   	int32 flags = 0);
+									// set file later using SetTo()
 
-					status_t SetTo(const entry_ref *ref);
-					status_t SetTo(BDataIO	*destination);  // BFile is a BDataIO
+	virtual						~BMediaFile();
+
+			status_t			SetTo(const entry_ref* ref);
+			status_t			SetTo(BDataIO* destination);
 							   
-	virtual			~BMediaFile();
+			status_t			InitCheck() const;
 
-	status_t		InitCheck() const;
-
 	// Get info about the underlying file format.
-	status_t		GetFileFormatInfo(media_file_format *mfi) const;
+			status_t			GetFileFormatInfo(media_file_format* mfi) const;
 
 	//
 	// These functions are for read-only access to a media file.  
 	// The data is read using the BMediaTrack object.
 	//
-	const char 		*Copyright(void) const;
-	int32			CountTracks() const;
+			const char*			Copyright() const;
+			int32				CountTracks() const;
 
 	// Can be called multiple times with the same index.  You must call
 	// ReleaseTrack() when you're done with a track.
-	BMediaTrack 	*TrackAt(int32 index);
+			BMediaTrack*		TrackAt(int32 index);
 
 	// Release the resource used by a given BMediaTrack object, to reduce
 	// the memory usage of your application. The specific 'track' object
 	// can no longer be used, but you can create another one by calling
 	// TrackAt() with the same track index.
-	status_t		ReleaseTrack(BMediaTrack *track);
+			status_t			ReleaseTrack(BMediaTrack* track);
 
-	// A convenience.
-	status_t		ReleaseAllTracks(void);
+	// A convenience. Deleting a BMediaFile will also call this.
+			status_t			ReleaseAllTracks();
 
 
 	// Create and add a track to the media file
-	BMediaTrack 	*CreateTrack(media_format *mf, const media_codec_info *mci, uint32 flags=0);
+			BMediaTrack*		CreateTrack(media_format* mf,
+									const media_codec_info* mci,
+									uint32 flags = 0);
 	// Create and add a raw track to the media file (it has no encoder)
-	BMediaTrack 	*CreateTrack(media_format *mf, uint32 flags=0);
+			BMediaTrack*		CreateTrack(media_format* mf,
+									uint32 flags = 0);
 
 	// Lets you set the copyright info for the entire file
-	status_t		AddCopyright(const char *data);
+			status_t			AddCopyright(const char* data);
 
 	// Call this to add user-defined chunks to a file (if they're supported)
-	status_t		AddChunk(int32 type, const void *data, size_t size);
+			status_t			AddChunk(int32 type, const void* data,
+									size_t size);
 
 	// After you have added all the tracks you want, call this
-	status_t		CommitHeader(void);
+			status_t			CommitHeader();
 
 	// After you have written all the data to the track objects, call this
-	status_t        CloseFile(void);
+			status_t			CloseFile();
 
 	// This is for controlling file format parameters
 
 	// returns a copy of the parameter web
-	status_t		GetParameterWeb(BParameterWeb** outWeb);
-	status_t 		GetParameterValue(int32 id,	void *valu, size_t *size);
-	status_t		SetParameterValue(int32 id,	const void *valu, size_t size);
-	BView			*GetParameterView();
+			status_t			GetParameterWeb(BParameterWeb** outWeb);
+			status_t 			GetParameterValue(int32 id,	void* value,
+									size_t* size);
+			status_t			SetParameterValue(int32 id,	const void* value,
+									size_t size);
+			BView*				GetParameterView();
 
 	// For the future...
-	virtual	status_t Perform(int32 selector, void * data);
+	virtual	status_t			Perform(int32 selector, void* data);
 
 private:
 	// deprecated, but for R5 compatibility
-	BParameterWeb	*Web();
+			BParameterWeb*		Web();
 
 	// Does nothing, returns B_ERROR, for Zeta compatiblity only	
-	status_t		ControlFile(int32 selector, void * io_data, size_t size);
+			status_t			ControlFile(int32 selector, void* ioData,
+									size_t size);
 
-	BPrivate::media::MediaExtractor *fExtractor;
-	int32					_reserved_BMediaFile_was_fExtractorID;
-	int32					fTrackNum;
-	status_t				fErr;
+			BPrivate::media::MediaExtractor* fExtractor;
+			int32				_reserved_BMediaFile_was_fExtractorID;
+			int32				fTrackNum;
+			status_t			fErr;
 
-	BPrivate::_AddonManager *fEncoderMgr;
-	BPrivate::_AddonManager *fWriterMgr;
-	BPrivate::MediaWriter	*fWriter;
-	int32					fWriterID;
-	media_file_format		fMFI;
+			BPrivate::_AddonManager* fEncoderMgr;
+			BPrivate::_AddonManager* fWriterMgr;
+			BPrivate::MediaWriter* fWriter;
+			int32				fWriterID;
+			media_file_format	fMFI;
 
-	bool					fFileClosed;
-	bool					fDeleteSource;
-	bool					_reserved_was_fUnused[2];
-	BMediaTrack				**fTrackList;
+			bool				fFileClosed;
+			bool				fDeleteSource;
+			bool				_reserved_was_fUnused[2];
+			BMediaTrack**		fTrackList;
 
-	void					Init();
-	void					InitReader(BDataIO *source, int32 flags = 0);
-	void					InitWriter(BDataIO *source, const media_file_format * mfi,
-									   int32 flags);
+			void				_Init();
+			void				_UnInit();
+			void				_InitReader(BDataIO* source, int32 flags = 0);
+			void				_InitWriter(BDataIO* source,
+									const media_file_format* mfi, int32 flags);
 
-	BMediaFile();
-	BMediaFile(const BMediaFile&);
-	BMediaFile& operator=(const BMediaFile&);
+								BMediaFile();
+								BMediaFile(const BMediaFile&);
+			BMediaFile&			operator=(const BMediaFile&);
 
-	BDataIO					*fSource;
+			BDataIO*			fSource;
 
 
-	/* fbc data and virtuals */
+	// FBC data and virtuals
 
-		uint32 _reserved_BMediaFile_[32];
+			uint32				_reserved_BMediaFile_[32];
 
-virtual	status_t _Reserved_BMediaFile_0(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_1(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_2(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_3(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_4(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_5(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_6(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_7(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_8(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_9(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_10(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_11(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_12(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_13(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_14(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_15(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_16(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_17(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_18(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_19(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_20(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_21(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_22(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_23(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_24(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_25(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_26(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_27(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_28(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_29(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_30(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_31(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_32(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_33(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_34(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_35(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_36(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_37(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_38(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_39(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_40(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_41(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_42(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_43(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_44(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_45(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_46(int32 arg, ...);
-virtual	status_t _Reserved_BMediaFile_47(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_0(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_1(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_2(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_3(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_4(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_5(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_6(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_7(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_8(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_9(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_10(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_11(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_12(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_13(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_14(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_15(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_16(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_17(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_18(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_19(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_20(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_21(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_22(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_23(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_24(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_25(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_26(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_27(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_28(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_29(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_30(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_31(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_32(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_33(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_34(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_35(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_36(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_37(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_38(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_39(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_40(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_41(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_42(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_43(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_44(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_45(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_46(int32 arg, ...);
+	virtual	status_t			_Reserved_BMediaFile_47(int32 arg, ...);
 };
 
 #endif

Modified: haiku/branches/components/gsoc-locale-kit/headers/os/support/String.h
===================================================================
--- haiku/branches/components/gsoc-locale-kit/headers/os/support/String.h	2009-06-07 21:18:32 UTC (rev 30990)
+++ haiku/branches/components/gsoc-locale-kit/headers/os/support/String.h	2009-06-07 22:06:21 UTC (rev 30991)
@@ -1,5 +1,5 @@
 /*
-* Copyright 2001-2008, Haiku Inc. All Rights Reserved.
+* Copyright 2001-2009, Haiku Inc. All Rights Reserved.
 * Distributed under the terms of the MIT License.
 */
 #ifndef __BSTRING__
@@ -16,251 +16,281 @@
 
 class BString {
 public:
-				BString();
-				BString(const char* string);
-				BString(const BString& string);
-				BString(const char* string, int32 maxLength);
-				~BString();
+							BString();
+							BString(const char* string);
+							BString(const BString& string);
+							BString(const char* string, int32 maxLength);
+							~BString();
 
-	// Access
-	const char*	String() const;
-	int32 		Length() const;
-	int32		CountChars() const;
+			// Access
+			const char*		String() const;
+			int32 			Length() const;
+			int32			CountChars() const;
 
-	// Assignment
-	BString&	operator=(const BString& string);
-	BString&	operator=(const char* string);
-	BString&	operator=(char c);
+			// Assignment
+			BString&		operator=(const BString& string);
+			BString&		operator=(const char* string);
+			BString&		operator=(char c);
 
-	BString&	SetTo(const char* string);
-	BString&	SetTo(const char* string, int32 maxLength);
+			BString&		SetTo(const char* string);
+			BString&		SetTo(const char* string, int32 maxLength);
 
-	BString&	SetTo(const BString& string);
-	BString&	Adopt(BString& from);
+			BString&		SetTo(const BString& string);
+			BString&		Adopt(BString& from);
 
-	BString&	SetTo(const BString& string, int32 maxLength);
-	BString&	Adopt(BString& from, int32 maxLength);
+			BString&		SetTo(const BString& string, int32 maxLength);
+			BString&		Adopt(BString& from, int32 maxLength);
 
-	BString&	SetTo(char c, int32 count);
+			BString&		SetTo(char c, int32 count);
 
-	// Substring copying
-	BString&	CopyInto(BString& into, int32 fromOffset, int32 length) const;
-	void		CopyInto(char* into, int32 fromOffset, int32 length) const;
+			// Substring copying
+			BString&		CopyInto(BString& into, int32 fromOffset,
+								int32 length) const;
+			void			CopyInto(char* into, int32 fromOffset,
+								int32 length) const;
 
-	// Appending
-	BString&	operator+=(const BString& string);
-	BString&	operator+=(const char* string);
-	BString&	operator+=(char c);
+			// Appending
+			BString&		operator+=(const BString& string);
+			BString&		operator+=(const char* string);
+			BString&		operator+=(char c);
 
-	BString&	Append(const BString& string);
-	BString&	Append(const char* string);
+			BString&		Append(const BString& string);
+			BString&		Append(const char* string);
 
-	BString&	Append(const BString& string, int32 length);
-	BString&	Append(const char* string, int32 length);
-	BString&	Append(char c, int32 count);
+			BString&		Append(const BString& string, int32 length);
+			BString&		Append(const char* string, int32 length);
+			BString&		Append(char c, int32 count);
 
-	// Prepending
-	BString&	Prepend(const char* string);
-	BString&	Prepend(const BString& string);
-	BString&	Prepend(const char* string, int32 length);
-	BString&	Prepend(const BString& string, int32 length);
-	BString&	Prepend(char c, int32 count);
+			// Prepending
+			BString&		Prepend(const char* string);
+			BString&		Prepend(const BString& string);
+			BString&		Prepend(const char* string, int32 length);
+			BString&		Prepend(const BString& string, int32 length);
+			BString&		Prepend(char c, int32 count);
 
-	// Inserting
-	BString&	Insert(const char* string, int32 position);
-	BString&	Insert(const char* string, int32 length, int32 position);
-	BString&	Insert(const char* string, int32 fromOffset, int32 length,
-					int32 position);
-	BString&	Insert(const BString& string, int32 position);
-	BString&	Insert(const BString& string, int32 length,	int32 position);
-	BString&	Insert(const BString& string, int32 fromOffset,	int32 length,
-					int32 position);
-	BString&	Insert(char c, int32 count, int32 position);
+			// Inserting
+			BString&		Insert(const char* string, int32 position);
+			BString&		Insert(const char* string, int32 length,
+								int32 position);
+			BString&		Insert(const char* string, int32 fromOffset,
+								int32 length, int32 position);
+			BString&		Insert(const BString& string, int32 position);
+			BString&		Insert(const BString& string, int32 length,
+								int32 position);
+			BString&		Insert(const BString& string, int32 fromOffset,
+								int32 length, int32 position);
+			BString&		Insert(char c, int32 count, int32 position);
 
-	// Removing
-	BString&	Truncate(int32 newLength, bool lazy = true);
-	BString&	Remove(int32 from, int32 length);
+			// Removing
+			BString&		Truncate(int32 newLength, bool lazy = true);
+			BString&		Remove(int32 from, int32 length);
 
-	BString&	RemoveFirst(const BString& string);
-	BString&	RemoveLast(const BString& string);
-	BString&	RemoveAll(const BString& string);
+			BString&		RemoveFirst(const BString& string);
+			BString&		RemoveLast(const BString& string);

[... truncated: 25666 lines follow ...]

